Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/flake8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ permissions:
jobs:
Run:
name: "Flake8"
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-22.04"

steps:
- name: Checkout 🛎️
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mypy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

strategy:
matrix:
os: ['ubuntu-20.04', 'windows-2019']
os: ['ubuntu-22.04', 'windows-2019']
fail-fast: false

steps:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/python_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,4 @@ jobs:
with:
name: "coverage-${{ matrix.config.python-version }}"
path: .coverage
include-hidden-files: true
11 changes: 6 additions & 5 deletions .github/workflows/python_ci_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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}
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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' }}
Expand All @@ -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"
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/python_ci_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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 🛎️
Expand Down Expand Up @@ -73,3 +73,4 @@ jobs:
with:
name: "coverage-${{ matrix.config.python-version }}"
path: .coverage
include-hidden-files: true
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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$
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions doc-source/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion doc-source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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::
Expand Down
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading