Skip to content

Commit ea971ea

Browse files
committed
Adjust tests for python3.12, drop old taskwarrior version
Basically merges parts of the original taskw PR ralphbean/taskw#168 and ralphbean/taskw#167
1 parent af172ef commit ea971ea

File tree

3 files changed

+15
-21
lines changed

3 files changed

+15
-21
lines changed

.github/workflows/ci.yml

+3-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
fail-fast: true
1010
matrix:
11-
python-version: ["3.8", "3.9", "3.10"]
11+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
1212
steps:
1313
- uses: actions/checkout@v2
1414
- uses: actions/setup-python@v2
@@ -23,12 +23,8 @@ jobs:
2323
runs-on: ubuntu-latest
2424
strategy:
2525
matrix:
26-
python-version: ["3.8", "3.9", "3.10"]
27-
taskwarrior-version: [2.5.0, 2.5.1, 2.5.3]
28-
# exclude:
29-
# # Taskwarriror 2.5.3 only supported on Python 3.7+.
30-
# - python-version: 3.5
31-
# taskwarrior-version: 2.5.3
26+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
27+
taskwarrior-version: [2.5.3, 2.6.2]
3228
steps:
3329
- uses: actions/checkout@v2
3430
- name: Set up Python ${{matrix.python-version}}

pyproject.toml

+6-5
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ include = ["taskw_ng/py.typed", "CHANGELOG.md"]
1414
classifiers = [
1515
"Development Status :: 5 - Production/Stable",
1616
"Programming Language :: Python :: 3",
17-
"Programming Language :: Python :: 3.4",
18-
"Programming Language :: Python :: 3.5",
19-
"Programming Language :: Python :: 3.6",
20-
"Programming Language :: Python :: 3.7",
2117
"Programming Language :: Python :: 3.8",
18+
"Programming Language :: Python :: 3.9",
19+
"Programming Language :: Python :: 3.10",
20+
"Programming Language :: Python :: 3.11",
21+
"Programming Language :: Python :: 3.12",
2222
"License :: OSI Approved :: GNU General Public License (GPL)",
2323
"Intended Audience :: Developers",
2424
]
@@ -34,6 +34,7 @@ python = "^3.8"
3434
kitchen = "^1.2.6"
3535
pytz = "^2023.3.post1"
3636
python-dateutil = "^2.8.2"
37+
packaging = "^23.2"
3738

3839
# dev dependencies -------------------------------------------------------------
3940
[tool.poetry.dev-dependencies]
@@ -48,7 +49,7 @@ pyfakefs = "^4.5.3"
4849
pylint = "^2.12.2"
4950
pyright = "*"
5051
pytest = "*"
51-
tox = "<3.0.0"
52+
tox = "^4.12.1"
5253
types-PyYAML = "^5.4.1"
5354
types-python-dateutil = "^2.8.3"
5455
types-setuptools = "^57.4.4"

tox.ini

+6-9
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
[tox]
2-
envlist = py{35,36,37,38}-tw{250,251} py{38}-tw{253}
2+
envlist = py{38,39,310,311,312}-tw{253,262}
33
downloadcache = {toxworkdir}/_download/
44

55
[testenv]
66
basepython =
7-
py35: python3.5
8-
py36: python3.6
9-
py37: python3.7
107
py38: python3.8
11-
deps =
12-
-r{toxinidir}/requirements.txt
13-
-r{toxinidir}/test_requirements.txt
8+
py39: python3.9
9+
py310: python3.10
10+
py311: python3.11
11+
py312: python3.12
1412
setenv =
15-
tw250: TASKWARRIOR=v2.5.0
16-
tw251: TASKWARRIOR=v2.5.1
1713
tw253: TASKWARRIOR=v2.5.3
14+
tw262: TASKWARRIOR=v2.6.2
1815
sitepackages = False
1916
commands =
2017
{toxinidir}/.tox_build_taskwarrior.sh "{envdir}" "{toxinidir}"

0 commit comments

Comments
 (0)