feat: add support for Python 3.12; drop support for Python 3.7

Pylons · May 3, 2024 · 097cc91 · 097cc91
1 parent 350d0c3
commit 097cc91
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 13 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,2 @@
+[coverage:report]
+show_missing = true
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -3,18 +3,22 @@
 Change Log
 ----------
 
-2.6.1 (unreleased)
+2.7.0 (unreleased)
 ~~~~~~~~~~~~~~~~~~
 
+- Add support for Python 3.9 - 3.12.
+
+- Drop support for Python 3.7.
+
 - Deprecate ``?demostorage`` in favour of ``demo:`` URI scheme.
 
 
 2.6.0 (2023-05-17)
 ~~~~~~~~~~~~~~~~~~
 
-- Stop support for ZODB4
+- Drop support for ZODB4
 
-- Stop support for python<3.7
+- Drop support for python<3.7
 
 
 2.5.0 (2021-05-12)

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -9,6 +9,8 @@ include contributing.md
 include CONTRIBUTORS.txt
 include COPYRIGHT.txt
 include LICENSE.txt
+include .coveragerc
+include pytest.ini
 
 include tox.ini rtd.txt
 

diff --git a/pytest.ini b/pytest.ini
@@ -0,0 +1,7 @@
+[pytest]
+addopts = -l --strict
+norecursedirs = lib include .tox .git
+python_files = test_*.py
+filterwarnings =
+     ignore::DeprecationWarning:pkg_resources
+
diff --git a/setup.py b/setup.py
@@ -34,11 +34,11 @@
         "Intended Audience :: Developers",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "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",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "License :: Repoze Public License",
@@ -51,9 +51,8 @@
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
-      tests_require = tests_require,
+      python_requires='>=3.8',
       install_requires = requires,
-      test_suite="zodburi",
       entry_points="""\
       [zodburi.resolvers]
       zeo = zodburi.resolvers:client_storage_resolver

diff --git a/tox.ini b/tox.ini
@@ -1,25 +1,25 @@
 [tox]
 envlist =
-    py37,py38,py39,py310,py311,pypy3,cover,docs,lint
+    py38,py39,py310,py311,py312,pypy3,cover,docs,lint
 
 [testenv]
 commands =
-    python setup.py -q test -q
+    py.test -q
 deps =
+    pytest
     mock
     ZODB==5.*
     ZEO==5.*
 
 [testenv:cover]
 basepython =
-    python3.9
+    python3.12
 commands =
-    python setup.py nosetests --with-xunit --with-xcoverage
+    pytest --cov=zodburi --cov-fail-under=100
 deps =
     {[testenv]deps}
-    nose
-    coverage
-    nosexcover
+    pytest
+    pytest-cov
 
 # we separate coverage into its own testenv because a) "last run wins" wrt
 # cobertura jenkins reporting and b) pypy and jython can't handle any