diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 8fc84c6..0e62d55 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -13,7 +13,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.6, 3.7, 3.8, 3.9, "3.10", "3.11"] + python-version: ["3.11", "3.10", "3.9", "3.8", "3.7", "3.6"] steps: - uses: actions/checkout@v2 @@ -23,7 +23,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install Dependencies run: | - python -m pip install --upgrade pip tox + python -m pip install --upgrade pip + python -m pip install tox tox-gh-actions - name: Run Tests - run: | - tox -e py$(python -c 'import sys;print("{0}{1}".format(*sys.version_info))') + run: tox diff --git a/setup.py b/setup.py index 4a8294c..ef3baba 100644 --- a/setup.py +++ b/setup.py @@ -28,21 +28,20 @@ def read(filepath): packages=find_packages(exclude=['tests', 'tests.*']), zip_safe=False, include_package_data=True, - install_requires=[], + install_requires=[ + 'Pillow>=7.0' + ], classifiers=[ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', 'Topic :: Utilities' ], ) diff --git a/tox.ini b/tox.ini index dce4efa..a90257d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,19 @@ [tox] envlist = - py{311,310,39,38,37,36}, + py{311,310,39,38}-pillow{7,8,9,10} + py37-pillow{9,8,7} + py36-pillow{8,7} coverage-report +[gh-actions] +python = + 3.6: py36 + 3.7: py37 + 3.8: py38 + 3.9: py39 + 3.10: py310 + 3.11: py311, coverage-report + [testenv] setenv = COVERAGE_FILE=.coverage.{envname} commands = python -m pytest --cov --cov-report term-missing:skip-covered @@ -10,7 +21,9 @@ deps = pytest pytest-cov mock>=1.0.1 - Pillow + pillow8: Pillow~=8.4.0 + pillow9: Pillow~=9.5.0 + pillow10: Pillow~=10.0.1 [testenv:coverage-report]