Merge pull request #1317 from pimutils/chore/run_python_3.12

run tests with python 3.12
pimutils · Jan 29, 2024 · 9de3d98 · 9de3d98
2 parents d5e6ed3 + fc5ba54
commit 9de3d98
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         tox-test: ["default"]
 
     steps:

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -13,6 +13,7 @@ not released yet
 
 * UPDATED REQUIREMENT urwid is now required >= 2.1.0
 * FIX support urwid 2.4.2
+* NEW REQUIREMENT for tests on python >= 3.12: pkg_resources
 * optimization in ikhal when editing events in the far future or past
 * FIX an issue in ikhal with updating the view of the event list after editing
   an event

diff --git a/pyproject.toml b/pyproject.toml
@@ -19,6 +19,7 @@ classifiers = [
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
   "Topic :: Communications",
   "Topic :: Utilities",
 ]
@@ -39,10 +40,12 @@ proctitle = [
   "setproctitle"
 ]
 test = [
+  "pytest",
   "freezegun",
   "hypothesis",
   "packaging",
   "vdirsyncer",
+  "setuptools",  # python > 3.12 does not ship pkg_resources anymore
 ]
 docs = [
   "sphinx!=1.6.1",

diff --git a/tox.ini b/tox.ini
@@ -1,30 +1,19 @@
 [tox]
-envlist = {py38,py310,py311}-tests,py39-tests-{pytz2018.7,pytz_latest}
+envlist = {py38,py39,py310,py311,py312}-tests,py39-tests-{pytz2018.7,pytz_latest}
 skip_missing_interpreters = True
 
 [testenv]
 ignore_errors = True
 passenv =
   LANG
   CI
-  TRAVIS
-  TRAVIS_BRANCH
-  TRAVIS_BUILD_ID
-  TRAVIS_COMMIT
-  TRAVIS_JOB_ID
-  TRAVIS_JOB_NUMBER
-  TRAVIS_PULL_REQUEST
-  TRAVIS_REPO_SLUG
-deps =
-    pytest
-    freezegun
-    !py36: vdirsyncer
-    py36: vdirsyncer==0.16.8
-    python-dateutil
+
+extras =
     pytz20187: pytz==2018.7
     pytz_latest: pytz
-    hypothesis
 
+commands_pre =
+    pip install '.[test]'
 commands =
     py.test {posargs}
 
@@ -34,6 +23,7 @@ python =
     3.9: py39
     3.10: py310
     3.11: py311
+    3.12: py312
 
 [testenv:docs]
 whitelist_externals = make