diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index 138fc29..6b39b01 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -16,7 +16,7 @@ permissions: jobs: Run: name: "Flake8" - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" steps: - name: Checkout 🛎️ diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index 298a319..9cd7054 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: - os: ['ubuntu-20.04', 'windows-2019'] + os: ['ubuntu-22.04', 'windows-2019'] fail-fast: false steps: diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 0987397..dae9eae 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -73,3 +73,4 @@ jobs: with: name: "coverage-${{ matrix.config.python-version }}" path: .coverage + include-hidden-files: true diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 336db76..55a4fd5 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -19,8 +19,8 @@ permissions: jobs: tests: - name: "ubuntu-20.04 / Python ${{ matrix.config.python-version }}" - runs-on: "ubuntu-20.04" + name: "ubuntu-22.04 / Python ${{ matrix.config.python-version }}" + runs-on: "ubuntu-22.04" continue-on-error: ${{ matrix.config.experimental }} env: USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10' @@ -29,7 +29,6 @@ jobs: fail-fast: False matrix: config: - - {python-version: "3.6", testenvs: "py36-pillow{8.1,8.2,8.3,8.4},build", experimental: False} - {python-version: "3.7", testenvs: "py37-pillow{8.1,8.2,8.3,8.4,9.0,9.1,9.2},build", experimental: False} - {python-version: "3.8", testenvs: "py38-pillow{8.1,8.2,8.3,8.4,9.0,9.1,9.2},build", experimental: False} - {python-version: "3.9", testenvs: "py39-pillow{8.1,8.2,8.3,8.4,9.0,9.1,9.2},build", experimental: False} @@ -75,11 +74,12 @@ jobs: with: name: "coverage-${{ matrix.config.python-version }}" path: .coverage + include-hidden-files: true Coverage: needs: tests - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" steps: - name: Checkout 🛎️ uses: "actions/checkout@v4" @@ -117,6 +117,7 @@ jobs: with: name: "combined-coverage" path: .coverage + include-hidden-files: true - name: "Upload Combined Coverage to Coveralls" if: ${{ steps.show.outcome != 'failure' }} @@ -128,7 +129,7 @@ jobs: Deploy: needs: tests - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" steps: - name: Checkout 🛎️ uses: "actions/checkout@v4" diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 22d794c..d4b16e0 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -18,8 +18,8 @@ permissions: jobs: tests: - name: "macos-13 / Python ${{ matrix.config.python-version }}" - runs-on: "macos-13" + name: "macos-${{ matrix.config.os-ver }} / Python ${{ matrix.config.python-version }}" + runs-on: "macos-${{ matrix.config.os-ver }}" continue-on-error: ${{ matrix.config.experimental }} env: USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10' @@ -28,11 +28,11 @@ jobs: fail-fast: False matrix: config: - - {python-version: "3.6", testenvs: "py36-pillow{8.1,8.2,8.3,8.4},build", experimental: False} - - {python-version: "3.7", testenvs: "py37-pillow{8.1,8.2,8.3,8.4,9.0,9.1,9.2},build", experimental: False} - - {python-version: "3.8", testenvs: "py38-pillow{8.1,8.2,8.3,8.4,9.0,9.1,9.2},build", experimental: False} - - {python-version: "3.9", testenvs: "py39-pillow{8.1,8.2,8.3,8.4,9.0,9.1,9.2},build", experimental: False} - - {python-version: "3.10", testenvs: "py310-pillow{8.1,8.2,8.3,8.4,9.0,9.1,9.2},build", experimental: False} + - {python-version: "3.6", os-ver: "13", testenvs: "py36-pillow{8.1,8.2,8.3,8.4},build", experimental: False} + - {python-version: "3.7", os-ver: "13", testenvs: "py37-pillow{8.1,8.2,8.3,8.4,9.0,9.1,9.2},build", experimental: False} + - {python-version: "3.8", os-ver: "14", testenvs: "py38-pillow{8.1,8.2,8.3,8.4,9.0,9.1,9.2},build", experimental: False} + - {python-version: "3.9", os-ver: "14", testenvs: "py39-pillow{8.1,8.2,8.3,8.4,9.0,9.1,9.2},build", experimental: False} + - {python-version: "3.10", os-ver: "14", testenvs: "py310-pillow{8.1,8.2,8.3,8.4,9.0,9.1,9.2},build", experimental: False} steps: - name: Checkout 🛎️ @@ -73,3 +73,4 @@ jobs: with: name: "coverage-${{ matrix.config.python-version }}" path: .coverage + include-hidden-files: true diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f877151..ccf2bb0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ ci: repos: - repo: https://github.com/repo-helper/pyproject-parser - rev: v0.11.1 + rev: v0.13.0 hooks: - id: reformat-pyproject @@ -81,7 +81,7 @@ repos: - id: snippet-fmt - repo: https://github.com/python-formate/formate - rev: v0.7.0 + rev: v0.8.0 hooks: - id: formate exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$ diff --git a/.readthedocs.yml b/.readthedocs.yml index e928b70..83fc025 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -13,7 +13,7 @@ python: - requirements: requirements.txt - requirements: doc-source/requirements.txt build: - os: ubuntu-20.04 + os: ubuntu-22.04 tools: python: '3.9' jobs: diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index ce35b76..629a22c 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -38,11 +38,11 @@ Automated tests ------------------- Tests are run with ``tox`` and ``pytest``. -To run tests for a specific Python version, such as Python 3.6: +To run tests for a specific Python version, such as Python 3.10: .. code-block:: bash - $ tox -e py36 + $ tox -e py310 To run tests for all Python versions, simply run: diff --git a/README.rst b/README.rst index 92ad6ce..1d5a465 100644 --- a/README.rst +++ b/README.rst @@ -100,7 +100,7 @@ Can also create wordclouds from directories of source files or a single source f :target: https://github.com/domdfcoding/wordle/commit/master :alt: GitHub last commit -.. |maintained| image:: https://img.shields.io/maintenance/yes/2024 +.. |maintained| image:: https://img.shields.io/maintenance/yes/2025 :alt: Maintenance .. |pypi-downloads| image:: https://img.shields.io/pypi/dm/wordle diff --git a/doc-source/contributing.rst b/doc-source/contributing.rst index 6fef380..3bd688c 100644 --- a/doc-source/contributing.rst +++ b/doc-source/contributing.rst @@ -37,11 +37,11 @@ Automated tests ------------------- Tests are run with ``tox`` and ``pytest``. -To run tests for a specific Python version, such as Python 3.6: +To run tests for a specific Python version, such as Python 3.10: .. prompt:: bash - tox -e py36 + tox -e py310 To run tests for all Python versions, simply run: diff --git a/doc-source/index.rst b/doc-source/index.rst index fae1fe8..e2b97be 100644 --- a/doc-source/index.rst +++ b/doc-source/index.rst @@ -106,7 +106,7 @@ Can also create wordclouds from directories of source files or a single source f :last-commit: :alt: GitHub last commit - .. |maintained| maintained-shield:: 2024 + .. |maintained| maintained-shield:: 2025 :alt: Maintenance .. |pypi-downloads| pypi-shield:: diff --git a/tox.ini b/tox.ini index 91149c9..d1b0aef 100644 --- a/tox.ini +++ b/tox.ini @@ -46,7 +46,6 @@ test = py38-pillow{8.1,8.2,8.3,8.4,9.0,9.1,9.2} py39-pillow{8.1,8.2,8.3,8.4,9.0,9.1,9.2} py310-pillow{8.1,8.2,8.3,8.4,9.0,9.1,9.2} - py311-dev-pillow{8.1,8.2,8.3,8.4,9.0,9.1,9.2} qa = mypy, lint cov = py37-pillow8.1, coverage