diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e9affa9..78f0c6d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,14 +9,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.5, 3.6, 3.7, 3.8] - taskwarrior-version: [2.5.0, 2.5.1, 2.5.3] - exclude: - # Taskwarriror 3.5.3 only supported on Python 3.7+. - - python-version: 3.5 - taskwarrior-version: 2.5.3 - - python-version: 3.6 - taskwarrior-version: 2.5.3 + python-version: ["3.8", "3.9", "3.10", "3.11"] + taskwarrior-version: [2.6.2] steps: - uses: actions/checkout@v2 - name: Set up Python ${{matrix.python-version}} @@ -25,7 +19,7 @@ jobs: python-version: ${{matrix.python-version}} - name: Install Taskwarrior ${{matrix.taskwarrior-version}} run: | - sudo apt-get install -y python-dev cmake build-essential libgnutls28-dev uuid-dev gnutls-bin chrpath libssl-dev libfontconfig1-dev + sudo apt-get install -y python3-dev cmake build-essential libgnutls28-dev uuid-dev gnutls-bin chrpath libssl-dev libfontconfig1-dev git clone https://github.com/GothenburgBitFactory/taskwarrior.git cd taskwarrior git checkout v${{matrix.taskwarrior-version}} diff --git a/setup.py b/setup.py index f71aa14..3a1c7c8 100644 --- a/setup.py +++ b/setup.py @@ -44,11 +44,10 @@ classifiers=[ "Development Status :: 5 - Production/Stable", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.4", - "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", "License :: OSI Approved :: GNU General Public License (GPL)", "Intended Audience :: Developers", ], diff --git a/test_requirements.txt b/test_requirements.txt index ad11115..4a009be 100644 --- a/test_requirements.txt +++ b/test_requirements.txt @@ -1,2 +1,2 @@ pytest -tox<3 +tox>=4 diff --git a/tox.ini b/tox.ini index 6f17a73..1b618a0 100644 --- a/tox.ini +++ b/tox.ini @@ -1,20 +1,18 @@ [tox] -envlist = py{35,36,37,38}-tw{250,251} py{38}-tw{253} +env_list = py{38,39,310,311}-tw{262} downloadcache = {toxworkdir}/_download/ [testenv] basepython = - py35: python3.5 - py36: python3.6 - py37: python3.7 py38: python3.8 + py39: python3.9 + py310: python3.10 + py311: python3.11 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test_requirements.txt setenv = - tw250: TASKWARRIOR=v2.5.0 - tw251: TASKWARRIOR=v2.5.1 - tw253: TASKWARRIOR=v2.5.3 + tw262: TASKWARRIOR=v2.6.2 sitepackages = False commands = {toxinidir}/.tox_build_taskwarrior.sh "{envdir}" "{toxinidir}"