diff --git a/.travis.yml b/.travis.yml index 57f47331f9d2cd0033be5ff9aad6840c70000e31..2fa1e778e60c477aafa75860f20b58ccabdd8c56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,16 +6,15 @@ before_script: - ./cc-test-reporter before-build - pip install -r requirements.txt - pip install pytest mock coverage cython[coverage] pytest-cov - - DEBUG=1 python setup.py install + - DEBUG=1 python setup.py build_ext --inplace --force --define CYTHON_TRACE - rm -rf minijson jobs: include: - stage: test python: "3.8" script: - - py.test --cov + - pytest --cov=./ --cov-report=xml after_script: - - coverage xml - ./cc-test-reporter after-build -t coverage.py --exit-code ${TRAVIS_TEST_RESULT} diff --git a/setup.py b/setup.py index e1cd7a44afd35ca21e6a1dd3120f75823974a729..754a228028e330f323902bf3010cc1cc5799f265 100644 --- a/setup.py +++ b/setup.py @@ -1,14 +1,12 @@ import os from setuptools import find_packages from distutils.core import setup -from snakehouse import Multibuild, build, monkey_patch_parallel_compilation, find_pyx - -monkey_patch_parallel_compilation() +from snakehouse import Multibuild, build, find_pyx build_kwargs = {} directives = {'language_level': '3'} dont_snakehouse = False -multi_kwargs = {} + if 'DEBUG' in os.environ: print('Enabling debug mode') dont_snakehouse = True @@ -17,8 +15,6 @@ if 'DEBUG' in os.environ: profile=True, linetrace=True, binding=True) - multi_kwargs['define_macros'] = [('CYTHON_TRACE', '1'), - ('CYTHON_TRACE_NOGIL', '1')] import Cython.Compiler.Options Cython.Compiler.Options.annotate = True @@ -27,9 +23,7 @@ if 'DEBUG' in os.environ: setup(version='1.7', packages=find_packages(include=['minijson', 'minijson.*']), ext_modules=build([Multibuild('minijson', find_pyx('minijson'), - dont_snakehouse=dont_snakehouse, - **multi_kwargs), ], + dont_snakehouse=dont_snakehouse), ], compiler_directives=directives, **build_kwargs), python_requires='!=2.7.*,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,!=3.7.*', - zip_safe=False )