Use pytest as test runner.

Author: rnixx

.github/workflows/test.yml

@@ -40,9 +40,9 @@ jobs:
       - name: Run tests
         run: |
           python --version
-          python -m node.tests.__init__
+          pytest src/node/tests
 
       - name: Run coverage
         run: |
-          coverage run --source=src/node --omit=src/node/testing/profiling.py -m node.tests.__init__
+          coverage run --source=src/node --omit=src/node/testing/profiling.py -m pytest src/node/tests
           coverage report --fail-under=100

.gitignore

@@ -3,7 +3,7 @@
 /.coverage
 /.mxmake
 /.ruff_cache
+/.venv
 /dist/
 /htmlcov/
 /requirements-mxdev.txt
-/venv

CHANGES.rst

@@ -8,6 +8,9 @@ Changes
 - Fix ``Node.treerepr`` if mapping raises an exception on ``__getitem__``.
   [rnix]
 
+- Use pytest as test runner.
+  [rnix]
+
 
 1.2.2 (2024-05-30)
 ------------------

Makefile

@@ -7,7 +7,6 @@
 #: core.mxfiles
 #: core.packages
 #: qa.coverage
-#: qa.ruff
 #: qa.test
 #
 # SETTINGS (ALL CHANGES MADE BELOW SETTINGS WILL BE LOST)
@@ -46,8 +45,8 @@ EXTRA_PATH?=
 PRIMARY_PYTHON?=python3
 
 # Minimum required Python version.
-# Default: 3.7
-PYTHON_MIN_VERSION?=3.7
+# Default: 3.9
+PYTHON_MIN_VERSION?=3.9
 
 # Install packages using the given package installer method.
 # Supported are `pip` and `uv`. If uv is used, its global availability is
@@ -80,7 +79,7 @@ VENV_CREATE?=true
 # `VENV_CREATE` is false it is expected to point to an existing virtual
 # environment. If `VENV_ENABLED` is `false` it is ignored.
 # Default: .venv
-VENV_FOLDER?=venv
+VENV_FOLDER?=.venv
 
 # mxdev to install in virtual environment.
 # Default: mxdev
@@ -90,12 +89,6 @@ MXDEV?=mxdev
 # Default: mxmake
 MXMAKE?=mxmake
 
-## qa.ruff
-
-# Source folder to scan for Python files to run ruff on.
-# Default: src
-RUFF_SRC?=src
-
 ## core.mxfiles
 
 # The config file to use.
@@ -114,7 +107,7 @@ PACKAGES_ALLOW_PRERELEASES?=false
 # The command which gets executed. Defaults to the location the
 # :ref:`run-tests` template gets rendered to if configured.
 # Default: .mxmake/files/run-tests.sh
-TEST_COMMAND?=$(VENV_FOLDER)/bin/python -m node.tests.__init__
+TEST_COMMAND?=$(VENV_FOLDER)/bin/pytest src/node/tests
 
 # Additional Python requirements for running tests to be
 # installed (via pip).
@@ -134,7 +127,7 @@ COVERAGE_COMMAND?=\
 	$(VENV_FOLDER)/bin/coverage run \
 		--source=src/node \
 		--omit=src/node/testing/profiling.py \
-		-m node.tests.__init__ \
+		-m pytest src/node/tests \
 	&& $(VENV_FOLDER)/bin/coverage report --fail-under=100
 
 ##############################################################################
@@ -175,6 +168,8 @@ $(SENTINEL): $(firstword $(MAKEFILE_LIST))
 # mxenv
 ##############################################################################
 
+export OS:=$(OS)
+
 # Determine the executable path
 ifeq ("$(VENV_ENABLED)", "true")
 export VIRTUAL_ENV=$(abspath $(VENV_FOLDER))
@@ -249,41 +244,6 @@ INSTALL_TARGETS+=mxenv
 DIRTY_TARGETS+=mxenv-dirty
 CLEAN_TARGETS+=mxenv-clean
 
-##############################################################################
-# ruff
-##############################################################################
-
-RUFF_TARGET:=$(SENTINEL_FOLDER)/ruff.sentinel
-$(RUFF_TARGET): $(MXENV_TARGET)
-	@echo "Install Ruff"
-	@$(PYTHON_PACKAGE_COMMAND) install ruff
-	@touch $(RUFF_TARGET)
-
-.PHONY: ruff-check
-ruff-check: $(RUFF_TARGET)
-	@echo "Run ruff check"
-	@ruff check $(RUFF_SRC)
-
-.PHONY: ruff-format
-ruff-format: $(RUFF_TARGET)
-	@echo "Run ruff format"
-	@ruff format $(RUFF_SRC)
-
-.PHONY: ruff-dirty
-ruff-dirty:
-	@rm -f $(RUFF_TARGET)
-
-.PHONY: ruff-clean
-ruff-clean: ruff-dirty
-	@test -e $(MXENV_PYTHON) && $(MXENV_PYTHON) -m pip uninstall -y ruff || :
-	@rm -rf .ruff_cache
-
-INSTALL_TARGETS+=$(RUFF_TARGET)
-CHECK_TARGETS+=ruff-check
-FORMAT_TARGETS+=ruff-format
-DIRTY_TARGETS+=ruff-dirty
-CLEAN_TARGETS+=ruff-clean
-
 ##############################################################################
 # mxfiles
 ##############################################################################
@@ -442,6 +402,10 @@ INSTALL_TARGETS+=$(COVERAGE_TARGET)
 DIRTY_TARGETS+=coverage-dirty
 CLEAN_TARGETS+=coverage-clean
 
+##############################################################################
+# Custom includes
+##############################################################################
+
 -include $(INCLUDE_MAKEFILE)
 
 ##############################################################################

mx.ini

@@ -1,2 +1,2 @@
 [settings]
-main-package = -e .
+main-package = -e .[test]

ruff.toml

@@ -54,5 +54,5 @@ def read_file(name):
         'zope.deprecation',
         'zope.lifecycleevent'
     ],
-    test_suite='node.tests.test_suite'
+    extras_require=dict(test=['pytest']),
 )

setup.py

@@ -71,73 +71,3 @@ def checkOutput(self, want, got, optionflags=None):
 
     # B/C
     check_output = checkOutput
-
-
-def test_suite():
-    from node.tests import test_adopt
-    from node.tests import test_alias
-    from node.tests import test_attributes
-    from node.tests import test_base
-    from node.tests import test_cache
-    from node.tests import test_common
-    from node.tests import test_constraints
-    from node.tests import test_context
-    from node.tests import test_events
-    from node.tests import test_factories
-    from node.tests import test_fallback
-    from node.tests import test_filter
-    from node.tests import test_lifecycle
-    from node.tests import test_locking
-    from node.tests import test_mapping
-    from node.tests import test_node
-    from node.tests import test_nodespace
-    from node.tests import test_order
-    from node.tests import test_reference
-    from node.tests import test_schema
-    from node.tests import test_sequence
-    from node.tests import test_serializer
-    from node.tests import test_storage
-    from node.tests import test_testing
-    from node.tests import test_tests
-    from node.tests import test_utils
-
-    suite = unittest.TestSuite()
-
-    suite.addTest(unittest.findTestCases(test_testing))
-    suite.addTest(unittest.findTestCases(test_tests))
-
-    suite.addTest(unittest.findTestCases(test_base))
-    suite.addTest(unittest.findTestCases(test_events))
-    suite.addTest(unittest.findTestCases(test_locking))
-    suite.addTest(unittest.findTestCases(test_schema))
-    suite.addTest(unittest.findTestCases(test_serializer))
-    suite.addTest(unittest.findTestCases(test_utils))
-
-    suite.addTest(unittest.findTestCases(test_adopt))
-    suite.addTest(unittest.findTestCases(test_alias))
-    suite.addTest(unittest.findTestCases(test_attributes))
-    suite.addTest(unittest.findTestCases(test_cache))
-    suite.addTest(unittest.findTestCases(test_common))
-    suite.addTest(unittest.findTestCases(test_constraints))
-    suite.addTest(unittest.findTestCases(test_context))
-    suite.addTest(unittest.findTestCases(test_factories))
-    suite.addTest(unittest.findTestCases(test_fallback))
-    suite.addTest(unittest.findTestCases(test_filter))
-    suite.addTest(unittest.findTestCases(test_lifecycle))
-    suite.addTest(unittest.findTestCases(test_mapping))
-    suite.addTest(unittest.findTestCases(test_node))
-    suite.addTest(unittest.findTestCases(test_nodespace))
-    suite.addTest(unittest.findTestCases(test_order))
-    suite.addTest(unittest.findTestCases(test_reference))
-    suite.addTest(unittest.findTestCases(test_sequence))
-    suite.addTest(unittest.findTestCases(test_storage))
-
-    return suite
-
-
-if __name__ == '__main__':
-    import sys
-
-    runner = unittest.TextTestRunner(failfast=True)
-    result = runner.run(test_suite())
-    sys.exit(not result.wasSuccessful())