Skip to content

Commit

Permalink
Adjust tests for python3.12, drop old taskwarrior version
Browse files Browse the repository at this point in the history
Basically merges parts of the original taskw PR
ralphbean/taskw#168 and
ralphbean/taskw#167
  • Loading branch information
bergercookie committed Jan 22, 2024
1 parent af172ef commit ea971ea
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 21 deletions.
10 changes: 3 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
fail-fast: true
matrix:
python-version: ["3.8", "3.9", "3.10"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
Expand All @@ -23,12 +23,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10"]
taskwarrior-version: [2.5.0, 2.5.1, 2.5.3]
# exclude:
# # Taskwarriror 2.5.3 only supported on Python 3.7+.
# - python-version: 3.5
# taskwarrior-version: 2.5.3
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
taskwarrior-version: [2.5.3, 2.6.2]
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{matrix.python-version}}
Expand Down
11 changes: 6 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ include = ["taskw_ng/py.typed", "CHANGELOG.md"]
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",
"Programming Language :: Python :: 3.12",
"License :: OSI Approved :: GNU General Public License (GPL)",
"Intended Audience :: Developers",
]
Expand All @@ -34,6 +34,7 @@ python = "^3.8"
kitchen = "^1.2.6"
pytz = "^2023.3.post1"
python-dateutil = "^2.8.2"
packaging = "^23.2"

# dev dependencies -------------------------------------------------------------
[tool.poetry.dev-dependencies]
Expand All @@ -48,7 +49,7 @@ pyfakefs = "^4.5.3"
pylint = "^2.12.2"
pyright = "*"
pytest = "*"
tox = "<3.0.0"
tox = "^4.12.1"
types-PyYAML = "^5.4.1"
types-python-dateutil = "^2.8.3"
types-setuptools = "^57.4.4"
Expand Down
15 changes: 6 additions & 9 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
[tox]
envlist = py{35,36,37,38}-tw{250,251} py{38}-tw{253}
envlist = py{38,39,310,311,312}-tw{253,262}
downloadcache = {toxworkdir}/_download/

[testenv]
basepython =
py35: python3.5
py36: python3.6
py37: python3.7
py38: python3.8
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/test_requirements.txt
py39: python3.9
py310: python3.10
py311: python3.11
py312: python3.12
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}"
Expand Down

0 comments on commit ea971ea

Please sign in to comment.