Merge branch 'master' into test-1.4.x

Author: simonjayhawkins

azure-pipelines.yml

@@ -64,7 +64,6 @@ jobs:
           MB_PYTHON_VERSION: "3.10"
           MB_ML_VER: "2014"
           NP_BUILD_DEP: "numpy==1.21.2"
-          CYTHON_BUILD_DEP: "cython==0.29.24"
           DOCKER_TEST_IMAGE: "multibuild/focal_{PLAT}"
           NIGHTLY_BUILD: "true"
 

azure/windows.yml

@@ -14,7 +14,8 @@ jobs:
       NIGHTLY_BUILD_COMMIT: "main"
       NIGHTLY_BUILD: "false"
       PYTHON_ARCH: "x64"
-      TEST_DEPENDS: "pytest pytest-xdist hypothesis"
+      # https://github.com/pandas-dev/pandas/issues/47332
+      TEST_DEPENDS: "pytest pytest-xdist hypothesis tzdata"
       TEST_DIR: '$(Agent.WorkFolder)/tmp_for_test'
     strategy:
       matrix:

config.sh

@@ -1,6 +1,13 @@
 # Define custom utilities
 # Test for OSX with [ -n "$IS_OSX" ]
 
+# Adapted from MacPython/numpy-wheels
+# https://github.com/MacPython/numpy-wheels/blob/87b189083a5f77225c3e51895c16d11711f73987/config.sh#L4-L7
+if [ $(uname) == "Linux" ]; then
+    IS_LINUX=1
+    ! git config --global --add safe.directory /io/pandas
+fi
+
 function pre_build {
     # Any stuff that you need to do before you start building the wheels
     # Runs in the root directory of this repository.