Merge pull request #899 from cookiejar/release/1.4.0

Release/1.4.0
cookiejar · Mar 8, 2022 · 6a83a1b · 6a83a1b
2 parents d6a3baf + 1572925
commit 6a83a1b
Show file tree

Hide file tree

Showing 50 changed files with 1,047 additions and 930 deletions.
diff --git a/.cookietemple.yml b/.cookietemple.yml
@@ -4,7 +4,7 @@ language: python
 project_slug: cookietemple
 project_slug_no_hyphen: cookietemple
 project_short_description: A cookiecutter based project template creation tool supporting several domains and languages with linting and template sync support.
-version: 1.3.11
+version: 1.4.0
 license: Apache2.0
 template_version: '2.0.0 # <<COOKIETEMPLE_NO_BUMP>>'
 template_handle: cli-python

diff --git a/.flake8 b/.flake8
@@ -1,6 +1,6 @@
 [flake8]
 select = B,E,F,W
-ignore = E203,E501,RST201,RST203,RST301,W503,D100,DAR,W605
+ignore = E203,E501,RST201,RST203,RST301,W503,D100,DAR,W605,B018
 max-line-length = 120
 max-complexity = 15
 exclude = cookietemple/create/templates

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -1,5 +1,5 @@
-name-template: "1.3.11 🌈" # <<COOKIETEMPLE_FORCE_BUMP>>
-tag-template: 1.3.11 # <<COOKIETEMPLE_FORCE_BUMP>>
+name-template: "1.4.0 🌈" # <<COOKIETEMPLE_FORCE_BUMP>>
+tag-template: 1.4.0 # <<COOKIETEMPLE_FORCE_BUMP>>
 exclude-labels:
     - "skip-changelog"
 

diff --git a/.github/workflows/build_package.yml b/.github/workflows/build_package.yml
@@ -12,11 +12,11 @@ jobs:
                 python: [3.8, 3.9]
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
               name: Check out source-code repository
 
             - name: Setup Python
-              uses: actions/setup-python@v2.3.0
+              uses: actions/setup-python@v3
               with:
                   python-version: ${{ matrix.python }}
 

diff --git a/.github/workflows/check_no_SNAPSHOT_master.yml b/.github/workflows/check_no_SNAPSHOT_master.yml
@@ -10,7 +10,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: Setup Python
-              uses: actions/setup-python@v2.3.0
+              uses: actions/setup-python@v3
               with:
                   python-version: 3.8
 

diff --git a/.github/workflows/create_cli_java.yml b/.github/workflows/create_cli_java.yml
@@ -19,11 +19,11 @@ jobs:
                 python: [3.8, 3.9]
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
               name: Check out source-code repository
 
             - name: Setup Python
-              uses: actions/setup-python@v2.3.0
+              uses: actions/setup-python@v3
               with:
                   python-version: ${{ matrix.python }}
 
@@ -33,15 +33,15 @@ jobs:
             - name: Build package
               run: make install
 
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
             - uses: DeLaGuardo/setup-graalvm@48f2bf339ab7d35e31029b1822a213681fdfc42e
               with:
                   graalvm-version: "20.1.0.java11"
             - run: java -version
             - run: gu install native-image
 
             - name: Create cli-java Template
-              run: echo -e "\n\033[B\nHomer\nhomer.simpson@hotmail.com\nhomergithub\nnExplodingSpringfield\ndescription\n1.0.0\n\ngroup_domain\ngroup_organization\nn" | poetry run cookietemple create
+              run: echo -e "\n\033[B\nHomer\nhomer.simpson@hotmail.com\nhomergithub\n\nnExplodingSpringfield\ndescription\n1.0.0\n\ngroup_domain\ngroup_organization\nn" | poetry run cookietemple create
 
             - name: Build with Gradle
               run: |

diff --git a/.github/workflows/create_cli_python.yml b/.github/workflows/create_cli_python.yml
@@ -19,11 +19,11 @@ jobs:
                 python: [3.8, 3.9]
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
               name: Check out source-code repository
 
             - name: Setup Python
-              uses: actions/setup-python@v2.3.0
+              uses: actions/setup-python@v3
               with:
                   python-version: ${{ matrix.python }}
 
@@ -34,7 +34,7 @@ jobs:
               run: make install
 
             - name: Create cli-python Template
-              run: echo -e "\n\nHomer\nsimpson@gmail.com\nhomergithub\nnExplodingSpringfield\ndescription\n1.0.0\n\nn" | poetry run cookietemple create
+              run: echo -e "\n\nHomer\nsimpson@gmail.com\nhomergithub\n\nnExplodingSpringfield\ndescription\n1.0.0\n\nn" | poetry run cookietemple create
 
             - name: Install nox and the nox poetry extension
               run: pip install nox nox-poetry rich

diff --git a/.github/workflows/create_gui_java.yml b/.github/workflows/create_gui_java.yml
@@ -19,11 +19,11 @@ jobs:
                 python: [3.8, 3.9]
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
               name: Check out source-code repository
 
             - name: Setup Python
-              uses: actions/setup-python@v2.3.0
+              uses: actions/setup-python@v3
               with:
                   python-version: ${{ matrix.python }}
 
@@ -34,7 +34,7 @@ jobs:
               run: make install
 
             - name: Create gui-java Template
-              run: echo -e "\033[B\033[B\n\nHomer\nhomer.simpson@hotmail.com\nhomergithub\nnExplodingSpringfield\ndescription\n1.0.0\n\nburnsorga\nn" | poetry run cookietemple create
+              run: echo -e "\033[B\033[B\n\nHomer\nhomer.simpson@hotmail.com\nhomergithub\n\nnExplodingSpringfield\ndescription\n1.0.0\n\nburnsorga\nn" | poetry run cookietemple create
 
             - name: Set up JDK 11
               uses: actions/setup-java@v1

diff --git a/.github/workflows/create_lib_cpp.yml b/.github/workflows/create_lib_cpp.yml
@@ -19,11 +19,11 @@ jobs:
                 python: [3.8, 3.9]
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
               name: Check out source-code repository
 
             - name: Setup Python
-              uses: actions/setup-python@v2.3.0
+              uses: actions/setup-python@v3
               with:
                   python-version: ${{ matrix.python }}
 
@@ -34,7 +34,7 @@ jobs:
               run: make install
 
             - name: Create lib-cpp Template
-              run: echo -e "\033[B\n\nHomer\nhomer.simpson@hotmail.com\nhomergithub\nnExplodingSpringfield\ndescription\n\n\nn\n\n" | poetry run cookietemple create
+              run: echo -e "\033[B\n\nHomer\nhomer.simpson@hotmail.com\nhomergithub\n\nnExplodingSpringfield\ndescription\n\n\nn\n\n" | poetry run cookietemple create
 
             - name: Build Package
               run: |

diff --git a/.github/workflows/create_pub_thesis_latex.yml b/.github/workflows/create_pub_thesis_latex.yml
@@ -19,11 +19,11 @@ jobs:
                 python: [3.8, 3.9]
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
               name: Check out source-code repository
 
             - name: Setup Python
-              uses: actions/setup-python@v2.3.0
+              uses: actions/setup-python@v3
               with:
                   python-version: ${{ matrix.python }}
 
@@ -34,7 +34,7 @@ jobs:
               run: make install
 
             - name: Create pub-thesis-latex Template
-              run: echo -e "\033[B\033[B\033[B\033[B\n\nHomer\nhomersimpson@gmail.com\nhomergithub\nnhomerauthor\nExplodingSpringfield\nTitle\nSpringfieldUniversity\nNuclearDepartment\nPhD\nn" | poetry run cookietemple create
+              run: echo -e "\033[B\033[B\033[B\033[B\n\nHomer\nhomersimpson@gmail.com\nhomergithub\n\nnhomerauthor\nExplodingSpringfield\nTitle\nSpringfieldUniversity\nNuclearDepartment\nPhD\nn" | poetry run cookietemple create
 
             - name: Build thesis
               uses: xu-cheng/latex-action@master

diff --git a/.github/workflows/create_web_python_flask.yml b/.github/workflows/create_web_python_flask.yml
@@ -19,11 +19,11 @@ jobs:
                 python: [3.8, 3.9]
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
               name: Check out source-code repository
 
             - name: Setup Python
-              uses: actions/setup-python@v2.3.0
+              uses: actions/setup-python@v3
               with:
                   python-version: ${{ matrix.python }}
 
@@ -34,7 +34,7 @@ jobs:
               run: make install
 
             - name: Create web-website-python basic Flask Template
-              run: echo -e "\033[B\033[B\033[B\n\nHomer\nhomer.simpson@hotmail.com\nhomergithub\nnExplodingSpringfield\ndescription\n1.0.0\n\n\n\n\n\n\nndummy.com\ncookietempleuser\nn" | poetry run cookietemple create
+              run: echo -e "\033[B\033[B\033[B\n\nHomer\nhomer.simpson@hotmail.com\nhomergithub\n\nnExplodingSpringfield\ndescription\n1.0.0\n\n\n\n\n\n\nndummy.com\ncookietempleuser\nn" | poetry run cookietemple create
 
             - name: Create web-website-python advanced Flask Template
               run: echo -e "\033[B\033[B\033[B\n\nExplodingSpringfieldAdvanced\ndescription\n1.0.0\n\n\n\n\n\033[B\nn\n\n\n\ntest.com\nvmusername\nn" | poetry run cookietemple create

diff --git a/.github/workflows/publish_docs.yml b/.github/workflows/publish_docs.yml
@@ -14,11 +14,11 @@ jobs:
         if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[ci skip]')"
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
               name: Check out source-code repository
 
             - name: Setup Python
-              uses: actions/setup-python@v2.3.0
+              uses: actions/setup-python@v3
               with:
                   python-version: 3.9
 

diff --git a/.github/workflows/publish_package.yml b/.github/workflows/publish_package.yml
@@ -10,12 +10,12 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: Check out the repository
-              uses: actions/checkout@v2.3.4
+              uses: actions/checkout@v3
               with:
                   fetch-depth: 2
 
             - name: Set up Python
-              uses: actions/setup-python@v2.3.0
+              uses: actions/setup-python@v3
               with:
                   python-version: "3.9"
 
@@ -28,7 +28,7 @@ jobs:
               run: poetry build --ansi
 
             - name: Publish package on PyPI
-              uses: pypa/gh-action-pypi-publish@v1.4.2
+              uses: pypa/gh-action-pypi-publish@v1.5.0
               with:
                   user: __token__
                   password: ${{ secrets.PYPI_TOKEN }}
diff --git a/.github/workflows/run_cookietemple_lint.yml b/.github/workflows/run_cookietemple_lint.yml
@@ -7,11 +7,11 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
               name: Check out source-code repository
 
             - name: Setup Python
-              uses: actions/setup-python@v2.3.0
+              uses: actions/setup-python@v3
               with:
                   python-version: 3.9
 

diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
@@ -58,10 +58,10 @@ jobs:
 
         steps:
             - name: Check out the repository
-              uses: actions/checkout@v2.3.4
+              uses: actions/checkout@v3
 
             - name: Set up Python ${{ matrix.python-version }}
-              uses: actions/setup-python@v2.3.0
+              uses: actions/setup-python@v3
               with:
                   python-version: ${{ matrix.python-version }}
 
@@ -93,7 +93,7 @@ jobs:
                   print("::set-output name=result::{}".format(result))
 
             - name: Restore pre-commit cache
-              uses: actions/cache@v2.1.6
+              uses: actions/cache@v2.1.7
               if: matrix.session == 'pre-commit'
               with:
                   path: ~/.cache/pre-commit
@@ -106,14 +106,14 @@ jobs:
 
             - name: Upload coverage data
               if: always() && matrix.session == 'tests'
-              uses: "actions/upload-artifact@v2.2.4"
+              uses: "actions/upload-artifact@v3"
               with:
                   name: coverage-data
                   path: ".coverage.*"
 
             - name: Upload documentation
               if: matrix.session == 'docs-build'
-              uses: actions/upload-artifact@v2.2.4
+              uses: actions/upload-artifact@v3
               with:
                   name: docs
                   path: docs/_build
@@ -123,10 +123,10 @@ jobs:
         needs: tests
         steps:
             - name: Check out the repository
-              uses: actions/checkout@v2.3.4
+              uses: actions/checkout@v3
 
             - name: Set up Python 3.8
-              uses: actions/setup-python@v2.3.0
+              uses: actions/setup-python@v3
               with:
                   python-version: 3.8
 
@@ -143,7 +143,7 @@ jobs:
                   nox --version
 
             - name: Download coverage data
-              uses: actions/download-artifact@v2.0.10
+              uses: actions/download-artifact@v3
               with:
                   name: coverage-data
 

diff --git a/.github/workflows/sync_project.yml b/.github/workflows/sync_project.yml
@@ -10,14 +10,14 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: Setup Python
-              uses: actions/setup-python@v2.3.0
+              uses: actions/setup-python@v3
               with:
                   python-version: 3.8
 
             - name: Install cookietemple
               run: pip install cookietemple
 
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
               with:
                   fetch-depth: 0
                   token: "${{ secrets.CT_SYNC_TOKEN }}"

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -39,6 +39,13 @@ repos:
             types: [python]
             require_serial: true
             exclude: templates
+          - id: pyupgrade
+            name: pyupgrade
+            description: Automatically upgrade syntax for newer versions.
+            entry: pyupgrade
+            language: system
+            types: [python]
+            args: [--py38-plus]
           - id: trailing-whitespace
             name: Trim Trailing Whitespace
             entry: trailing-whitespace-fixer

diff --git a/README.rst b/README.rst
@@ -65,39 +65,39 @@ config
 ------
 Configure cookietemple to get started.
 
-.. figure:: https://user-images.githubusercontent.com/31141763/97928842-1faa7080-1d68-11eb-8c82-39d73d662466.gif
+.. figure:: https://user-images.githubusercontent.com/31141763/155188389-bfc45724-0e5f-4013-8b54-5683620e98c0.gif
 
 See `Configuring cookietemple <https://cookietemple.readthedocs.io/en/latest/config.html>`_
 
 list
 ----
 List all available cookietemple templates.
 
-.. figure:: https://user-images.githubusercontent.com/31141763/97928681-d9eda800-1d67-11eb-880d-9d4f8037872b.gif
+.. figure:: https://user-images.githubusercontent.com/31141763/155188553-a43476ce-4295-4acc-9f25-c69702b36436.gif
 
 See `Listing all templates <https://cookietemple.readthedocs.io/en/latest/list_info.html#list>`_.
 
 info
 ----
 Get detailed information on a cookietemple template.
 
-.. figure:: https://user-images.githubusercontent.com/31141763/97928788-03a6cf00-1d68-11eb-8c35-851c792ecf02.gif
+.. figure:: https://user-images.githubusercontent.com/31141763/155188923-f9de27b0-22c1-479f-b720-f4a1144fbba3.gif
 
 See `Get detailed template information <https://cookietemple.readthedocs.io/en/latest/list_info.html#info>`_.
 
 create
 ------
 Kickstart your customized project with one of cookietemple's templates in no time.
 
-.. figure:: https://user-images.githubusercontent.com/31141763/97928626-bb87ac80-1d67-11eb-938f-db2db223d792.gif
+.. figure:: https://user-images.githubusercontent.com/31141763/155189514-85c9d4e8-f16f-486b-b7e0-d8e7a3cbca93.gif
 
 See `Create a project <https://cookietemple.readthedocs.io/en/latest/create.html>`_.
 
 lint
 ----
 Use advanced linting to ensure your project always adheres to cookietemple's standards.
 
-.. image:: https://user-images.githubusercontent.com/31141763/97929216-f3432400-1d68-11eb-88b8-391fdfd2f4c9.gif
+.. image:: https://user-images.githubusercontent.com/31141763/155189594-4065538b-7955-437c-8b6c-e8f3b4cd178c.gif
 
 See `Linting your project <https://cookietemple.readthedocs.io/en/latest/lint.html>`_
 

diff --git a/cookietemple.cfg b/cookietemple.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.3.11
+current_version = 1.4.0
 
 [bumpversion_files_whitelisted]
 init_file = cookietemple/__init__.py

diff --git a/cookietemple/__init__.py b/cookietemple/__init__.py
@@ -1 +1 @@
-__version__ = "1.3.11"
+__version__ = "1.4.0"