Update test suite to use pytest, remove related in setup.py (celery#771)

* Fix setuptools to <v72 * Makefile: Use pytest instead of setup.py test * Attempt to use pytest directly * Add python -m * Update setup.py Co-authored-by: Christian Clauss <[email protected]> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Add pytest installation to workflow * Remove pytest from setup.py * Unlock setuptools * Remove tests_require * Move pytest to tox.ini --------- Co-authored-by: Christian Clauss <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> (cherry picked from commit a50011d)
daniilr · Jul 29, 2024 · aecfe83 · aecfe83
1 parent f5eb928
commit aecfe83
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 19 deletions.
diff --git a/Makefile b/Makefile
@@ -139,7 +139,7 @@ test-all: clean-pyc
 	$(TOX)
 
 test:
-	$(PYTHON) setup.py test
+	$(PYTHON) -m $(PYTEST)
 
 cov:
 	(cd $(TESTDIR); $(PYTEST) -x --cov="$(PROJ)" --cov-report=html)

diff --git a/setup.py b/setup.py
@@ -3,10 +3,8 @@
 import codecs
 import os
 import re
-import sys
 
 import setuptools
-import setuptools.command.test
 
 try:
     import platform
@@ -119,19 +117,6 @@ def reqs(*f):
 
 # -*- %%% -*-
 
-
-class pytest(setuptools.command.test.test):
-    user_options = [('pytest-args=', 'a', 'Arguments to pass to pytest')]
-
-    def initialize_options(self):
-        setuptools.command.test.test.initialize_options(self)
-        self.pytest_args = []
-
-    def run_tests(self):
-        import pytest
-        sys.exit(pytest.main(self.pytest_args))
-
-
 setuptools.setup(
     name=NAME,
     packages=setuptools.find_packages(exclude=[
@@ -148,8 +133,6 @@ def run_tests(self):
     platforms=['any'],
     license='BSD',
     install_requires=reqs('default.txt') + reqs('runtime.txt'),
-    tests_require=reqs('test.txt') + reqs('test-django.txt'),
-    cmdclass={'test': pytest},
     classifiers=classifiers,
     entry_points={
         'celery.beat_schedulers': [

diff --git a/tox.ini b/tox.ini
@@ -78,5 +78,5 @@ usedevelop = true
 commands =
     pip install --upgrade https://github.com/celery/celery/zipball/main#egg=celery
     pip install --upgrade https://github.com/celery/kombu/zipball/main#egg=kombu
-    pip install Django
+    pip install Django pytest
     pytest -x --cov=django_celery_beat --cov-report=xml --no-cov-on-fail
-Original file line number
+Diff line change
@@ Expand Up / @@ -139,7 +139,7 @@ test-all: clean-pyc @@
     	$(TOX)
     test:
-    	$(PYTHON) setup.py test
+    	$(PYTHON) -m $(PYTEST)
     cov:
     	(cd $(TESTDIR); $(PYTEST) -x --cov="$(PROJ)" --cov-report=html)
@@ Expand Down @@