From f2bcecdf7406711cd203169a60ebdf76ba493698 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Wed, 22 Sep 2021 16:06:10 -0700 Subject: [PATCH] d/rules: Don't use setup.py to invoke tests, invoke directly instead Invoking pytest from setup.py seems to be deprecated. It offers no real advantages other than being predictable way of invoking tests for someone who don't know that we use pytest for testing. Let's rely on our documentation instead. Further this clears up the need to have setup.cfg. Tests: - Build debian package in using pbuilder. Tests are run and succeed during the build. Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- debian/rules | 5 ++++- setup.cfg | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 setup.cfg diff --git a/debian/rules b/debian/rules index 924d3b366..9d68df184 100755 --- a/debian/rules +++ b/debian/rules @@ -11,9 +11,12 @@ override_dh_auto_install-indep: ./run --develop --list-dependencies | sort | tr '\n' ', ' | \ sed -e 's/^/freedombox:Depends=/' >> debian/freedombox.substvars +# pybuild can run pytest. However, when the top level directory is included in +# the path (done using manage.py), it results in import problems. +# https://www.mail-archive.com/debian-python@lists.debian.org/msg17997.html override_dh_auto_test: PYBUILD_SYSTEM=custom \ - PYBUILD_TEST_ARGS="{interpreter} setup.py test" dh_auto_test + PYBUILD_TEST_ARGS="{interpreter} -m pytest" dh_auto_test override_dh_installsystemd: # Do not enable or start freedombox-manual-upgrade.service. diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 99ec86939..000000000 --- a/setup.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[aliases] -# When './setup.py test' is invoked, run './setup.py pytest' -test=pytest