Updated files with 'repo_helper'.

domdfcoding · Jun 19, 2023 · 599d5b7 · 599d5b7
1 parent 27a62a7
commit 599d5b7
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 36 deletions.
diff --git a/.github/workflows/docs_test_action.yml b/.github/workflows/docs_test_action.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout 🛎️
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v3"
 
       - name: Check for changed files
         uses: dorny/paths-filter@v2

diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml
@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout 🛎️
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v3"
 
       - name: Check for changed files
         uses: dorny/paths-filter@v2
@@ -33,7 +33,7 @@ jobs:
 
       - name: Setup Python 🐍
         if: steps.changes.outputs.code == 'true'
-        uses: "actions/setup-python@v2"
+        uses: "actions/setup-python@v4"
         with:
           python-version: "3.6"
 
@@ -43,7 +43,7 @@ jobs:
           python -VV
           python -m site
           python -m pip install --upgrade pip setuptools wheel
-          python -m pip install tox
+          python -m pip install tox~=3.0
 
       - name: "Run Flake8"
         if: steps.changes.outputs.code == 'true'

diff --git a/.github/workflows/manylinux_build.yml b/.github/workflows/manylinux_build.yml
@@ -34,10 +34,10 @@ jobs:
 
     steps:
       - name: Checkout 🛎️
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v3"
 
       - name: Set up Python 🐍
-        uses: actions/setup-python@v1
+        uses: "actions/setup-python@v4"
         with:
           python-version: "${{ matrix.config.python-version }}"
 
@@ -46,7 +46,7 @@ jobs:
           python -VV
           python -m site
           python -m pip install --upgrade pip setuptools wheel
-          python -m pip install --upgrade twine tox
+          python -m pip install --upgrade twine tox~=3.0
 
       - name: Build manylinux2010 Python wheels 🎡
         uses: RalfG/python-wheels-manylinux-build@v0.4.2-manylinux2010_x86_64
@@ -70,7 +70,7 @@ jobs:
           pip-wheel-args: '--no-deps -w ./wheelhouse'
 
       - name: Upload Artifacts 🚀
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: "wheels-${{ matrix.config.tag }}"
           path: wheelhouse/

diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: Checkout 🛎️
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v3"
 
       - name: Check for changed files
         uses: dorny/paths-filter@v2
@@ -38,7 +38,7 @@ jobs:
 
       - name: Setup Python 🐍
         if: steps.changes.outputs.code == 'true'
-        uses: "actions/setup-python@v2"
+        uses: "actions/setup-python@v4"
         with:
           python-version: "3.6"
 
@@ -48,7 +48,7 @@ jobs:
           python -VV
           python -m site
           python -m pip install --upgrade pip setuptools wheel
-          python -m pip install --upgrade tox virtualenv!=20.16.0
+          python -m pip install --upgrade tox~=3.0 virtualenv!=20.16.0
           sudo add-apt-repository universe
           sudo apt update
           sudo apt install libhdf5-dev netcdf-bin libnetcdf-dev
@@ -59,7 +59,7 @@ jobs:
           python -VV
           python -m site
           python -m pip install --upgrade pip setuptools wheel
-          python -m pip install --upgrade tox virtualenv!=20.16.0
+          python -m pip install --upgrade tox~=3.0 virtualenv!=20.16.0
           pip config set global.prefer-binary true
 
       - name: "Run mypy"

diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml
@@ -35,7 +35,7 @@ jobs:
 
     steps:
       - name: Checkout 🛎️
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v3"
 
       - name: Check for changed files
         if: startsWith(github.ref, 'refs/tags/') != true
@@ -50,7 +50,7 @@ jobs:
       - name: Setup Python 🐍
         id: setup-python
         if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }}
-        uses: "actions/setup-python@v2"
+        uses: "actions/setup-python@v4"
         with:
           python-version: "${{ matrix.config.python-version }}"
 
@@ -60,15 +60,15 @@ jobs:
           python -VV
           python -m site
           python -m pip install --upgrade pip setuptools wheel
-          python -m pip install --upgrade tox virtualenv!=20.16.0
+          python -m pip install --upgrade tox~=3.0 virtualenv!=20.16.0
           pip config set global.prefer-binary true
 
       - name: "Run Tests for Python ${{ matrix.config.python-version }}"
         if: steps.setup-python.outcome == 'success'
         run: python -m tox -e "${{ matrix.config.testenvs }}" -s false
 
       - name: "Upload Coverage 🚀"
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: ${{ always() && steps.setup-python.outcome == 'success' }}
         with:
           name: "coverage-${{ matrix.config.python-version }}"

diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml
@@ -37,7 +37,7 @@ jobs:
 
     steps:
       - name: Checkout 🛎️
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v3"
 
       - name: Check for changed files
         if: startsWith(github.ref, 'refs/tags/') != true
@@ -52,7 +52,7 @@ jobs:
       - name: Setup Python 🐍
         id: setup-python
         if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }}
-        uses: "actions/setup-python@v2"
+        uses: "actions/setup-python@v4"
         with:
           python-version: "${{ matrix.config.python-version }}"
 
@@ -62,7 +62,7 @@ jobs:
           python -VV
           python -m site
           python -m pip install --upgrade pip setuptools wheel
-          python -m pip install --upgrade tox virtualenv!=20.16.0
+          python -m pip install --upgrade tox~=3.0 virtualenv!=20.16.0
           python -m pip install --upgrade coverage_pyver_pragma
           sudo add-apt-repository universe
           sudo apt update
@@ -73,7 +73,7 @@ jobs:
         run: python -m tox -e "${{ matrix.config.testenvs }}" -s false
 
       - name: "Upload Coverage 🚀"
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: ${{ always() && steps.setup-python.outcome == 'success' }}
         with:
           name: "coverage-${{ matrix.config.python-version }}"
@@ -85,10 +85,10 @@ jobs:
     runs-on: "ubuntu-20.04"
     steps:
       - name: Checkout 🛎️
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v3"
 
       - name: Setup Python 🐍
-        uses: "actions/setup-python@v2"
+        uses: "actions/setup-python@v4"
         with:
           python-version: 3.8
 
@@ -98,7 +98,7 @@ jobs:
           python -m pip install --upgrade "coveralls>=3.0.0" coverage_pyver_pragma
 
       - name: "Download Coverage 🪂"
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           path: coverage
 
@@ -116,7 +116,7 @@ jobs:
 
       - name: "Upload Combined Coverage Artefact 🚀"
         if: ${{ steps.show.outcome != 'failure' }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: "combined-coverage"
           path: .coverage
@@ -134,11 +134,11 @@ jobs:
     runs-on: "ubuntu-20.04"
     steps:
       - name: Checkout 🛎️
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v3"
         if: startsWith(github.ref, 'refs/tags/')
 
       - name: Setup Python 🐍
-        uses: "actions/setup-python@v2"
+        uses: "actions/setup-python@v4"
         if: startsWith(github.ref, 'refs/tags/')
         with:
           python-version: 3.8
@@ -147,7 +147,7 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/')
         run: |
           python -m pip install --upgrade pip setuptools wheel
-          python -m pip install --upgrade tox
+          python -m pip install --upgrade tox~=3.0
 
       - name: Build distributions 📦
         if: startsWith(github.ref, 'refs/tags/')

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -3,6 +3,9 @@
 
 exclude: ^$
 
+ci:
+  autoupdate_schedule: quarterly
+
 repos:
  - repo: https://github.com/repo-helper/pyproject-parser
    rev: v0.7.0
@@ -51,7 +54,7 @@ repos:
     - id: flake2lint
 
  - repo: https://github.com/pre-commit/pygrep-hooks
-   rev: v1.9.0
+   rev: v1.10.0
    hooks:
     - id: python-no-eval
     - id: rst-backticks
@@ -67,7 +70,7 @@ repos:
        - --keep-runtime-typing
 
  - repo: https://github.com/Lucas-C/pre-commit-hooks
-   rev: v1.3.1
+   rev: v1.5.1
    hooks:
     - id: remove-crlf
     - id: forbid-crlf
@@ -84,7 +87,7 @@ repos:
       exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$
 
  - repo: https://github.com/domdfcoding/dep_checker
-   rev: v0.7.0
+   rev: v0.7.1
    hooks:
     - id: dep_checker
       args:

diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -9,9 +9,13 @@ formats:
  - pdf
  - htmlzip
 python:
-  version: 3.8
   install:
    - requirements: requirements.txt
    - requirements: doc-source/requirements.txt
-   - method: pip
-     path: .
+build:
+  os: ubuntu-20.04
+  tools:
+    python: '3.9'
+  jobs:
+    post_create_environment:
+     - pip install .
diff --git a/README.rst b/README.rst
@@ -98,7 +98,7 @@ PyMassSpec NIST Search
 	:target: https://github.com/domdfcoding/pynist/commit/master
 	:alt: GitHub last commit
 
-.. |maintained| image:: https://img.shields.io/maintenance/yes/2022
+.. |maintained| image:: https://img.shields.io/maintenance/yes/2023
 	:alt: Maintenance
 
 .. |pypi-downloads| image:: https://img.shields.io/pypi/dm/pyms-nist-search

diff --git a/doc-source/index.rst b/doc-source/index.rst
@@ -104,7 +104,7 @@ PyMassSpec NIST Search
 		:last-commit:
 		:alt: GitHub last commit
 
-	.. |maintained| maintained-shield:: 2022
+	.. |maintained| maintained-shield:: 2023
 		:alt: Maintenance
 
 	.. |pypi-downloads| pypi-shield::

diff --git a/tox.ini b/tox.ini
@@ -2,6 +2,8 @@
 # You may add new sections, but any changes made to the following sections will be lost:
 #     * tox
 #     * envlists
+#     * testenv:.package
+#     * testenv:py312-dev
 #     * testenv:docs
 #     * testenv:build
 #     * testenv:lint
@@ -23,13 +25,19 @@ requires =
     pip>=21,!=22.2
     tox-envlist>=0.2.1
     tox-pip-version>=0.0.7
+    tox~=3.0
     virtualenv!=20.16.0
 
 [envlists]
 test = py36, py37, py38, py39, py310
 qa = mypy, lint
 cov = py36, coverage
 
+[testenv:.package]
+setenv =
+    PYTHONDEVMODE=1
+    PIP_DISABLE_PIP_VERSION_CHECK=1
+
 [testenv:docs]
 setenv = SHOW_TODOS = 1
 passenv = SPHINX_BUILDER
@@ -39,12 +47,16 @@ deps = -r{toxinidir}/doc-source/requirements.txt
 commands = sphinx-build -M {env:SPHINX_BUILDER:html} . ./build {posargs}
 
 [testenv:build]
+setenv =
+    PYTHONDEVMODE=1
+    PIP_DISABLE_PIP_VERSION_CHECK=1
 skip_install = True
 changedir = {toxinidir}
 deps =
     build[virtualenv]>=0.3.1
     check-wheel-contents>=0.1.0
     twine>=3.2.0
+    cryptography<40; implementation_name == "pypy" and python_version <= "3.7"
 commands =
     python -m build --sdist --wheel "{toxinidir}"
     twine check dist/*.tar.gz dist/*.whl
@@ -93,7 +105,7 @@ basepython = python3.6
 ignore_errors = True
 changedir = {toxinidir}
 deps =
-    mypy==0.942
+    mypy==0.971
     -r{toxinidir}/tests/requirements.txt
     -r{toxinidir}/stubs.txt
 commands = mypy src/pyms_nist_search tests MoNA_GCMS_Library {posargs}