Remove 'python setup.py test' usage in tox

Author: bagerard

.github/workflows/github-actions.yml

@@ -26,11 +26,11 @@ env:
   PYMONGO_3_11: 3.11
   PYMONGO_3_12: 3.12
   PYMONGO_4_0: 4.0
-  PYMONGO_4_3: 4.3.2
+  PYMONGO_4_3: 4.3.3
   PYMONGO_4_4: 4.4.1
-  PYMONGO_4_6: 4.6.0
+  PYMONGO_4_6: 4.6.2
 
-  MAIN_PYTHON_VERSION: 3.7
+  MAIN_PYTHON_VERSION: 3.9
 
 jobs:
   linting:
@@ -53,7 +53,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10", 3.11, "pypy3.9"]
+        python-version: [3.7, 3.8, 3.9, "3.10", 3.11, pypy3.9, pypy3.10]
         MONGODB: [$MONGODB_4_0]
         PYMONGO: [$PYMONGO_3_11]
         include:
@@ -110,7 +110,7 @@ jobs:
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:
-        python-version: 3.7
+        python-version: 3.9
         check-latest: true
     - name: install python dep
       run: |

requirements-dev.txt

@@ -1,7 +1,5 @@
-black
-flake8
 pre-commit
-pytest
 ipdb
 ipython
 tox
+-e .[test]

setup.py

@@ -1,15 +1,6 @@
 import os
-import sys
 
-from pkg_resources import normalize_path
 from setuptools import find_packages, setup
-from setuptools.command.test import test as TestCommand
-
-# Hack to silence atexit traceback in newer python versions
-try:
-    import multiprocessing  # noqa: F401
-except ImportError:
-    pass
 
 DESCRIPTION = "MongoEngine is a Python Object-Document Mapper for working with MongoDB."
 
@@ -27,62 +18,6 @@ def get_version(version_tuple):
     return ".".join(map(str, version_tuple))
 
 
-class PyTest(TestCommand):
-    """Will force pytest to search for tests inside the build directory
-    for 2to3 converted code (used by tox), instead of the current directory.
-    Required as long as we need 2to3
-
-    Known Limitation: https://tox.readthedocs.io/en/latest/example/pytest.html#known-issues-and-limitations
-    Source: https://www.hackzine.org/python-testing-with-pytest-and-2to3-plus-tox-and-travis-ci.html
-    """
-
-    # https://pytest.readthedocs.io/en/2.7.3/goodpractises.html#integration-with-setuptools-test-commands
-    # Allows to provide pytest command argument through the test runner command `python setup.py test`
-    # e.g: `python setup.py test -a "-k=test"`
-    # This only works for 1 argument though
-    user_options = [("pytest-args=", "a", "Arguments to pass to py.test")]
-
-    def initialize_options(self):
-        TestCommand.initialize_options(self)
-        self.pytest_args = ""
-
-    def finalize_options(self):
-        TestCommand.finalize_options(self)
-        self.test_args = ["tests"]
-        self.test_suite = True
-
-    def run_tests(self):
-        # import here, cause outside the eggs aren't loaded
-        import pytest
-        from pkg_resources import _namespace_packages
-
-        # Purge modules under test from sys.modules. The test loader will
-        # re-import them from the build location. Required when 2to3 is used
-        # with namespace packages.
-        if sys.version_info >= (3,) and getattr(self.distribution, "use_2to3", False):
-            module = self.test_args[-1].split(".")[0]
-            if module in _namespace_packages:
-                del_modules = []
-                if module in sys.modules:
-                    del_modules.append(module)
-                module += "."
-                for name in sys.modules:
-                    if name.startswith(module):
-                        del_modules.append(name)
-                map(sys.modules.__delitem__, del_modules)
-
-            # Run on the build directory for 2to3-built code
-            # This will prevent the old 2.x code from being found
-            # by py.test discovery mechanism, that apparently
-            # ignores sys.path..
-            ei_cmd = self.get_finalized_command("egg_info")
-            self.test_args = [normalize_path(ei_cmd.egg_base)]
-
-        cmd_args = self.test_args + ([self.pytest_args] if self.pytest_args else [])
-        errno = pytest.main(cmd_args)
-        sys.exit(errno)
-
-
 # Dirty hack to get version number from monogengine/__init__.py - we can't
 # import it as it depends on PyMongo and PyMongo isn't installed until this
 # file is read
@@ -107,22 +42,14 @@ def run_tests(self):
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 
-extra_opts = {
-    "packages": find_packages(exclude=["tests", "tests.*"]),
-    "tests_require": [
-        "pytest",
-        "pytest-cov",
-        "coverage",
-        "blinker",
-        "Pillow>=7.0.0",
-    ],
-}
-
-if "test" in sys.argv:
-    extra_opts["packages"] = find_packages()
-    extra_opts["package_data"] = {
-        "tests": ["fields/mongoengine.png", "fields/mongodb_leaf.png"]
-    }
+install_require = ["pymongo>=3.4,<5.0"]
+tests_require = [
+    "pytest",
+    "pytest-cov",
+    "coverage",
+    "blinker",
+    "Pillow>=7.0.0",
+]
 
 setup(
     name="mongoengine",
@@ -140,7 +67,9 @@ def run_tests(self):
     platforms=["any"],
     classifiers=CLASSIFIERS,
     python_requires=">=3.7",
-    install_requires=["pymongo>=3.4,<5.0"],
-    cmdclass={"test": PyTest},
-    **extra_opts
+    install_requires=install_require,
+    extras_require={
+        "test": tests_require,
+    },
+    packages=find_packages(exclude=["tests", "tests.*"]),
 )

tox.ini

@@ -1,10 +1,12 @@
 [tox]
 envlist = pypy3-{mg34,mg36,mg39,mg311,mg312,mg4,mg432,mg441,mg460}
+skipsdist = True
 
 [testenv]
 commands =
-    python setup.py test {posargs}
+    pytest tests/ {posargs}
 deps =
+    -rrequirements-dev.txt
     mg39: pymongo>=3.9,<3.10
     mg311: pymongo>=3.11,<3.12
     mg312: pymongo>=3.12,<3.13