Merge branch '0.29.x'

colesbury · Apr 14, 2021 · 461e45f · 461e45f
2 parents c25c3cc + 3ae58fe
commit 461e45f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -55,3 +55,6 @@ MANIFEST
 
 # Komodo EDIT/IDE project files
 /*.komodoproject
+
+# Visual Studio Code files
+.vscode
diff --git a/.travis.yml b/.travis.yml
@@ -140,7 +140,7 @@ before_install:
 install:
   - python -c 'import sys; print("Python %s" % (sys.version,))'
   - if [ -z "${TRAVIS_PYTHON_VERSION##2.7}" ]; then [ "$TRAVIS_OS_NAME" == "osx" -a "$PY" == "3" ] || pip install -r test-requirements-27.txt ; fi
-  - if [ -n "${TRAVIS_PYTHON_VERSION##*-dev}" -a -n "${TRAVIS_PYTHON_VERSION##2.7}" ]; then pip install -r test-requirements.txt $( [ -z "${TRAVIS_PYTHON_VERSION##pypy*}" -o -z "${TRAVIS_PYTHON_VERSION##3.[4789]*}" ] || echo " -r test-requirements-cpython.txt" ) ; fi
+  - if [ -n "${TRAVIS_PYTHON_VERSION##*-dev}" -a -n "${TRAVIS_PYTHON_VERSION##2.7}" ]; then pip install -r test-requirements.txt $( [ -z "${TRAVIS_PYTHON_VERSION##pypy*}" -o -z "${TRAVIS_PYTHON_VERSION##3.[47891]*}" ] || echo " -r test-requirements-cpython.txt" ) ; fi
 #  - CFLAGS="-O2 -ggdb -Wall -Wextra $(python -c 'import sys; print("-fno-strict-aliasing" if sys.version_info[0] == 2 else "")')" python setup.py build
 
 before_script: ccache -s || true

diff --git a/runtests.py b/runtests.py
@@ -445,6 +445,7 @@ def get_openmp_compiler_flags(language):
 INCLUDE_DIRS = [ d for d in os.getenv('INCLUDE', '').split(os.pathsep) if d ]
 CFLAGS = os.getenv('CFLAGS', '').split()
 CCACHE = os.getenv('CYTHON_RUNTESTS_CCACHE', '').split()
+CDEFS = []
 TEST_SUPPORT_DIR = 'testsupport'
 
 BACKENDS = ['c', 'cpp']
@@ -1105,6 +1106,7 @@ def run_distutils(self, test_directory, module, workdir, incdir,
                 build_extension.compiler = COMPILER
 
             ext_compile_flags = CFLAGS[:]
+            ext_compile_defines = CDEFS[:]
 
             if  build_extension.compiler == 'mingw32':
                 ext_compile_flags.append('-Wno-format')
@@ -1119,6 +1121,7 @@ def run_distutils(self, test_directory, module, workdir, incdir,
                 module,
                 sources=self.source_files(workdir, module, related_files),
                 extra_compile_args=ext_compile_flags,
+                define_macros=ext_compile_defines,
                 **extra_extension_args
                 )
 
@@ -2443,7 +2446,7 @@ def runtests(options, cmd_args, coverage=None):
                              build_in_temp=True,
                              pyxbuild_dir=os.path.join(WORKDIR, "support"))
         sys.path.insert(0, os.path.split(libpath)[0])
-        CFLAGS.append("-DCYTHON_REFNANNY=1")
+        CDEFS.append(('CYTHON_REFNANNY', '1'))
 
     if options.limited_api:
         CFLAGS.append("-DCYTHON_LIMITED_API=1")