nti.testing 4.2.0.post0__tar.gz → 4.4.0__tar.gz

{nti_testing-4.2.0.post0 → nti_testing-4.4.0}/.readthedocs.yml

@@ -24,7 +24,7 @@ build:
   # os is required for some reason
   os: ubuntu-22.04
   tools:
-    python: "3.11"
+    python: "3.12"
 
 python:
   install:

{nti_testing-4.2.0.post0 → nti_testing-4.4.0}/CHANGES.rst

@@ -2,6 +2,21 @@
  Changes
 =========
 
+4.4.0 (2025-11-14)
+==================
+
+- Move ZODB and related dependencies to the optional 'zodb' extra.
+- Add support for Python 3.14.
+
+
+4.3.0 (2025-04-22)
+==================
+
+- Support and require testgres version 1.11. This version refactored
+  some internals, breaking the monkey-patches that ``DatabaseLayer``
+  applies.
+
+
 4.2.0.post0 (2024-11-08)
 ========================
 

{nti_testing-4.2.0.post0 → nti_testing-4.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: nti.testing
-Version: 4.2.0.post0
+Version: 4.4.0
 Summary: Support for testing code
 Home-page: https://github.com/OpenNTI/nti.testing
 Author: Jason Madden
@@ -18,13 +18,13 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Software Development :: Testing
 Classifier: Framework :: Zope3
 Requires-Python: >=3.10
 License-File: LICENSE
-Requires-Dist: ZODB>=5.6.0
 Requires-Dist: zope.interface>=5.4.0
 Requires-Dist: pyhamcrest
 Requires-Dist: six
@@ -35,18 +35,38 @@ Requires-Dist: zope.dottedname
 Requires-Dist: zope.exceptions
 Requires-Dist: zope.schema
 Requires-Dist: zope.testing
+Provides-Extra: zodb
+Requires-Dist: ZODB>=5.6.0; extra == "zodb"
 Provides-Extra: test
 Requires-Dist: Acquisition; extra == "test"
-Requires-Dist: zope.site; extra == "test"
 Requires-Dist: zope.testrunner; extra == "test"
-Requires-Dist: testgres>=1.10; extra == "test"
+Requires-Dist: testgres>=1.11; extra == "test"
 Requires-Dist: psycopg2-binary; platform_python_implementation != "PyPy" and extra == "test"
+Provides-Extra: test-zodb
+Requires-Dist: zope.site; extra == "test-zodb"
 Provides-Extra: docs
 Requires-Dist: Sphinx; extra == "docs"
 Requires-Dist: furo; extra == "docs"
+Requires-Dist: Acquisition; extra == "docs"
+Requires-Dist: zope.testrunner; extra == "docs"
+Requires-Dist: testgres>=1.11; extra == "docs"
+Requires-Dist: psycopg2-binary; platform_python_implementation != "PyPy" and extra == "docs"
 Provides-Extra: testgres
-Requires-Dist: testgres>=1.10; extra == "testgres"
+Requires-Dist: testgres>=1.11; extra == "testgres"
 Requires-Dist: psycopg2-binary; platform_python_implementation != "PyPy" and extra == "testgres"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: project-url
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 =============
  nti.testing
@@ -302,6 +322,21 @@ ZODB in `nti.testing.zodb`. See the API documentation for details.
  Changes
 =========
 
+4.4.0 (2025-11-14)
+==================
+
+- Move ZODB and related dependencies to the optional 'zodb' extra.
+- Add support for Python 3.14.
+
+
+4.3.0 (2025-04-22)
+==================
+
+- Support and require testgres version 1.11. This version refactored
+  some internals, breaking the monkey-patches that ``DatabaseLayer``
+  applies.
+
+
 4.2.0.post0 (2024-11-08)
 ========================
 

{nti_testing-4.2.0.post0 → nti_testing-4.4.0}/setup.py

@@ -6,16 +6,15 @@ from setuptools import setup
 from setuptools import find_namespace_packages
 
 
-version = '4.2.0.post0'
+version = '4.4.0'
 
 entry_points = {
 }
 
 TESTS_REQUIRE = [
     'Acquisition',
-    'zope.site',
     'zope.testrunner',
-    'testgres >= 1.10',
+    'testgres >= 1.11',
     'psycopg2-binary; python_implementation != "PyPy"',
 ]
 
@@ -47,6 +46,7 @@ setup(
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
         'Programming Language :: Python :: 3.13',
+        'Programming Language :: Python :: 3.14',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Software Development :: Testing',
@@ -56,7 +56,6 @@ setup(
     packages=find_namespace_packages(where='src'),
     package_dir={'': 'src'},
     install_requires=[
-        'ZODB >= 5.6.0',
         # Error messages changed in 5.1, reprs changed <= 5.4
         'zope.interface >= 5.4.0',
         'pyhamcrest',
@@ -72,13 +71,19 @@ setup(
     entry_points=entry_points,
     include_package_data=True,
     extras_require={
+        'zodb': [
+            'ZODB >= 5.6.0',
+        ],
         'test': TESTS_REQUIRE,
+        'test-zodb': [
+            'zope.site',
+        ],
         'docs': [
             'Sphinx',
             'furo',
-        ],
+        ] + TESTS_REQUIRE,
         'testgres': [
-            'testgres >= 1.10',
+            'testgres >= 1.11',
             'psycopg2-binary; python_implementation != "PyPy"',
         ],
     },

{nti_testing-4.2.0.post0 → nti_testing-4.4.0}/src/nti/testing/layers/postgres.py

@@ -82,8 +82,10 @@ def patched_get_pg_version(*args, **kwargs):
     # We patch  this in testgres.node, so its ok to import
     # the original. In version 1.10, they changed the signature
     # of this function, so be sure to accept whatever it does and
-    # pass it on.
-    from testgres.utils import get_pg_version
+    # pass it on. In version 1.11, this was replaced with
+    # get_pg_version2, which does the same thing just takes
+    # more arguments.
+    from testgres.utils import get_pg_version2
     from testgres.node import PgVer
     from packaging.version import InvalidVersion
 
@@ -94,7 +96,7 @@ def patched_get_pg_version(*args, **kwargs):
     # "15.3-0+". If it can't be parsed, then return a fake.
 
     try:
-        version = get_pg_version(*args, **kwargs)
+        version = get_pg_version2(*args, **kwargs)
         PgVer(version)
     except InvalidVersion:
         print('testgres: Got invalid postgres version', version)
@@ -145,7 +147,7 @@ class DatabaseLayer(object):
     def setUp(cls):
         testgres.configure_testgres()
 
-        with patch('testgres.node.get_pg_version', new=patched_get_pg_version):
+        with patch('testgres.node.get_pg_version2', new=patched_get_pg_version):
             node = cls.postgres_node = testgres.get_new_node()
 
         # init takes about about 2 -- 3 seconds

{nti_testing-4.2.0.post0 → nti_testing-4.4.0}/src/nti/testing/tests/test_base.py

@@ -89,7 +89,10 @@ class TestBase(unittest.TestCase):
 
 
     def test_configuring_base(self):
-        import zope.traversing.tests.test_traverser
+        try:
+            import zope.traversing.tests.test_traverser
+        except ModuleNotFoundError:
+            self.skipTest('zope.traversing not installed')
         class MyTest(base.ConfiguringTestBase):
             set_up_packages = ('zope.component',
                                ('configure.zcml', 'zope.component'),
@@ -104,7 +107,10 @@ class TestBase(unittest.TestCase):
         mt.tearDown() # pylint:disable=no-value-for-parameter
 
     def test_shared_configuring_base(self):
-        import zope.traversing.tests.test_traverser
+        try:
+            import zope.traversing.tests.test_traverser
+        except ModuleNotFoundError:
+            self.skipTest('zope.traversing not installed')
         class MyTest(base.SharedConfiguringTestBase):
             layer = None # replaced by metaclass
             set_up_packages = ('zope.component',

{nti_testing-4.2.0.post0 → nti_testing-4.4.0}/src/nti/testing/tests/test_main.py

@@ -32,16 +32,22 @@ def test_suite():
     here = os.path.dirname(__file__)
 
     suite = unittest.defaultTestLoader.loadTestsFromName(__name__)
-    suite.addTest(doctest.DocFileSuite(
-        'test_component_cleanup_broken.txt'))
+    try:
+        import zope.site as has_zope_site
+    except ModuleNotFoundError:
+        has_zope_site = None
+    else:
+        suite.addTest(doctest.DocFileSuite(
+            'test_component_cleanup_broken.txt'))
 
     readmedir = here
     while not os.path.exists(os.path.join(readmedir, 'setup.py')):
         readmedir = os.path.dirname(readmedir)
     readme = os.path.join(readmedir, 'README.rst')
-    suite.addTest(doctest.DocFileSuite(
-        readme,
-        module_relative=False,
-        optionflags=doctest.ELLIPSIS,
-    ))
+    if has_zope_site:
+        suite.addTest(doctest.DocFileSuite(
+            readme,
+            module_relative=False,
+            optionflags=doctest.ELLIPSIS,
+        ))
     return suite

{nti_testing-4.2.0.post0 → nti_testing-4.4.0}/src/nti/testing/tests/test_zodb.py

@@ -14,7 +14,13 @@ import unittest
 import transaction
 from transaction.interfaces import NoTransaction
 from zope import interface
-from nti.testing import zodb
+try:
+    from nti.testing import zodb
+    base_mock_db_trans = zodb.mock_db_trans
+except ModuleNotFoundError as ex:
+    assert ex.name == 'ZODB'
+    zodb = None
+    base_mock_db_trans = object
 
 # pylint:disable=protected-access,pointless-string-statement
 
@@ -41,7 +47,7 @@ class MockConn(object):
         self.minimized = True
 
 
-class MockDBTrans(zodb.mock_db_trans):
+class MockDBTrans(base_mock_db_trans):
 
     def __init__(self, db=None):
         if db is None:
@@ -52,6 +58,8 @@ class MockDBTrans(zodb.mock_db_trans):
 class TestMockDBTrans(unittest.TestCase):
 
     def setUp(self):
+        if zodb is None:
+            self.skipTest("ZODB not installed")
         self._was_explicit = transaction.manager.explicit
         transaction.manager.explicit = False
 
@@ -226,7 +234,7 @@ class TestMockDBTrans(unittest.TestCase):
         class MyMock(MockDBTrans):
             seen_tx = None
             aborted = False
-            def on_connection_opened(self, conn):
+            def on_connection_opened(self, _conn):
                 # pylint:disable=no-member
                 self.seen_tx = self._mock_db_trans__current_transaction
                 abort = self.seen_tx.abort
@@ -255,7 +263,13 @@ class TestMockDBTrans(unittest.TestCase):
 
 class TestZODBLayer(unittest.TestCase):
 
-    layer = zodb.ZODBLayer
+    if zodb is not None:
+        layer = zodb.ZODBLayer
+
+    def setUp(self):
+        super().setUp()
+        if zodb is None:
+            self.skipTest("ZODB not installed")
 
     def test_registration(self):
         from ZODB.interfaces import IDatabase
@@ -288,10 +302,14 @@ class Object(object):
         pass
 
 class TestResetDbCaches(unittest.TestCase):
-    layer = zodb.ZODBLayer
+
+    if zodb is not None:
+        layer = zodb.ZODBLayer
 
     def setUp(self):
         super().setUp()
+        if zodb is None:
+            self.skipTest("ZODB not installed")
         gc.disable()
 
     def tearDown(self):

{nti_testing-4.2.0.post0 → nti_testing-4.4.0}/src/nti.testing.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: nti.testing
-Version: 4.2.0.post0
+Version: 4.4.0
 Summary: Support for testing code
 Home-page: https://github.com/OpenNTI/nti.testing
 Author: Jason Madden
@@ -18,13 +18,13 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Software Development :: Testing
 Classifier: Framework :: Zope3
 Requires-Python: >=3.10
 License-File: LICENSE
-Requires-Dist: ZODB>=5.6.0
 Requires-Dist: zope.interface>=5.4.0
 Requires-Dist: pyhamcrest
 Requires-Dist: six
@@ -35,18 +35,38 @@ Requires-Dist: zope.dottedname
 Requires-Dist: zope.exceptions
 Requires-Dist: zope.schema
 Requires-Dist: zope.testing
+Provides-Extra: zodb
+Requires-Dist: ZODB>=5.6.0; extra == "zodb"
 Provides-Extra: test
 Requires-Dist: Acquisition; extra == "test"
-Requires-Dist: zope.site; extra == "test"
 Requires-Dist: zope.testrunner; extra == "test"
-Requires-Dist: testgres>=1.10; extra == "test"
+Requires-Dist: testgres>=1.11; extra == "test"
 Requires-Dist: psycopg2-binary; platform_python_implementation != "PyPy" and extra == "test"
+Provides-Extra: test-zodb
+Requires-Dist: zope.site; extra == "test-zodb"
 Provides-Extra: docs
 Requires-Dist: Sphinx; extra == "docs"
 Requires-Dist: furo; extra == "docs"
+Requires-Dist: Acquisition; extra == "docs"
+Requires-Dist: zope.testrunner; extra == "docs"
+Requires-Dist: testgres>=1.11; extra == "docs"
+Requires-Dist: psycopg2-binary; platform_python_implementation != "PyPy" and extra == "docs"
 Provides-Extra: testgres
-Requires-Dist: testgres>=1.10; extra == "testgres"
+Requires-Dist: testgres>=1.11; extra == "testgres"
 Requires-Dist: psycopg2-binary; platform_python_implementation != "PyPy" and extra == "testgres"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: project-url
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 =============
  nti.testing
@@ -302,6 +322,21 @@ ZODB in `nti.testing.zodb`. See the API documentation for details.
  Changes
 =========
 
+4.4.0 (2025-11-14)
+==================
+
+- Move ZODB and related dependencies to the optional 'zodb' extra.
+- Add support for Python 3.14.
+
+
+4.3.0 (2025-04-22)
+==================
+
+- Support and require testgres version 1.11. This version refactored
+  some internals, breaking the monkey-patches that ``DatabaseLayer``
+  applies.
+
+
 4.2.0.post0 (2024-11-08)
 ========================
 

{nti_testing-4.2.0.post0 → nti_testing-4.4.0}/src/nti.testing.egg-info/requires.txt

@@ -1,4 +1,3 @@
-ZODB>=5.6.0
 zope.interface>=5.4.0
 pyhamcrest
 six
@@ -13,18 +12,29 @@ zope.testing
 [docs]
 Sphinx
 furo
+Acquisition
+zope.testrunner
+testgres>=1.11
+
+[docs:platform_python_implementation != "PyPy"]
+psycopg2-binary
 
 [test]
 Acquisition
-zope.site
 zope.testrunner
-testgres>=1.10
+testgres>=1.11
+
+[test-zodb]
+zope.site
 
 [test:platform_python_implementation != "PyPy"]
 psycopg2-binary
 
 [testgres]
-testgres>=1.10
+testgres>=1.11
 
 [testgres:platform_python_implementation != "PyPy"]
 psycopg2-binary
+
+[zodb]
+ZODB>=5.6.0

{nti_testing-4.2.0.post0 → nti_testing-4.4.0}/tox.ini

@@ -4,6 +4,8 @@ envlist = py38,py39,py310,py311,py312,pypy3,coverage,docs
 [testenv]
 extras =
      test
+     zodb
+     test-zodb
 commands =
          zope-testrunner --test-path=src  --auto-color --auto-progress [] # substitute with tox positional args
 setenv =
@@ -20,6 +22,10 @@ commands =
 deps =
     coverage
 
+[testenv:py314]
+extras =
+    test
+
 [testenv:docs]
 commands =
     sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html