Updated files with 'repo_helper'.

domdfcoding · May 10, 2021 · 66f65f6 · 66f65f6
1 parent 3a24c23
commit 66f65f6
Show file tree

Hide file tree

Showing 24 changed files with 410 additions and 309 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -7,10 +7,17 @@ tag = True
 
 [bumpversion:file:cawdrey/__init__.py]
 
+search = : str = "{current_version}"
+replace = : str = "{new_version}"
+
 [bumpversion:file:README.rst]
 
 [bumpversion:file:doc-source/index.rst]
 
 [bumpversion:file:repo_helper.yml]
 
 [bumpversion:file:pyproject.toml]
+
+[bumpversion:file:setup.cfg]
+search = version = {current_version}
+replace = version = {new_version}
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -17,7 +17,10 @@ THE ISSUE WILL BE CLOSED IF INSUFFICIENT INFORMATION IS PROVIDED.
 
 
 ## Steps to Reproduce
-<!--Please add a series of steps to reproduce the issue-->
+<!--Please add a series of steps to reproduce the issue.
+
+If possible, please include a small, self-contained reproduction.
+-->
 
    1.
    2.
@@ -41,7 +44,7 @@ THE ISSUE WILL BE CLOSED IF INSUFFICIENT INFORMATION IS PROVIDED.
   * Cawdrey:
 
 ## Installation source
-<!-- e.g. Github repository, Github Releases, PyPI/pip, Anaconda/conda -->
+<!-- e.g. GitHub repository, GitHub Releases, PyPI/pip, Anaconda/conda -->
 
 
 ## Other Additional Information:

diff --git a/.github/actions_build_conda.sh b/.github/actions_build_conda.sh
@@ -3,7 +3,7 @@
 
 set -e -x
 
-python -m repo_helper make-recipe || exit 1
+python -m mkrecipe --type wheel || exit 1
 
 # Switch to miniconda
 source "/home/runner/miniconda/etc/profile.d/conda.sh"

diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml
@@ -4,9 +4,11 @@ name: Conda Tests
 
 on:
   push:
-  pull_request:
     branches: ["master"]
 
+permissions:
+  contents: read
+
 jobs:
   tests:
     name: "Conda"

diff --git a/.github/workflows/docs_test_action.yml b/.github/workflows/docs_test_action.yml
@@ -2,18 +2,31 @@
 ---
 name: "Docs Check"
 on:
-  - pull_request
   - push
 
+permissions:
+  contents: read
+
 jobs:
   docs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout 🛎️
         uses: "actions/checkout@v1"
+
+      - name: Check for changed files
+        uses: dorny/paths-filter@v2
+        id: changes
+        with:
+          list-files: "json"
+          filters: |
+            code:
+              - '!tests/**'
+
       - name: Install and Build 🔧
-        uses: ammaraskar/sphinx-action@master
+        uses: sphinx-toolbox/sphinx-action@sphinx-3.3.1
+        if: steps.changes.outputs.code == 'true'
         with:
-          pre-build-command: apt-get update && apt-get install gcc python3-dev git pandoc -y && python -m pip install tox
+          pre-build-command: python -m pip install tox
           docs-folder: "doc-source/"
           build-command: "tox -e docs -- -W "
diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml
@@ -4,8 +4,9 @@ name: Flake8
 
 on:
   push:
-  pull_request:
-    branches: ["master"]
+
+permissions:
+  contents: read
 
 jobs:
   Run:
@@ -16,17 +17,29 @@ jobs:
       - name: Checkout 🛎️
         uses: "actions/checkout@v2"
 
+      - name: Check for changed files
+        uses: dorny/paths-filter@v2
+        id: changes
+        with:
+          list-files: "json"
+          filters: |
+            code:
+              - '!(doc-source/**|CONTRIBUTING.rst|.imgbotconfig|.pre-commit-config.yaml|.pylintrc|.readthedocs.yml)'
+
       - name: Setup Python 🐍
+        if: steps.changes.outputs.code == 'true'
         uses: "actions/setup-python@v2"
         with:
-          python-version: "3.8"
+          python-version: "3.6"
 
       - name: Install dependencies 🔧
+        if: steps.changes.outputs.code == 'true'
         run: |
           python -VV
           python -m site
           python -m pip install --upgrade pip setuptools wheel
           python -m pip install tox
 
       - name: "Run Flake8"
-        run: "python -m tox -e lint -- --format github"
+        if: steps.changes.outputs.code == 'true'
+        run: "python -m tox -e lint -s false -- --format github"
diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
@@ -4,8 +4,9 @@ name: mypy
 
 on:
   push:
-  pull_request:
-    branches: ["master"]
+
+permissions:
+  contents: read
 
 jobs:
   Run:
@@ -14,14 +15,24 @@ jobs:
 
     strategy:
       matrix:
-        os: ['windows-2019', 'macos-latest', 'ubuntu-20.04']
+        os: ['ubuntu-20.04', 'windows-2019']
       fail-fast: false
 
     steps:
       - name: Checkout 🛎️
         uses: "actions/checkout@v2"
 
+      - name: Check for changed files
+        uses: dorny/paths-filter@v2
+        id: changes
+        with:
+          list-files: "json"
+          filters: |
+            code:
+              - '!(doc-source/**|CONTRIBUTING.rst|.imgbotconfig|.pre-commit-config.yaml|.pylintrc|.readthedocs.yml)'
+
       - name: Setup Python 🐍
+        if: steps.changes.outputs.code == 'true'
         uses: "actions/setup-python@v2"
         with:
           python-version: "3.6"
@@ -34,4 +45,5 @@ jobs:
           python -m pip install --upgrade tox virtualenv
 
       - name: "Run mypy"
-        run: "python -m tox -e mypy"
+        if: steps.changes.outputs.code == 'true'
+        run: "python -m tox -e mypy -s false"
diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml
@@ -4,16 +4,18 @@ name: Windows
 
 on:
   push:
-  pull_request:
-    branches: ["master"]
+
+permissions:
+  actions: write
+  contents: read
 
 jobs:
   tests:
     name: "windows-2019 / Python ${{ matrix.config.python-version }}"
     runs-on: "windows-2019"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.5,pypy-3.6,pypy-3.7'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-beta.1,pypy-3.6,pypy-3.7'
 
     strategy:
       fail-fast: False
@@ -23,32 +25,46 @@ jobs:
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
           - {python-version: "3.8", testenvs: "py38,build", experimental: False}
           - {python-version: "3.9", testenvs: "py39,build", experimental: False}
-          - {python-version: "3.10.0-alpha.5", testenvs: "py310-dev,build", experimental: True}
+          - {python-version: "3.10.0-beta.1", testenvs: "py310-dev,build", experimental: True}
           - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
-          - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False}
+          - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
 
     steps:
       - name: Checkout 🛎️
         uses: "actions/checkout@v2"
 
+      - name: Check for changed files
+        if: startsWith(github.ref, 'refs/tags/') != true
+        uses: dorny/paths-filter@v2
+        id: changes
+        with:
+          list-files: "json"
+          filters: |
+            code:
+              - '!(doc-source/**|CONTRIBUTING.rst|.imgbotconfig|.pre-commit-config.yaml|.pylintrc|.readthedocs.yml)'
+
       - name: Setup Python 🐍
+        id: setup-python
+        if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }}
         uses: "actions/setup-python@v2"
         with:
           python-version: "${{ matrix.config.python-version }}"
 
       - name: Install dependencies 🔧
+        if: steps.setup-python.outcome == 'success'
         run: |
           python -VV
           python -m site
           python -m pip install --upgrade pip setuptools wheel
           python -m pip install --upgrade tox virtualenv
 
       - name: "Run Tests for Python ${{ matrix.config.python-version }}"
-        run: python -m tox -e "${{ matrix.config.testenvs }}"
+        if: steps.setup-python.outcome == 'success'
+        run: python -m tox -e "${{ matrix.config.testenvs }}" -s false
 
       - name: "Upload Coverage 🚀"
         uses: actions/upload-artifact@v2
-        if: ${{ always() }}
+        if: ${{ always() && steps.setup-python.outcome == 'success' }}
         with:
           name: "coverage-${{ matrix.config.python-version }}"
           path: .coverage
diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml
@@ -4,16 +4,18 @@ name: Linux
 
 on:
   push:
-  pull_request:
-    branches: ["master"]
+
+permissions:
+  actions: write
+  contents: read
 
 jobs:
   tests:
     name: "ubuntu-20.04 / Python ${{ matrix.config.python-version }}"
     runs-on: "ubuntu-20.04"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.5,pypy-3.6,pypy-3.7'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-beta.1,pypy-3.6,pypy-3.7'
 
     strategy:
       fail-fast: False
@@ -23,20 +25,33 @@ jobs:
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
           - {python-version: "3.8", testenvs: "py38,build", experimental: False}
           - {python-version: "3.9", testenvs: "py39,build", experimental: False}
-          - {python-version: "3.10.0-alpha.5", testenvs: "py310-dev,build", experimental: True}
+          - {python-version: "3.10.0-beta.1", testenvs: "py310-dev,build", experimental: True}
           - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
-          - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False}
+          - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
 
     steps:
       - name: Checkout 🛎️
         uses: "actions/checkout@v2"
 
+      - name: Check for changed files
+        if: startsWith(github.ref, 'refs/tags/') != true
+        uses: dorny/paths-filter@v2
+        id: changes
+        with:
+          list-files: "json"
+          filters: |
+            code:
+              - '!(doc-source/**|CONTRIBUTING.rst|.imgbotconfig|.pre-commit-config.yaml|.pylintrc|.readthedocs.yml)'
+
       - name: Setup Python 🐍
+        id: setup-python
+        if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }}
         uses: "actions/setup-python@v2"
         with:
           python-version: "${{ matrix.config.python-version }}"
 
       - name: Install dependencies 🔧
+        if: steps.setup-python.outcome == 'success'
         run: |
           python -VV
           python -m site
@@ -45,11 +60,12 @@ jobs:
           python -m pip install --upgrade coverage_pyver_pragma
 
       - name: "Run Tests for Python ${{ matrix.config.python-version }}"
-        run: python -m tox -e "${{ matrix.config.testenvs }}"
+        if: steps.setup-python.outcome == 'success'
+        run: python -m tox -e "${{ matrix.config.testenvs }}" -s false
 
       - name: "Upload Coverage 🚀"
         uses: actions/upload-artifact@v2
-        if: ${{ always() }}
+        if: ${{ always() && steps.setup-python.outcome == 'success' }}
         with:
           name: "coverage-${{ matrix.config.python-version }}"
           path: .coverage
@@ -127,14 +143,13 @@ jobs:
 
       - name: Upload distribution to PyPI 🚀
         if: startsWith(github.ref, 'refs/tags/')
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@v1.4.2
         with:
           user: __token__
           password: ${{ secrets.PYPI_TOKEN }}
           skip_existing: true
 
 
-
   Conda:
     needs: deploy
     runs-on: "ubuntu-20.04"
@@ -151,7 +166,7 @@ jobs:
       - name: Install dependencies 🔧
         run: |
           python -m pip install --upgrade pip setuptools wheel
-          python -m pip install --upgrade repo_helper
+          python -m pip install --upgrade mkrecipe
 
           wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
           bash miniconda.sh -b -p $HOME/miniconda