From f1d1a0c3b260d3b918b599c30e5b113caa1bb14a Mon Sep 17 00:00:00 2001 From: Elephant Liu Date: Mon, 29 Jul 2024 16:41:39 +0800 Subject: [PATCH] fix ci for setuptools 72 --- misc/travis/unittest.sh | 3 ++- setup.py | 22 ---------------------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/misc/travis/unittest.sh b/misc/travis/unittest.sh index 4c3849a8..489b5b2d 100755 --- a/misc/travis/unittest.sh +++ b/misc/travis/unittest.sh @@ -9,6 +9,7 @@ cmake -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DWITH_TESTING=ON .. make -j8 valgrind --leak-check=full make test cd .. -python setup.py test +python setup.py build_ext --inplace +python -m pytest tests pip install -e . ./tests/shabby/run_test.sh diff --git a/setup.py b/setup.py index b404f128..1d3b789e 100644 --- a/setup.py +++ b/setup.py @@ -2,14 +2,12 @@ import os import re import sys -import shlex import pkg_resources import platform from distutils.sysconfig import get_config_var from distutils.version import LooseVersion from glob import glob from setuptools import setup, Extension -from setuptools.command.test import test as TestCommand sources = (glob("src/*.cpp") + ["libmc/_client.pyx"]) include_dirs = ["include"] @@ -74,25 +72,6 @@ def find_version(*file_paths): raise RuntimeError("Unable to find version string.") -class PyTest(TestCommand): - user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")] - - def initialize_options(self): - TestCommand.initialize_options(self) - self.pytest_args = 'tests' - - def finalize_options(self): - TestCommand.finalize_options(self) - self.test_args = [] - self.test_suite = True - - def run_tests(self): - # import here, cause outside the eggs aren't loaded - import pytest - errno = pytest.main(shlex.split(self.pytest_args)) - sys.exit(errno) - - setup( name="libmc", packages=["libmc"], @@ -122,7 +101,6 @@ def run_tests(self): ], # Support for the basestring type is new in Cython 0.20. setup_requires=["Cython >= 0.20"], - cmdclass={"test": PyTest}, ext_modules=[ Extension( "libmc._client",