nti.testing 4.0.0__tar.gz → 4.1.0__tar.gz

{nti.testing-4.0.0 → nti.testing-4.1.0}/.pylintrc

@@ -1,25 +1,28 @@
 [MASTER]
-load-plugins=
+load-plugins=pylint.extensions.bad_builtin,
    pylint.extensions.broad_try_clause,
-   pylint.extensions.bad_builtin,
    pylint.extensions.check_elif,
    pylint.extensions.code_style,
-   pylint.extensions.comparison_placement,
-   pylint.extensions.confusing_elif,
-   pylint.extensions.consider_refactoring_into_while_condition,
    pylint.extensions.dict_init_mutate,
-   pylint.extensions.docparams,
    pylint.extensions.docstyle,
    pylint.extensions.dunder,
-   pylint.extensions.eq_without_hash,
+   pylint.extensions.comparison_placement,
+   pylint.extensions.confusing_elif,
    pylint.extensions.for_any_all,
+   pylint.extensions.consider_refactoring_into_while_condition,
    pylint.extensions.mccabe,
+   pylint.extensions.eq_without_hash,
+   pylint.extensions.redefined_variable_type,
    pylint.extensions.overlapping_exceptions,
+   pylint.extensions.docparams,
    pylint.extensions.private_import,
-   pylint.extensions.redefined_variable_type,
-   pylint.extensions.set_membership,
    pylint.extensions.typing,
 
+#    pylint.extensions.set_membership,
+# wants you to turn ``foo in (1, 2)`` into ``foo in {1, 2}``;
+# but for small tuples, the former is actually more
+# performant.
+
 # magic_value wants you to not use arbitrary strings and numbers
 # inline in the code. But it's overzealous and has way too many false
 # positives. Trust people to do the most readable thing.
@@ -42,8 +45,8 @@ load-plugins=
 # This wants you to turn ``x in (1, 2)`` into ``x in {1, 2}``.
 # They both result in the LOAD_CONST bytecode, one a tuple one a
 # frozenset. In theory a set lookup using hashing is faster than
-# a linear scan of a tuple; but if the tuple is small, it can
-# actually be faster to scan the tuple. This one is debatable.
+# a linear scan of a tuple; but if the tuple is small, it can often
+# actually be faster to scan the tuple.
 #   pylint.extensions.set_membership,
 
 # Fix zope.cachedescriptors.property.Lazy; the property-classes doesn't seem to
@@ -124,7 +127,6 @@ init-hook =
 # readable, thing
 #
 # docstring-first-line-empty: That's actually our standard, based on Django.
-# empty-comment: Two lines above this would trigger that. Yick.
 # XXX: unclear on the docstring warnings, missing-type-doc, missing-param-doc,
 # differing-param-doc, differing-type-doc (are the last two replacements for the first two?)
 #
@@ -154,6 +156,7 @@ disable=wrong-import-position,
     compare-to-zero,
     docstring-first-line-empty,
     too-many-try-statements,
+    redefined-variable-type,
 
 enable=consider-using-augmented-assign
 

{nti.testing-4.0.0 → nti.testing-4.1.0}/CHANGES.rst

@@ -2,6 +2,14 @@
  Changes
 =========
 
+4.1.0 (2024-04-10)
+==================
+
+- Add support for, and require, testgres 1.10. This is needed because
+  they changed the signature for ``get_pg_version``.
+- Drop support for Python 3.8 and 3.9.
+
+
 4.0.0 (2023-10-24)
 ==================
 

{nti.testing-4.0.0 → nti.testing-4.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nti.testing
-Version: 4.0.0
+Version: 4.1.0
 Summary: Support for testing code
 Home-page: https://github.com/OpenNTI/nti.testing
 Author: Jason Madden
@@ -13,8 +13,6 @@ Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -22,7 +20,7 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Software Development :: Testing
 Classifier: Framework :: Zope3
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 License-File: LICENSE
 Requires-Dist: ZODB>=5.6.0
 Requires-Dist: zope.interface>=5.4.0
@@ -40,13 +38,13 @@ Provides-Extra: test
 Requires-Dist: Acquisition; extra == "test"
 Requires-Dist: zope.site; extra == "test"
 Requires-Dist: zope.testrunner; extra == "test"
-Requires-Dist: testgres; extra == "test"
+Requires-Dist: testgres>=1.10; extra == "test"
 Requires-Dist: psycopg2-binary; platform_python_implementation != "PyPy" and extra == "test"
 Provides-Extra: docs
 Requires-Dist: Sphinx; extra == "docs"
 Requires-Dist: furo; extra == "docs"
 Provides-Extra: testgres
-Requires-Dist: testgres; extra == "testgres"
+Requires-Dist: testgres>=1.10; extra == "testgres"
 Requires-Dist: psycopg2-binary; platform_python_implementation != "PyPy" and extra == "testgres"
 
 =============
@@ -303,6 +301,14 @@ ZODB in `nti.testing.zodb`. See the API documentation for details.
  Changes
 =========
 
+4.1.0 (2024-04-10)
+==================
+
+- Add support for, and require, testgres 1.10. This is needed because
+  they changed the signature for ``get_pg_version``.
+- Drop support for Python 3.8 and 3.9.
+
+
 4.0.0 (2023-10-24)
 ==================
 

{nti.testing-4.0.0 → nti.testing-4.1.0}/setup.py

@@ -1,10 +1,11 @@
 # Copyright 2017 NextThought
+# Copyright 2022-2024 Jason Madden
 # Released under the terms of the LICENSE file.
 import codecs
 from setuptools import setup, find_packages
 
 
-version = '4.0.0'
+version = '4.1.0'
 
 entry_points = {
 }
@@ -13,7 +14,7 @@ TESTS_REQUIRE = [
     'Acquisition',
     'zope.site',
     'zope.testrunner',
-    'testgres',
+    'testgres >= 1.10',
     'psycopg2-binary; python_implementation != "PyPy"',
 ]
 
@@ -40,8 +41,6 @@ setup(
         'Operating System :: OS Independent',
         'License :: OSI Approved :: Apache Software License',
         'Programming Language :: Python :: 3',
-        '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',
@@ -78,9 +77,9 @@ setup(
             'furo',
         ],
         'testgres': [
-            'testgres',
+            'testgres >= 1.10',
             'psycopg2-binary; python_implementation != "PyPy"',
         ],
     },
-    python_requires=">=3.8",
+    python_requires=">=3.10",
 )

{nti.testing-4.0.0 → nti.testing-4.1.0}/src/nti/testing/__init__.py

@@ -52,7 +52,6 @@ from .matchers import provides
 from .matchers import implements
 from .matchers import verifiably_provides
 from .matchers import validly_provides
-from .matchers import provides
 from .matchers import validated_by
 from .matchers import not_validated_by
 from .matchers import aq_inContextOf

{nti.testing-4.0.0 → nti.testing-4.1.0}/src/nti/testing/base.py

@@ -400,7 +400,8 @@ class ConfiguringTestBase(AbstractConfiguringObject,
     def _doSetUpSuper(self):
         super().setUp()
 
-    setUp = AbstractConfiguringObject._doSetUp
+    def setUp(self):
+        AbstractConfiguringObject._doSetUp(self)
 
     #: Configure additional packages. This should only be done in the ``setUp`` method
     #: of a subclass. Note that this is called by ``setUp``.
@@ -419,7 +420,23 @@ class ConfiguringTestBase(AbstractConfiguringObject,
     def _doTearDownSuper(self):
         super().tearDown()
 
-    tearDown = AbstractConfiguringObject._doTearDown
+    def tearDown(self):
+        self._doTearDownConfiguration()
+
+    def _doTearDownConfiguration(self):
+        """
+        Hook for subclasses to override.
+
+        This implementation calls :meth:`AbstractConfiguringObject._doTearDown`
+        with the default parameters. If you need to call it with a different
+        set of parameters, override this method to do so.
+
+        This method takes no arguments because the arguments passed to
+        ``_doTearDown`` are almost always static at the callsite.
+        """
+        AbstractConfiguringObject._doTearDown(
+            self,
+        )
 
 class SharedConfiguringTestBase(AbstractConfiguringObject,
                                 AbstractSharedTestBase):

{nti.testing-4.0.0 → nti.testing-4.1.0}/src/nti/testing/layers/postgres.py

@@ -78,7 +78,11 @@ if 'NTI_LOAD_DB_FILE' in os.environ:
     LOAD_DATABASE_ON_SETUP = os.environ['NTI_LOAD_DB_FILE']
 
 
-def patched_get_pg_version():
+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
     from testgres.node import PgVer
     from packaging.version import InvalidVersion
@@ -90,7 +94,7 @@ def patched_get_pg_version():
     # "15.3-0+". If it can't be parsed, then return a fake.
 
     try:
-        version = get_pg_version()
+        version = get_pg_version(*args, **kwargs)
         PgVer(version)
     except InvalidVersion:
         print('testgres: Got invalid postgres version', version)

{nti.testing-4.0.0 → nti.testing-4.1.0}/src/nti/testing/layers/zope.py

@@ -6,8 +6,6 @@ Test layers for working with Zope libraries.
 """
 
 import gc
-import sys
-import unittest
 import logging
 
 

{nti.testing-4.0.0 → nti.testing-4.1.0}/src/nti/testing/matchers.py

@@ -352,7 +352,9 @@ BaseDescription.append_description_of = _append_description_of_map
 
 
 class TypeCheckedDict(dict):
-    "A dictionary that ensures keys and values are of the required type when set"
+    """
+    A dictionary that ensures keys and values are of the required type when set
+    """
 
     def __init__(self, key_class=object, val_class=object, notify=None):
         dict.__init__(self)

{nti.testing-4.0.0 → nti.testing-4.1.0}/src/nti/testing/tests/test_base.py

@@ -79,6 +79,7 @@ class TestBase(unittest.TestCase):
                 raise AssertionError("Not called")
 
         MyTest.setUpClass()
+        # pylint:disable-next=simplifiable-if-expression
         assert_that(gc.isenabled(), is_(False if not base._is_pypy else True))
         MyTest.tearDownClass()
         assert_that(gc.isenabled(), is_(True))
@@ -130,3 +131,30 @@ class TestBase(unittest.TestCase):
         base.module_setup()
         base.module_setup(set_up_packages=('zope.component',))
         base.module_teardown()
+
+    def test_calling_super_linting(self):
+        # Deriving a class from our bases and calling their setup
+        # methods should NOT produce linter warnings.
+        # So this section should not have pylint disable commands.
+        class X(base.AbstractTestBase):
+            def setUp(self):
+                super().setUp()
+                self.thing = 1
+
+            def tearDown(self):
+                super().tearDown()
+                self.thing = 2
+
+        class Y(base.ConfiguringTestBase):
+            def setUp(self):
+                super().setUp()
+                self.thing = 1
+
+            def tearDown(self):
+                super().tearDown()
+                self.thing = 2
+
+        X().setUp()
+        X().tearDown()
+        Y().setUp()
+        Y().tearDown()

{nti.testing-4.0.0 → nti.testing-4.1.0}/src/nti/testing/tests/test_layers.py

@@ -28,7 +28,7 @@ class TestLayers(unittest.TestCase):
 
         func()
 
-        def via_test(test):
+        def via_test(test): # pylint:disable=unused-argument
             func()
 
         via_test(self)

{nti.testing-4.0.0 → nti.testing-4.1.0}/src/nti/testing/tests/test_matchers.py

@@ -81,7 +81,7 @@ class TestMatchers(unittest.TestCase):
             thing = interface.Attribute("thing")
 
             def method(): # pylint:disable=no-method-argument
-                "method"
+                """Does nothing."""
 
         @interface.implementer(IThing)
         class Thing(object):

{nti.testing-4.0.0 → nti.testing-4.1.0}/src/nti/testing/tests/test_zodb.py

@@ -46,7 +46,7 @@ class MockDBTrans(zodb.mock_db_trans):
     def __init__(self, db=None):
         if db is None:
             db = MockDB()
-        super(MockDBTrans, self).__init__(db)
+        super().__init__(db)
         self.exc_file = NativeStringIO()
 
 class TestMockDBTrans(unittest.TestCase):
@@ -85,7 +85,7 @@ class TestMockDBTrans(unittest.TestCase):
         with self.assertRaises(zodb._TransactionManagerModeChanged) as exc:
             with MockDBTrans():
                 transaction.manager.explicit = False
-                raise Exception("BodyError")
+                raise Exception("BodyError") # pylint:disable=broad-exception-raised
         # The backing exception is included
         self.assertIn('BodyError', str(exc.exception))
 
@@ -219,7 +219,8 @@ class TestMockDBTrans(unittest.TestCase):
             pass
 
         class MyFalse(object):
-            __nonzero__ = __bool__ = lambda _self: False
+            def __bool__(self):
+                return False
 
         transaction.manager.explicit = MyFalse()
         class MyMock(MockDBTrans):
@@ -276,10 +277,10 @@ class TestZODBLayer(unittest.TestCase):
 
 
 class IExtra(interface.Interface): # pylint:disable=inherit-non-class
-    "An extra interface"
+    """An extra interface."""
 
 class IExtra2(interface.Interface): # pylint:disable=inherit-non-class
-    "Another extra interface"
+    """Another extra interface."""
 
 class Object(object):
 
@@ -290,12 +291,12 @@ class TestResetDbCaches(unittest.TestCase):
     layer = zodb.ZODBLayer
 
     def setUp(self):
-        super(TestResetDbCaches, self).setUp()
+        super().setUp()
         gc.disable()
 
     def tearDown(self):
         gc.enable()
-        super(TestResetDbCaches, self).tearDown()
+        super().tearDown()
 
     def test_persistent_site_closed(self):
         from zope.site.site import LocalSiteManager

{nti.testing-4.0.0 → nti.testing-4.1.0}/src/nti/testing/time.py

@@ -56,7 +56,7 @@ class _TimeWrapper(object):
 
     __enter__ = install_fakes
 
-    def close(self, *args):
+    def close(self, *_args):
         time.time = _real_time
         time.gmtime = _real_gmtime
 

{nti.testing-4.0.0 → nti.testing-4.1.0}/src/nti/testing/zodb.py

@@ -140,7 +140,7 @@ class mock_db_trans(object):
         catch = Exception if ignore_errors else ()
         try:
             conn.close()
-        except catch:
+        except catch: # pylint:disable=broad-exception-caught
             self._report_exception("Unexpected error closing connection; ignored.", *sys.exc_info())
 
     def __exit__(self, t, v, tb):

{nti.testing-4.0.0 → nti.testing-4.1.0}/src/nti.testing.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nti.testing
-Version: 4.0.0
+Version: 4.1.0
 Summary: Support for testing code
 Home-page: https://github.com/OpenNTI/nti.testing
 Author: Jason Madden
@@ -13,8 +13,6 @@ Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -22,7 +20,7 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Software Development :: Testing
 Classifier: Framework :: Zope3
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 License-File: LICENSE
 Requires-Dist: ZODB>=5.6.0
 Requires-Dist: zope.interface>=5.4.0
@@ -40,13 +38,13 @@ Provides-Extra: test
 Requires-Dist: Acquisition; extra == "test"
 Requires-Dist: zope.site; extra == "test"
 Requires-Dist: zope.testrunner; extra == "test"
-Requires-Dist: testgres; extra == "test"
+Requires-Dist: testgres>=1.10; extra == "test"
 Requires-Dist: psycopg2-binary; platform_python_implementation != "PyPy" and extra == "test"
 Provides-Extra: docs
 Requires-Dist: Sphinx; extra == "docs"
 Requires-Dist: furo; extra == "docs"
 Provides-Extra: testgres
-Requires-Dist: testgres; extra == "testgres"
+Requires-Dist: testgres>=1.10; extra == "testgres"
 Requires-Dist: psycopg2-binary; platform_python_implementation != "PyPy" and extra == "testgres"
 
 =============
@@ -303,6 +301,14 @@ ZODB in `nti.testing.zodb`. See the API documentation for details.
  Changes
 =========
 
+4.1.0 (2024-04-10)
+==================
+
+- Add support for, and require, testgres 1.10. This is needed because
+  they changed the signature for ``get_pg_version``.
+- Drop support for Python 3.8 and 3.9.
+
+
 4.0.0 (2023-10-24)
 ==================
 

{nti.testing-4.0.0 → nti.testing-4.1.0}/src/nti.testing.egg-info/SOURCES.txt

@@ -1,5 +1,4 @@
 .coveragerc
-.gitignore
 .isort.cfg
 .nti_cover_package
 .pylintrc
@@ -17,7 +16,6 @@ nose2.cfg
 setup.cfg
 setup.py
 tox.ini
-.github/workflows/tests.yml
 docs/api.rst
 docs/base.rst
 docs/changelog.rst

{nti.testing-4.0.0 → nti.testing-4.1.0}/src/nti.testing.egg-info/requires.txt

@@ -19,13 +19,13 @@ furo
 Acquisition
 zope.site
 zope.testrunner
-testgres
+testgres>=1.10
 
 [test:platform_python_implementation != "PyPy"]
 psycopg2-binary
 
 [testgres]
-testgres
+testgres>=1.10
 
 [testgres:platform_python_implementation != "PyPy"]
 psycopg2-binary

nti.testing-4.0.0/.github/workflows/tests.yml

@@ -1,47 +0,0 @@
-name: tests
-
-on: [push, pull_request]
-
-env:
-  PYTHONHASHSEED: 1042466059
-  ZOPE_INTERFACE_STRICT_IRO: 1
-
-
-jobs:
-  test:
-    strategy:
-      matrix:
-        python-version: ["pypy-3.10", "3.8", "3.9", "3.11", "3.12"]
-
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: ${{ matrix.python-version }}
-        cache: 'pip'
-        cache-dependency-path: 'setup.py'
-    - name: Install dependencies
-      run: |
-        python -m pip install -U pip setuptools wheel
-        python -m pip install -U coverage
-        python -m pip install -U -e ".[test,docs]"
-    - name: Test
-      run: |
-        coverage run -m zope.testrunner --test-path=src  --auto-color --auto-progress
-        coverage run -a -m sphinx -b doctest -d docs/_build/doctrees docs docs/_build/doctests
-    - name: Submit to Coveralls
-      # This is a container action, which only runs on Linux.
-      uses: AndreMiras/coveralls-python-action@develop
-      with:
-        parallel: true
-
-  coveralls_finish:
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-    - name: Coveralls Finished
-      uses: AndreMiras/coveralls-python-action@develop
-      with:
-        parallel-finished: true

nti.testing-4.0.0/.gitignore

@@ -1,8 +0,0 @@
-.installed.cfg
-
-*.egg-info
-*.pyc
-.coverage
-htmlcov/
-
-docs/_build/