From 8865b428cb93a70d3fefd45df2ec8a9360d3945b Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Mon, 4 Apr 2022 16:36:03 +0000 Subject: [PATCH 1/4] add PANDAS_CI environment variable (used in tests) --- .travis.yml | 3 ++- azure/posix.yml | 3 ++- azure/windows.yml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce39c6a..97119df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ env: global: - REPO_DIR=pandas # on release change this to a version - - BUILD_COMMIT="v1.4.2" + - BUILD_COMMIT="main" - UNICODE_WIDTH=32 - PLAT=aarch64 - NP_BUILD_DEP="numpy==1.17.3" @@ -19,6 +19,7 @@ env: - TEST_DIR="tmp_for_test" - MB_ML_VER=2014 - DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8 + - PANDAS_CI=1 jobs: include: diff --git a/azure/posix.yml b/azure/posix.yml index 94907f5..595e0b3 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -9,7 +9,7 @@ jobs: vmImage: ${{ parameters.vmImage }} variables: REPO_DIR: "pandas" - BUILD_COMMIT: "v1.4.2" + BUILD_COMMIT: "main" PLAT: "x86_64" NP_BUILD_DEP: "numpy==1.17.3" CYTHON_BUILD_DEP: "cython==0.29.24" @@ -17,6 +17,7 @@ jobs: NIGHTLY_BUILD: "false" TEST_DEPENDS: "pytest pytest-xdist hypothesis" TEST_DIR: "tmp_for_test" + PANDAS_CI: 1 strategy: matrix: ${{ insert }}: ${{ parameters.matrix }} diff --git a/azure/windows.yml b/azure/windows.yml index ea95d53..da9eae3 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -8,7 +8,7 @@ jobs: pool: vmImage: ${{ parameters.vmImage }} variables: - BUILD_COMMIT: "v1.4.2" + BUILD_COMMIT: "main" NP_BUILD_DEP: "1.17.3" CYTHON_BUILD_DEP: "0.29.24" NIGHTLY_BUILD_COMMIT: "main" @@ -16,6 +16,7 @@ jobs: PYTHON_ARCH: "x64" TEST_DEPENDS: "pytest pytest-xdist hypothesis" TEST_DIR: '$(Agent.WorkFolder)/tmp_for_test' + PANDAS_CI: 1 strategy: matrix: ${{ insert }}: ${{ parameters.matrix }} From 6d8489c5a9ec77cf383d6897b654258c76ad2be5 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Mon, 4 Apr 2022 18:05:26 +0000 Subject: [PATCH 2/4] troubleshoot --- config.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/config.sh b/config.sh index d2527ac..d7f7b96 100644 --- a/config.sh +++ b/config.sh @@ -25,6 +25,7 @@ function build_wheel { function run_tests { # Runs tests on installed distribution from an empty directory export PYTHONHASHSEED=$(python -c 'import random; print(random.randint(1, 4294967295))') + export PANDAS_CI=1 echo $PATH echo ${MB_PYTHON_VERSION} which -a python From 76c6f693b08defcb4b85d8d6ac63565cd1001c30 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Mon, 4 Apr 2022 18:08:41 +0000 Subject: [PATCH 3/4] wip --- config.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/config.sh b/config.sh index d7f7b96..143db04 100644 --- a/config.sh +++ b/config.sh @@ -33,6 +33,7 @@ function run_tests { pip install "setuptools<60" pip list python -c 'import pandas; pandas.show_versions()' + python -c 'from pandas.compat import is_ci_environment; print(is_ci_environment())' # Skip test_float_precision_options: https://github.com/pandas-dev/pandas/issues/36429 # Skip test_rolling_var_numerical_issues: https://github.com/pandas-dev/pandas/issues/37398 # Skip test_rolling_skew_kurt_large_value_range: https://github.com/pandas-dev/pandas/issues/37398 From 5218cd89dfff85543f5184421e626aeb47459aa3 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Mon, 4 Apr 2022 19:29:05 +0000 Subject: [PATCH 4/4] tidy up --- .travis.yml | 3 +-- azure/posix.yml | 3 +-- azure/windows.yml | 3 +-- config.sh | 1 - 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 97119df..ce39c6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ env: global: - REPO_DIR=pandas # on release change this to a version - - BUILD_COMMIT="main" + - BUILD_COMMIT="v1.4.2" - UNICODE_WIDTH=32 - PLAT=aarch64 - NP_BUILD_DEP="numpy==1.17.3" @@ -19,7 +19,6 @@ env: - TEST_DIR="tmp_for_test" - MB_ML_VER=2014 - DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8 - - PANDAS_CI=1 jobs: include: diff --git a/azure/posix.yml b/azure/posix.yml index 595e0b3..94907f5 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -9,7 +9,7 @@ jobs: vmImage: ${{ parameters.vmImage }} variables: REPO_DIR: "pandas" - BUILD_COMMIT: "main" + BUILD_COMMIT: "v1.4.2" PLAT: "x86_64" NP_BUILD_DEP: "numpy==1.17.3" CYTHON_BUILD_DEP: "cython==0.29.24" @@ -17,7 +17,6 @@ jobs: NIGHTLY_BUILD: "false" TEST_DEPENDS: "pytest pytest-xdist hypothesis" TEST_DIR: "tmp_for_test" - PANDAS_CI: 1 strategy: matrix: ${{ insert }}: ${{ parameters.matrix }} diff --git a/azure/windows.yml b/azure/windows.yml index da9eae3..ea95d53 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -8,7 +8,7 @@ jobs: pool: vmImage: ${{ parameters.vmImage }} variables: - BUILD_COMMIT: "main" + BUILD_COMMIT: "v1.4.2" NP_BUILD_DEP: "1.17.3" CYTHON_BUILD_DEP: "0.29.24" NIGHTLY_BUILD_COMMIT: "main" @@ -16,7 +16,6 @@ jobs: PYTHON_ARCH: "x64" TEST_DEPENDS: "pytest pytest-xdist hypothesis" TEST_DIR: '$(Agent.WorkFolder)/tmp_for_test' - PANDAS_CI: 1 strategy: matrix: ${{ insert }}: ${{ parameters.matrix }} diff --git a/config.sh b/config.sh index 143db04..d7f7b96 100644 --- a/config.sh +++ b/config.sh @@ -33,7 +33,6 @@ function run_tests { pip install "setuptools<60" pip list python -c 'import pandas; pandas.show_versions()' - python -c 'from pandas.compat import is_ci_environment; print(is_ci_environment())' # Skip test_float_precision_options: https://github.com/pandas-dev/pandas/issues/36429 # Skip test_rolling_var_numerical_issues: https://github.com/pandas-dev/pandas/issues/37398 # Skip test_rolling_skew_kurt_large_value_range: https://github.com/pandas-dev/pandas/issues/37398