diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1278fe6..a9f90a7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,17 +13,15 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] python-version: - - '2.7' - '3.7' - '3.8' - '3.9' - '3.10' include: - # Python 3.6 is not supported in Ubuntu 22.04, so manually adding it to matrix with older version of Ubuntu - - os: ubuntu-20.04 - python-version: '3.6' + - os: ubuntu-22.04 + python-version: '3.7' - os: windows-latest - python-version: '3.6' + python-version: '3.7' runs-on: ${{ matrix.os }} @@ -51,7 +49,7 @@ jobs: - name: Run tests with PyTest 5 run: tox - if: ${{ matrix.python-version != '2.7' && matrix.python-version != '3.10' }} + if: ${{ matrix.python-version != '3.10' }} env: PLATFORM: ${{ matrix.os }} PYTEST_MAJOR_VERSION: 5 @@ -59,7 +57,6 @@ jobs: - name: Run tests with PyTest 6 run: tox - if: ${{ matrix.python-version != '2.7' }} env: PLATFORM: ${{ matrix.os }} PYTEST_MAJOR_VERSION: 6 @@ -67,7 +64,6 @@ jobs: - name: Run tests with PyTest 7 run: tox - if: ${{ matrix.python-version != '2.7' }} env: PLATFORM: ${{ matrix.os }} PYTEST_MAJOR_VERSION: 7 diff --git a/setup.py b/setup.py index a5f563f..82548c3 100644 --- a/setup.py +++ b/setup.py @@ -15,13 +15,17 @@ author_email="utagawakiki@gmail.com", url="https://github.com/pytest-dev/pytest-github-actions-annotate-failures", license="MIT", - classifiers=["Framework :: Pytest",], - python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*", + classifiers=[ + "Framework :: Pytest", + ], + python_requires=">=3.7", packages=find_packages(), entry_points={ "pytest11": [ "pytest_github_actions_annotate_failures = pytest_github_actions_annotate_failures.plugin", ], }, - install_requires=["pytest>=4.0.0",], + install_requires=[ + "pytest>=4.0.0", + ], ) diff --git a/tox.ini b/tox.ini index 83ed187..6fcee73 100644 --- a/tox.ini +++ b/tox.ini @@ -3,8 +3,6 @@ envlist = py27-pytest4-{linux,windows}, py{36,37,38,39}-pytest{4,5,6,7}-{linux,w [gh-actions] python = - 2.7: py27 - 3.6: py36 3.7: py37 3.8: py38 3.9: py39