From 5c5cb5135116de2450631775c6e3ceb8298b456d Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 14 Feb 2023 20:59:11 +0100 Subject: [PATCH] Remove remaining nosetest settings in favor of pytest (#8129) --- .gitignore | 1 - Makefile | 3 +-- kivy/__init__.py | 2 +- setup.cfg | 7 ------- 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 28d198eed..3a2ae27de 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ .coverage -.noseids Kivy.egg-info Kivy-*.dist-info *.so diff --git a/Makefile b/Makefile index 0f5eacf85..d1ae55cb3 100644 --- a/Makefile +++ b/Makefile @@ -129,7 +129,6 @@ clean: -rm -rf build -rm -rf htmlcov -rm -f .coverage - -rm -f .noseids -rm -rf kivy/tests/build -find kivy -iname '*.so' -exec rm {} \; -find kivy -iname '*.pyd' -exec rm {} \; @@ -165,7 +164,7 @@ help: @echo " install run a setup.py install" @echo " mesabuild for a build with MesaGL" @echo " style to check Python code for style issues" - @echo " test run unittests (nosetests)" + @echo " test run unittests (pytest)" @echo " theming create a default theme atlas" @echo " " @echo "You can also 'cd doc && make help' to build more documentation types" diff --git a/kivy/__init__.py b/kivy/__init__.py index 9ffc47119..b6be1cbf7 100644 --- a/kivy/__init__.py +++ b/kivy/__init__.py @@ -341,7 +341,7 @@ if any(name in sys.argv[0] for name in ( environ['KIVY_DOC'] = '1' if 'sphinx-build' in sys.argv[0]: environ['KIVY_DOC_INCLUDE'] = '1' -if any(('nosetests' in arg or 'pytest' in arg) for arg in sys.argv): +if any('pytest' in arg for arg in sys.argv): environ['KIVY_UNITTEST'] = '1' if any('pyinstaller' in arg.lower() for arg in sys.argv): environ['KIVY_PACKAGING'] = '1' diff --git a/setup.cfg b/setup.cfg index e2f4b3427..85b8f6fd6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,10 +1,3 @@ -[nosetests] -with-coverage=1 -cover-package=kivy -with-id=1 -verbosity=2 -logging-level=DEBUG - [kivy] cython_min=0.24 cython_max=0.29.32