Merge branch 'release/2.7.1'

Dockershelf · Apr 17, 2022 · 13b9880 · 13b9880
2 parents e8096dd + ff37d91
commit 13b9880
Show file tree

Hide file tree

Showing 76 changed files with 542 additions and 1,495 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.7.0
+current_version = 2.7.1
 tag_name = {new_version}
 commit = True
 tag = True

diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
@@ -15,13 +15,13 @@ jobs:
             toxenv: "py39"
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v1
         with:
           languages: python
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python-version }}
       - name: Perform CodeQL Analysis

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -25,9 +25,9 @@ jobs:
             toxenv: "py39"
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python-version }}
       - name: Measuring coverage
@@ -45,12 +45,12 @@ jobs:
     needs: build
     steps:
       - name: Approve
-        uses: hmarr/auto-approve-action@v2.1.0
+        uses: hmarr/auto-approve-action@v2.2.1
         if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
         with:
           github-token: "${{ secrets.PERSONAL_ACCESS_TOKEN }}"
       - name: Approve
-        uses: hmarr/auto-approve-action@v2.1.0
+        uses: hmarr/auto-approve-action@v2.2.1
         if: github.actor == 'LuisAlejandro'
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
@@ -61,7 +61,7 @@ jobs:
     needs: approve
     steps:
       - name: Merge
-        uses: actions/github-script@v5
+        uses: actions/github-script@v6
         if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
         with:
           github-token: "${{ secrets.PERSONAL_ACCESS_TOKEN }}"
@@ -72,7 +72,7 @@ jobs:
               pull_number: context.payload.pull_request.number
             })
       - name: Merge
-        uses: actions/github-script@v5
+        uses: actions/github-script@v6
         if: github.actor == 'LuisAlejandro'
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"

diff --git a/.github/workflows/push-develop.yml b/.github/workflows/push-develop.yml
@@ -13,18 +13,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - docker-image-name: "dockershelf/debian:buster"
-            docker-image-extra-tags: "dockershelf/debian:oldstable"
-            debian-suite: "oldstable"
-          - docker-image-name: "dockershelf/debian:bullseye"
-            docker-image-extra-tags: "dockershelf/debian:stable"
-            debian-suite: "stable"
-          - docker-image-name: "dockershelf/debian:bookworm"
-            docker-image-extra-tags: "dockershelf/debian:testing"
-            debian-suite: "testing"
-          - docker-image-name: "dockershelf/debian:sid"
-            docker-image-extra-tags: "dockershelf/debian:unstable dockershelf/debian:latest"
-            debian-suite: "unstable"
           - docker-image-name: "dockershelf/latex:basic"
             docker-image-extra-tags: "dockershelf/latex:latest"
           - docker-image-name: "dockershelf/latex:full"
@@ -74,7 +62,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: develop
       - name: Installing dependencies

diff --git a/.github/workflows/push-develop.yml.template b/.github/workflows/push-develop.yml.template
@@ -10,13 +10,14 @@ jobs:
     name: Build
     runs-on: ubuntu-20.04
     strategy:
+      fail-fast: false
       matrix:
         include:
 %%MATRIX%%
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: develop
       - name: Installing dependencies

diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml
@@ -10,20 +10,9 @@ jobs:
     name: Build
     runs-on: ubuntu-20.04
     strategy:
+      fail-fast: false
       matrix:
         include:
-          - docker-image-name: "dockershelf/debian:buster"
-            docker-image-extra-tags: "dockershelf/debian:oldstable"
-            debian-suite: "oldstable"
-          - docker-image-name: "dockershelf/debian:bullseye"
-            docker-image-extra-tags: "dockershelf/debian:stable"
-            debian-suite: "stable"
-          - docker-image-name: "dockershelf/debian:bookworm"
-            docker-image-extra-tags: "dockershelf/debian:testing"
-            debian-suite: "testing"
-          - docker-image-name: "dockershelf/debian:sid"
-            docker-image-extra-tags: "dockershelf/debian:unstable dockershelf/debian:latest"
-            debian-suite: "unstable"
           - docker-image-name: "dockershelf/latex:basic"
             docker-image-extra-tags: "dockershelf/latex:latest"
           - docker-image-name: "dockershelf/latex:full"
@@ -73,7 +62,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: master
       - name: Installing dependencies

diff --git a/.github/workflows/push-master.yml.template b/.github/workflows/push-master.yml.template
@@ -10,13 +10,14 @@ jobs:
     name: Build
     runs-on: ubuntu-20.04
     strategy:
+      fail-fast: false
       matrix:
         include:
 %%MATRIX%%
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: master
       - name: Installing dependencies

diff --git a/.github/workflows/schedule-master.yml b/.github/workflows/schedule-master.yml
@@ -9,20 +9,9 @@ jobs:
     name: Build
     runs-on: ubuntu-20.04
     strategy:
+      fail-fast: false
       matrix:
         include:
-          - docker-image-name: "dockershelf/debian:buster"
-            docker-image-extra-tags: "dockershelf/debian:oldstable"
-            debian-suite: "oldstable"
-          - docker-image-name: "dockershelf/debian:bullseye"
-            docker-image-extra-tags: "dockershelf/debian:stable"
-            debian-suite: "stable"
-          - docker-image-name: "dockershelf/debian:bookworm"
-            docker-image-extra-tags: "dockershelf/debian:testing"
-            debian-suite: "testing"
-          - docker-image-name: "dockershelf/debian:sid"
-            docker-image-extra-tags: "dockershelf/debian:unstable dockershelf/debian:latest"
-            debian-suite: "unstable"
           - docker-image-name: "dockershelf/latex:basic"
             docker-image-extra-tags: "dockershelf/latex:latest"
           - docker-image-name: "dockershelf/latex:full"
@@ -72,7 +61,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: master
       - name: Installing dependencies

diff --git a/.github/workflows/schedule-master.yml.template b/.github/workflows/schedule-master.yml.template
@@ -9,13 +9,14 @@ jobs:
     name: Build
     runs-on: ubuntu-20.04
     strategy:
+      fail-fast: false
       matrix:
         include:
 %%MATRIX%%
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: master
       - name: Installing dependencies

diff --git a/CLA.md b/CLA.md
@@ -1,6 +1,6 @@
 Contributor License Agreement Version 1.0
 
-Copyright (C) 2016-2020, Dockershelf Developers.
+Copyright (C) 2016-2022, Dockershelf Developers.
 
 Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
 

diff --git a/COPYING.md b/COPYING.md
@@ -1,5 +1,5 @@
 
-Copyright (C) 2016-2020, Dockershelf Developers.
+Copyright (C) 2016-2022, Dockershelf Developers.
 
 Please refer to AUTHORS.md for a complete list of Copyright holders.
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,18 +1,16 @@
-FROM dockershelf/python:3.9
-LABEL maintainer "Luis Alejandro Martínez Faneyth <[email protected]>"
-
-RUN apt-get update && \
-    apt-get install sudo
-
-RUN echo "Set disable_coredump false" >> /etc/sudo.conf
-
-ADD requirements.txt requirements-dev.txt /root/
-RUN pip3 install -r /root/requirements.txt -r /root/requirements-dev.txt
-RUN rm -rf /root/requirements.txt /root/requirements-dev.txt
-
-RUN useradd -ms /bin/bash dockershelf
-RUN echo "dockershelf ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/dockershelf
-USER dockershelf
-WORKDIR /home/dockershelf/app
-
+FROM dockershelf/python:3.9
+LABEL maintainer "Luis Alejandro Martínez Faneyth <[email protected]>"
+
+RUN apt-get update && \
+    apt-get install sudo python3.9-venv
+
+ADD requirements.txt requirements-dev.txt /root/
+RUN pip3 install -r /root/requirements.txt -r /root/requirements-dev.txt
+RUN rm -rf /root/requirements.txt /root/requirements-dev.txt
+
+RUN useradd -ms /bin/bash dockershelf
+RUN echo "dockershelf ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/dockershelf
+USER dockershelf
+WORKDIR /home/dockershelf/app
+
 CMD tail -f /dev/null
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,6 +1,59 @@
 # Changelog
 
 
+## 2.7.1 (2022-04-17)
+
+### Changed
+
+* Improving documentation. [Luis Alejandro Martínez Faneyth]
+
+* Fixing python unit tests. [Luis Alejandro Martínez Faneyth]
+
+* Adjusting scripts and documentation. [Luis Alejandro Martínez Faneyth]
+
+* Removing Debian image generation from this repository. [Luis Alejandro Martínez Faneyth]
+
+
+### Fixed
+
+* Fixing build error with pip bootstrap script. [Luis Alejandro]
+
+
+### Other
+
+* Bump virtualenv from 20.14.0 to 20.14.1. [dependabot[bot]]
+
+* Bump tox from 3.24.5 to 3.25.0. [dependabot[bot]]
+
+* Bump hmarr/auto-approve-action from 2.1.0 to 2.2.1. [dependabot[bot]]
+
+* Bump virtualenv from 20.13.4 to 20.14.0. [dependabot[bot]]
+
+* Bump virtualenv from 20.13.3 to 20.13.4. [dependabot[bot]]
+
+* Bump mako from 1.1.6 to 1.2.0. [dependabot[bot]]
+
+* Bump virtualenv from 20.13.2 to 20.13.3. [dependabot[bot]]
+
+* Bump actions/checkout from 2 to 3. [dependabot[bot]]
+
+* Bump virtualenv from 20.13.1 to 20.13.2. [dependabot[bot]]
+
+* Bump actions/setup-python from 2 to 3. [dependabot[bot]]
+
+* Bump coverage from 6.3.1 to 6.3.2. [dependabot[bot]]
+
+* Bump lxml from 4.7.1 to 4.8.0. [dependabot[bot]]
+
+* Bump actions/github-script from 5 to 6. [dependabot[bot]]
+
+* Bump virtualenv from 20.13.0 to 20.13.1. [dependabot[bot]]
+
+* Bump coverage from 6.3 to 6.3.1. [dependabot[bot]]
+
+* Bump coverage from 6.2 to 6.3. [dependabot[bot]]
+
+
 ## 2.7.0 (2022-01-24)
 
 ### Changed

diff --git a/Makefile b/Makefile
@@ -33,19 +33,12 @@ destroy:
 	@docker-compose -p dockershelf -f docker-compose.yml down \
 		--rmi all --remove-orphans -v
 
-virtualenv:
-	C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe \
-		-ExecutionPolicy Bypass \
-		-Command "python -m venv .\winvenv"
-	C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe \
-		-ExecutionPolicy Bypass \
-		-Command ".\winvenv\Scripts\pip.exe install -U wheel"
-	C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe \
-		-ExecutionPolicy Bypass \
-		-Command ".\winvenv\Scripts\pip.exe install -U setuptools"
-	C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe \
-		-ExecutionPolicy Bypass \
-		-Command ".\winvenv\Scripts\pip.exe install -r requirements.txt"
-	C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe \
-		-ExecutionPolicy Bypass \
-		-Command ".\winvenv\Scripts\pip.exe install -r requirements-dev.txt"
+virtualenv: start
+	@docker-compose -p dockershelf -f docker-compose.yml exec \
+		--user dockershelf dockershelf python3 -m venv --clear --copies ./winvenv
+	@docker-compose -p dockershelf -f docker-compose.yml exec \
+		--user dockershelf dockershelf ./winvenv/bin/pip install -U wheel setuptools
+	@docker-compose -p dockershelf -f docker-compose.yml exec \
+		--user dockershelf dockershelf ./winvenv/bin/pip install -r requirements.txt
+	@docker-compose -p dockershelf -f docker-compose.yml exec \
+		--user dockershelf dockershelf ./winvenv/bin/pip install -r requirements-dev.txt