From 1ad3b0a5b9c120df6f4832d06fef834d4408d626 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Tue, 29 Oct 2019 14:05:25 +0100 Subject: [PATCH] python-common: avoid using setup_requires in setup.py Fixes: https://tracker.ceph.com/issues/42528 Signed-off-by: Sebastian Wagner --- src/python-common/setup.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/python-common/setup.py b/src/python-common/setup.py index 6692ddab4dd..54517f7c1dd 100644 --- a/src/python-common/setup.py +++ b/src/python-common/setup.py @@ -1,6 +1,7 @@ import sys from setuptools import setup, find_packages +from setuptools.command.test import test as TestCommand if sys.version_info >= (3,0): @@ -15,6 +16,22 @@ with open("README.rst", "r") as fh: long_description = fh.read() +class PyTest(TestCommand): + user_options = [('addopts=', 'a', "Arguments to pass to py.test")] + + def initialize_options(self): + TestCommand.initialize_options(self) + self.addopts = [] + + def run_tests(self): + # import here, cause outside the eggs aren't loaded + import pytest + + args = self.addopts.split() if isinstance(self.addopts, str) else self.addopts + errno = pytest.main(args) + sys.exit(errno) + + setup( name='ceph', version='1.0.0', @@ -27,10 +44,10 @@ setup( keywords='ceph', url="https://github.com/ceph/ceph", zip_safe = False, + cmdclass={'pytest': PyTest}, install_requires=( 'six', ), - setup_requires=['pytest-runner'], tests_require=[ pytest, 'tox', -- 2.39.5