From 862121bc48e5c037b0da8f459ce71a0bdbf6a266 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Mon, 23 Nov 2020 12:14:38 +0000 Subject: [PATCH 01/19] troubleshoot failures with master --- .travis.yml | 2 +- azure/posix.yml | 2 +- azure/windows.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f3d3ade..bed777b 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.1.4" + - BUILD_COMMIT="master" - UNICODE_WIDTH=32 - PLAT=aarch64 - NP_BUILD_DEP="numpy==1.13.3" diff --git a/azure/posix.yml b/azure/posix.yml index 053372d..de00b3d 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -9,7 +9,7 @@ jobs: vmImage: ${{ parameters.vmImage }} variables: REPO_DIR: "pandas" - BUILD_COMMIT: "v1.1.4" + BUILD_COMMIT: "master" PLAT: "x86_64" NP_BUILD_DEP: "numpy==1.13.3" CYTHON_BUILD_DEP: "cython==0.29.21" diff --git a/azure/windows.yml b/azure/windows.yml index cfc8742..4f4ae8f 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -8,7 +8,7 @@ jobs: pool: vmImage: ${{ parameters.vmImage }} variables: - BUILD_COMMIT: "v1.1.4" + BUILD_COMMIT: "master" NP_BUILD_DEP: "1.13.3" CYTHON_BUILD_DEP: "0.29.21" NIGHTLY_BUILD_COMMIT: "master" From a24c00a54dacb4daad5e009e20f3daf57a846b11 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Mon, 23 Nov 2020 13:21:11 +0000 Subject: [PATCH 02/19] temporary remove 3.6 here (can't be removed till after 1.1.5 release) --- azure-pipelines.yml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3467593..3172055 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,7 +11,7 @@ trigger: - master pr: -- master +- master jobs: - template: azure/windows.yml @@ -19,14 +19,6 @@ jobs: name: windows vmImage: vs2017-win2016 matrix: - py_3.6_32: - PYTHON_VERSION: "3.6" - PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.13.3" - py_3.6_64: - PYTHON_VERSION: "3.6" - PYTHON_ARCH: "x64" - NP_BUILD_DEP: "1.13.3" py_3.7_32: PYTHON_VERSION: "3.7" PYTHON_ARCH: "x86" @@ -63,11 +55,6 @@ jobs: name: linux vmImage: ubuntu-16.04 matrix: - py_3.6_32: - MB_PYTHON_VERSION: "3.6" - PLAT: "i686" - py_3.6_64: - MB_PYTHON_VERSION: "3.6" py_3.7_32: MB_PYTHON_VERSION: "3.7" PLAT: "i686" @@ -102,9 +89,6 @@ jobs: name: macOS vmImage: macOS-10.14 matrix: - py_3.6_64: - MB_PYTHON_VERSION: "3.6" - NP_BUILD_DEP: "numpy==1.13.3" py_3.7_64: MB_PYTHON_VERSION: "3.7" NP_BUILD_DEP: "numpy==1.14.5" From 3d2e30aaf32baf73f16125604b41721cdf8c772b Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Mon, 23 Nov 2020 13:22:16 +0000 Subject: [PATCH 03/19] temporary skip of test_float_precision_options (will need green for wheels to be published for 1.2rc) --- config.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.sh b/config.sh index e98afa2..5eb2325 100644 --- a/config.sh +++ b/config.sh @@ -31,6 +31,7 @@ function run_tests { pip list python -c 'import pandas; pandas.show_versions()' # Skip test_maybe_promote_int_with_int: https://github.com/pandas-dev/pandas/issues/31856 + # Skip test_float_precision_options: https://github.com/pandas-dev/pandas/issues/36429 # TestPandasContainer for 3.7.0 failure - python -c 'import sys; import pandas; pandas.test(extra_args=["-m not clipboard", "--skip-slow", "--skip-network", "--skip-db", "-n=2", "-k not test_maybe_promote_int_with_int and not test_file_descriptor_leak"]) if sys.version_info[:2] != (3, 7) else None' + python -c 'import sys; import pandas; pandas.test(extra_args=["-m not clipboard", "--skip-slow", "--skip-network", "--skip-db", "-n=2", "-k not test_maybe_promote_int_with_int and not test_file_descriptor_leak and not test_float_precision_options"]) if sys.version_info[:2] != (3, 7) else None' } From ec347769d957e5b526b28ed92a2fe4a97da5f0cc Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Tue, 24 Nov 2020 10:43:50 +0000 Subject: [PATCH 04/19] change NP_BUILD_DEP --- azure-pipelines.yml | 10 +++++----- azure/posix.yml | 2 +- azure/windows.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3172055..0c00cef 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -22,12 +22,12 @@ jobs: py_3.7_32: PYTHON_VERSION: "3.7" PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.14.5" + NP_BUILD_DEP: "1.16.5" NIGHTLY_BUILD: "true" py_3.7_64: PYTHON_VERSION: "3.7" PYTHON_ARCH: "x64" - NP_BUILD_DEP: "1.14.5" + NP_BUILD_DEP: "1.16.5" NIGHTLY_BUILD: "true" py_3.8_32: PYTHON_VERSION: "3.8" @@ -58,11 +58,11 @@ jobs: py_3.7_32: MB_PYTHON_VERSION: "3.7" PLAT: "i686" - NP_BUILD_DEP: "numpy==1.14.5" + NP_BUILD_DEP: "numpy==1.16.5" NIGHTLY_BUILD: "true" py_3.7_64: MB_PYTHON_VERSION: "3.7" - NP_BUILD_DEP: "numpy==1.14.5" + NP_BUILD_DEP: "numpy==1.16.5" NIGHTLY_BUILD: "true" py_3.8_32: MB_PYTHON_VERSION: "3.8" @@ -91,7 +91,7 @@ jobs: matrix: py_3.7_64: MB_PYTHON_VERSION: "3.7" - NP_BUILD_DEP: "numpy==1.14.5" + NP_BUILD_DEP: "numpy==1.16.5" NIGHTLY_BUILD: "true" py_3.8_64: MB_PYTHON_VERSION: "3.8" diff --git a/azure/posix.yml b/azure/posix.yml index de00b3d..8c7cc2e 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -11,7 +11,7 @@ jobs: REPO_DIR: "pandas" BUILD_COMMIT: "master" PLAT: "x86_64" - NP_BUILD_DEP: "numpy==1.13.3" + NP_BUILD_DEP: "numpy==1.16.5" CYTHON_BUILD_DEP: "cython==0.29.21" NIGHTLY_BUILD_COMMIT: "master" NIGHTLY_BUILD: "false" diff --git a/azure/windows.yml b/azure/windows.yml index 4f4ae8f..b41a16d 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -9,7 +9,7 @@ jobs: vmImage: ${{ parameters.vmImage }} variables: BUILD_COMMIT: "master" - NP_BUILD_DEP: "1.13.3" + NP_BUILD_DEP: "1.16.5" CYTHON_BUILD_DEP: "0.29.21" NIGHTLY_BUILD_COMMIT: "master" NIGHTLY_BUILD: "false" From 42e9fa4a8aa0e269c26acbca082098316448ac2f Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Tue, 24 Nov 2020 12:17:55 +0000 Subject: [PATCH 05/19] Revert "temporary skip of test_float_precision_options (will need green for wheels to be published for 1.2rc)" This reverts commit 3d2e30aaf32baf73f16125604b41721cdf8c772b. --- config.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config.sh b/config.sh index 5eb2325..e98afa2 100644 --- a/config.sh +++ b/config.sh @@ -31,7 +31,6 @@ function run_tests { pip list python -c 'import pandas; pandas.show_versions()' # Skip test_maybe_promote_int_with_int: https://github.com/pandas-dev/pandas/issues/31856 - # Skip test_float_precision_options: https://github.com/pandas-dev/pandas/issues/36429 # TestPandasContainer for 3.7.0 failure - python -c 'import sys; import pandas; pandas.test(extra_args=["-m not clipboard", "--skip-slow", "--skip-network", "--skip-db", "-n=2", "-k not test_maybe_promote_int_with_int and not test_file_descriptor_leak and not test_float_precision_options"]) if sys.version_info[:2] != (3, 7) else None' + python -c 'import sys; import pandas; pandas.test(extra_args=["-m not clipboard", "--skip-slow", "--skip-network", "--skip-db", "-n=2", "-k not test_maybe_promote_int_with_int and not test_file_descriptor_leak"]) if sys.version_info[:2] != (3, 7) else None' } From ee9f3e5341bf65dc9678cd9693008b9d6eea46f3 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Mon, 23 Nov 2020 13:22:16 +0000 Subject: [PATCH 06/19] temporary skip of test_float_precision_options (will need green for wheels to be published for 1.2rc) --- config.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.sh b/config.sh index e98afa2..5eb2325 100644 --- a/config.sh +++ b/config.sh @@ -31,6 +31,7 @@ function run_tests { pip list python -c 'import pandas; pandas.show_versions()' # Skip test_maybe_promote_int_with_int: https://github.com/pandas-dev/pandas/issues/31856 + # Skip test_float_precision_options: https://github.com/pandas-dev/pandas/issues/36429 # TestPandasContainer for 3.7.0 failure - python -c 'import sys; import pandas; pandas.test(extra_args=["-m not clipboard", "--skip-slow", "--skip-network", "--skip-db", "-n=2", "-k not test_maybe_promote_int_with_int and not test_file_descriptor_leak"]) if sys.version_info[:2] != (3, 7) else None' + python -c 'import sys; import pandas; pandas.test(extra_args=["-m not clipboard", "--skip-slow", "--skip-network", "--skip-db", "-n=2", "-k not test_maybe_promote_int_with_int and not test_file_descriptor_leak and not test_float_precision_options"]) if sys.version_info[:2] != (3, 7) else None' } From 56dcd1c176dbd65efef722ed53b624fad12bc5dc Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Thu, 26 Nov 2020 17:48:47 +0000 Subject: [PATCH 07/19] enable tests for py37 --- config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.sh b/config.sh index 5eb2325..094d2ef 100644 --- a/config.sh +++ b/config.sh @@ -33,5 +33,5 @@ function run_tests { # Skip test_maybe_promote_int_with_int: https://github.com/pandas-dev/pandas/issues/31856 # Skip test_float_precision_options: https://github.com/pandas-dev/pandas/issues/36429 # TestPandasContainer for 3.7.0 failure - python -c 'import sys; import pandas; pandas.test(extra_args=["-m not clipboard", "--skip-slow", "--skip-network", "--skip-db", "-n=2", "-k not test_maybe_promote_int_with_int and not test_file_descriptor_leak and not test_float_precision_options"]) if sys.version_info[:2] != (3, 7) else None' + python -c 'import sys; import pandas; pandas.test(extra_args=["-m not clipboard", "--skip-slow", "--skip-network", "--skip-db", "-n=2", "-k not test_maybe_promote_int_with_int and not test_file_descriptor_leak and not test_float_precision_options"])' } From 467737d72faaa28c45c65fd2c589ae97b68eb391 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Fri, 27 Nov 2020 10:10:49 +0000 Subject: [PATCH 08/19] change to skipped tests --- config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.sh b/config.sh index 094d2ef..1e3660b 100644 --- a/config.sh +++ b/config.sh @@ -33,5 +33,5 @@ function run_tests { # Skip test_maybe_promote_int_with_int: https://github.com/pandas-dev/pandas/issues/31856 # Skip test_float_precision_options: https://github.com/pandas-dev/pandas/issues/36429 # TestPandasContainer for 3.7.0 failure - python -c 'import sys; import pandas; pandas.test(extra_args=["-m not clipboard", "--skip-slow", "--skip-network", "--skip-db", "-n=2", "-k not test_maybe_promote_int_with_int and not test_file_descriptor_leak and not test_float_precision_options"])' + python -c 'import sys; import pandas; pandas.test(extra_args=["-m not clipboard", "--skip-slow", "--skip-network", "--skip-db", "-n=2", "-k not test_maybe_promote_int_with_int and not test_rolling_var_numerical_issues and not test_rolling_skew_kurt_large_value_range and not test_float_precision_options"])' } From 98d9b834abb3c370ccb4be38f8c00d4409cfe642 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Fri, 27 Nov 2020 10:11:21 +0000 Subject: [PATCH 09/19] remove 3.7 comment --- config.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/config.sh b/config.sh index 1e3660b..407f317 100644 --- a/config.sh +++ b/config.sh @@ -32,6 +32,5 @@ function run_tests { python -c 'import pandas; pandas.show_versions()' # Skip test_maybe_promote_int_with_int: https://github.com/pandas-dev/pandas/issues/31856 # Skip test_float_precision_options: https://github.com/pandas-dev/pandas/issues/36429 - # TestPandasContainer for 3.7.0 failure python -c 'import sys; import pandas; pandas.test(extra_args=["-m not clipboard", "--skip-slow", "--skip-network", "--skip-db", "-n=2", "-k not test_maybe_promote_int_with_int and not test_rolling_var_numerical_issues and not test_rolling_skew_kurt_large_value_range and not test_float_precision_options"])' } From a2abac4759dafbbe3e9a8843066ae8602c42f920 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Fri, 27 Nov 2020 10:12:54 +0000 Subject: [PATCH 10/19] placeholder comment for skipped tests --- config.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config.sh b/config.sh index 407f317..452b060 100644 --- a/config.sh +++ b/config.sh @@ -32,5 +32,7 @@ function run_tests { python -c 'import pandas; pandas.show_versions()' # Skip test_maybe_promote_int_with_int: https://github.com/pandas-dev/pandas/issues/31856 # 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/**** + # Skip test_rolling_skew_kurt_large_value_range: https://github.com/pandas-dev/pandas/issues/**** python -c 'import sys; import pandas; pandas.test(extra_args=["-m not clipboard", "--skip-slow", "--skip-network", "--skip-db", "-n=2", "-k not test_maybe_promote_int_with_int and not test_rolling_var_numerical_issues and not test_rolling_skew_kurt_large_value_range and not test_float_precision_options"])' } From 3568d5908a891c0f3d9ac2e0c9796301a64ae90f Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Fri, 27 Nov 2020 10:57:50 +0000 Subject: [PATCH 11/19] unpin pytest --- azure/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/posix.yml b/azure/posix.yml index 8c7cc2e..27f8435 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -15,7 +15,7 @@ jobs: CYTHON_BUILD_DEP: "cython==0.29.21" NIGHTLY_BUILD_COMMIT: "master" NIGHTLY_BUILD: "false" - TEST_DEPENDS: "pytest pytest-xdist==1.* hypothesis" + TEST_DEPENDS: "pytest pytest-xdist hypothesis" TEST_DIR: "tmp_for_test" strategy: matrix: From cef9f4ed0aa1c24cbee7e13f877c04bbeb33f538 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Fri, 27 Nov 2020 11:45:34 +0000 Subject: [PATCH 12/19] add issue numbers for skipped tests --- config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.sh b/config.sh index 452b060..8ff08ed 100644 --- a/config.sh +++ b/config.sh @@ -32,7 +32,7 @@ function run_tests { python -c 'import pandas; pandas.show_versions()' # Skip test_maybe_promote_int_with_int: https://github.com/pandas-dev/pandas/issues/31856 # 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/**** - # Skip test_rolling_skew_kurt_large_value_range: https://github.com/pandas-dev/pandas/issues/**** + # 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 python -c 'import sys; import pandas; pandas.test(extra_args=["-m not clipboard", "--skip-slow", "--skip-network", "--skip-db", "-n=2", "-k not test_maybe_promote_int_with_int and not test_rolling_var_numerical_issues and not test_rolling_skew_kurt_large_value_range and not test_float_precision_options"])' } From e9a011afce5faffc0f6f68d8cf7f6e5ff5f12b87 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Fri, 27 Nov 2020 11:48:51 +0000 Subject: [PATCH 13/19] change NP_BUILD_DEP for aarch (on travis) --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index bed777b..380ec6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,8 @@ env: - BUILD_COMMIT="master" - UNICODE_WIDTH=32 - PLAT=aarch64 - - NP_BUILD_DEP="numpy==1.13.3" - - NP_TEST_DEP="numpy==1.13.3" + - NP_BUILD_DEP="numpy==1.16.5" + - NP_TEST_DEP="numpy==1.16.5" - CYTHON_BUILD_DEP="cython==0.29.16" - WHEELHOUSE_UPLOADER_USERNAME=travis-worker - TEST_DEPENDS="pytest pytest-xdist hypothesis" @@ -25,13 +25,13 @@ jobs: - os: linux env: - MB_PYTHON_VERSION=3.6 - - NP_BUILD_DEP="numpy==1.13.3" - - NP_TEST_DEP="numpy==1.13.3" + - NP_BUILD_DEP="numpy==1.16.5" + - NP_TEST_DEP="numpy==1.16.5" - os: linux env: - MB_PYTHON_VERSION=3.7 - - NP_BUILD_DEP="numpy==1.14.5" - - NP_TEST_DEP="numpy==1.14.5" + - NP_BUILD_DEP="numpy==1.16.5" + - NP_TEST_DEP="numpy==1.16.5" - os: linux env: - MB_PYTHON_VERSION=3.8 From 90ddb146b09638db7112cee34229bc1e823a987e Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Fri, 27 Nov 2020 11:50:00 +0000 Subject: [PATCH 14/19] is test_maybe_promote_int_with_int still failing? --- config.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config.sh b/config.sh index 8ff08ed..6bb5277 100644 --- a/config.sh +++ b/config.sh @@ -30,9 +30,8 @@ function run_tests { which -a python pip list python -c 'import pandas; pandas.show_versions()' - # Skip test_maybe_promote_int_with_int: https://github.com/pandas-dev/pandas/issues/31856 # 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 - python -c 'import sys; import pandas; pandas.test(extra_args=["-m not clipboard", "--skip-slow", "--skip-network", "--skip-db", "-n=2", "-k not test_maybe_promote_int_with_int and not test_rolling_var_numerical_issues and not test_rolling_skew_kurt_large_value_range and not test_float_precision_options"])' + python -c 'import sys; import pandas; pandas.test(extra_args=["-m not clipboard", "--skip-slow", "--skip-network", "--skip-db", "-n=2", "-k not test_rolling_var_numerical_issues and not test_rolling_skew_kurt_large_value_range and not test_float_precision_options"])' } From c803aa21150606be49a58de1e617231de8cf8713 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Fri, 27 Nov 2020 14:24:33 +0000 Subject: [PATCH 15/19] Revert "change NP_BUILD_DEP for aarch (on travis)" This reverts commit e9a011afce5faffc0f6f68d8cf7f6e5ff5f12b87. --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 380ec6b..bed777b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,8 @@ env: - BUILD_COMMIT="master" - UNICODE_WIDTH=32 - PLAT=aarch64 - - NP_BUILD_DEP="numpy==1.16.5" - - NP_TEST_DEP="numpy==1.16.5" + - NP_BUILD_DEP="numpy==1.13.3" + - NP_TEST_DEP="numpy==1.13.3" - CYTHON_BUILD_DEP="cython==0.29.16" - WHEELHOUSE_UPLOADER_USERNAME=travis-worker - TEST_DEPENDS="pytest pytest-xdist hypothesis" @@ -25,13 +25,13 @@ jobs: - os: linux env: - MB_PYTHON_VERSION=3.6 - - NP_BUILD_DEP="numpy==1.16.5" - - NP_TEST_DEP="numpy==1.16.5" + - NP_BUILD_DEP="numpy==1.13.3" + - NP_TEST_DEP="numpy==1.13.3" - os: linux env: - MB_PYTHON_VERSION=3.7 - - NP_BUILD_DEP="numpy==1.16.5" - - NP_TEST_DEP="numpy==1.16.5" + - NP_BUILD_DEP="numpy==1.14.5" + - NP_TEST_DEP="numpy==1.14.5" - os: linux env: - MB_PYTHON_VERSION=3.8 From 0e365f1a7772aa70452c13a730ffe904e07834a6 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Sat, 28 Nov 2020 12:25:27 +0000 Subject: [PATCH 16/19] tidy --- azure-pipelines.yml | 18 +++++++++++++++++- azure/posix.yml | 2 +- azure/windows.yml | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c1225a0..8df2145 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,7 +11,7 @@ trigger: - master pr: -- master +- master jobs: - template: azure/windows.yml @@ -19,6 +19,14 @@ jobs: name: windows vmImage: vs2017-win2016 matrix: + py_3.6_32: + PYTHON_VERSION: "3.6" + PYTHON_ARCH: "x86" + NP_BUILD_DEP: "1.13.3" + py_3.6_64: + PYTHON_VERSION: "3.6" + PYTHON_ARCH: "x64" + NP_BUILD_DEP: "1.13.3" py_3.7_32: PYTHON_VERSION: "3.7" PYTHON_ARCH: "x86" @@ -55,6 +63,11 @@ jobs: name: linux vmImage: ubuntu-16.04 matrix: + py_3.6_32: + MB_PYTHON_VERSION: "3.6" + PLAT: "i686" + py_3.6_64: + MB_PYTHON_VERSION: "3.6" py_3.7_32: MB_PYTHON_VERSION: "3.7" PLAT: "i686" @@ -89,6 +102,9 @@ jobs: name: macOS vmImage: macOS-10.14 matrix: + py_3.6_64: + MB_PYTHON_VERSION: "3.6" + NP_BUILD_DEP: "numpy==1.13.3" py_3.7_64: MB_PYTHON_VERSION: "3.7" NP_BUILD_DEP: "numpy==1.14.5" diff --git a/azure/posix.yml b/azure/posix.yml index 27f8435..3295ed3 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -11,7 +11,7 @@ jobs: REPO_DIR: "pandas" BUILD_COMMIT: "master" PLAT: "x86_64" - NP_BUILD_DEP: "numpy==1.16.5" + NP_BUILD_DEP: "numpy==1.13.3" CYTHON_BUILD_DEP: "cython==0.29.21" NIGHTLY_BUILD_COMMIT: "master" NIGHTLY_BUILD: "false" diff --git a/azure/windows.yml b/azure/windows.yml index b41a16d..4f4ae8f 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -9,7 +9,7 @@ jobs: vmImage: ${{ parameters.vmImage }} variables: BUILD_COMMIT: "master" - NP_BUILD_DEP: "1.16.5" + NP_BUILD_DEP: "1.13.3" CYTHON_BUILD_DEP: "0.29.21" NIGHTLY_BUILD_COMMIT: "master" NIGHTLY_BUILD: "false" From d0141000fa649e6c8303cc6e1ae23feb3542c3b9 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Sat, 28 Nov 2020 20:24:39 +0000 Subject: [PATCH 17/19] disable 3.6 builds --- .travis.yml | 10 +++++----- azure-pipelines.yml | 32 ++++++++++++++++---------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index bed777b..8d2905a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,11 +22,11 @@ env: jobs: include: - - os: linux - env: - - MB_PYTHON_VERSION=3.6 - - NP_BUILD_DEP="numpy==1.13.3" - - NP_TEST_DEP="numpy==1.13.3" + # - os: linux + # env: + # - MB_PYTHON_VERSION=3.6 + # - NP_BUILD_DEP="numpy==1.13.3" + # - NP_TEST_DEP="numpy==1.13.3" - os: linux env: - MB_PYTHON_VERSION=3.7 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8df2145..e7cd99d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,14 +19,14 @@ jobs: name: windows vmImage: vs2017-win2016 matrix: - py_3.6_32: - PYTHON_VERSION: "3.6" - PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.13.3" - py_3.6_64: - PYTHON_VERSION: "3.6" - PYTHON_ARCH: "x64" - NP_BUILD_DEP: "1.13.3" + # py_3.6_32: + # PYTHON_VERSION: "3.6" + # PYTHON_ARCH: "x86" + # NP_BUILD_DEP: "1.13.3" + # py_3.6_64: + # PYTHON_VERSION: "3.6" + # PYTHON_ARCH: "x64" + # NP_BUILD_DEP: "1.13.3" py_3.7_32: PYTHON_VERSION: "3.7" PYTHON_ARCH: "x86" @@ -63,11 +63,11 @@ jobs: name: linux vmImage: ubuntu-16.04 matrix: - py_3.6_32: - MB_PYTHON_VERSION: "3.6" - PLAT: "i686" - py_3.6_64: - MB_PYTHON_VERSION: "3.6" + # py_3.6_32: + # MB_PYTHON_VERSION: "3.6" + # PLAT: "i686" + # py_3.6_64: + # MB_PYTHON_VERSION: "3.6" py_3.7_32: MB_PYTHON_VERSION: "3.7" PLAT: "i686" @@ -102,9 +102,9 @@ jobs: name: macOS vmImage: macOS-10.14 matrix: - py_3.6_64: - MB_PYTHON_VERSION: "3.6" - NP_BUILD_DEP: "numpy==1.13.3" + # py_3.6_64: + # MB_PYTHON_VERSION: "3.6" + # NP_BUILD_DEP: "numpy==1.13.3" py_3.7_64: MB_PYTHON_VERSION: "3.7" NP_BUILD_DEP: "numpy==1.14.5" From 159f3ceb9a94c5a1d37e4ca493d5f77844b1ae71 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Mon, 7 Dec 2020 19:39:24 +0000 Subject: [PATCH 18/19] remove 3.6 and update NP_BUILD_DEP (inc Travis) --- .travis.yml | 15 +++++---------- azure-pipelines.yml | 26 +++++--------------------- azure/posix.yml | 2 +- azure/windows.yml | 2 +- 4 files changed, 12 insertions(+), 33 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8d2905a..1b64a63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,9 @@ env: - BUILD_COMMIT="master" - UNICODE_WIDTH=32 - PLAT=aarch64 - - NP_BUILD_DEP="numpy==1.13.3" - - NP_TEST_DEP="numpy==1.13.3" - - CYTHON_BUILD_DEP="cython==0.29.16" + - NP_BUILD_DEP="numpy==1.16.5" + - NP_TEST_DEP="numpy==1.16.5" + - CYTHON_BUILD_DEP="cython==0.29.21" - WHEELHOUSE_UPLOADER_USERNAME=travis-worker - TEST_DEPENDS="pytest pytest-xdist hypothesis" - TEST_DIR="tmp_for_test" @@ -22,16 +22,11 @@ env: jobs: include: - # - os: linux - # env: - # - MB_PYTHON_VERSION=3.6 - # - NP_BUILD_DEP="numpy==1.13.3" - # - NP_TEST_DEP="numpy==1.13.3" - os: linux env: - MB_PYTHON_VERSION=3.7 - - NP_BUILD_DEP="numpy==1.14.5" - - NP_TEST_DEP="numpy==1.14.5" + - NP_BUILD_DEP="numpy==1.16.5" + - NP_TEST_DEP="numpy==1.16.5" - os: linux env: - MB_PYTHON_VERSION=3.8 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5d66abc..0c00cef 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,23 +19,15 @@ jobs: name: windows vmImage: vs2017-win2016 matrix: - # py_3.6_32: - # PYTHON_VERSION: "3.6" - # PYTHON_ARCH: "x86" - # NP_BUILD_DEP: "1.13.3" - # py_3.6_64: - # PYTHON_VERSION: "3.6" - # PYTHON_ARCH: "x64" - # NP_BUILD_DEP: "1.13.3" py_3.7_32: PYTHON_VERSION: "3.7" PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.15.4" + NP_BUILD_DEP: "1.16.5" NIGHTLY_BUILD: "true" py_3.7_64: PYTHON_VERSION: "3.7" PYTHON_ARCH: "x64" - NP_BUILD_DEP: "1.15.4" + NP_BUILD_DEP: "1.16.5" NIGHTLY_BUILD: "true" py_3.8_32: PYTHON_VERSION: "3.8" @@ -63,19 +55,14 @@ jobs: name: linux vmImage: ubuntu-16.04 matrix: - # py_3.6_32: - # MB_PYTHON_VERSION: "3.6" - # PLAT: "i686" - # py_3.6_64: - # MB_PYTHON_VERSION: "3.6" py_3.7_32: MB_PYTHON_VERSION: "3.7" PLAT: "i686" - NP_BUILD_DEP: "numpy==1.15.4" + NP_BUILD_DEP: "numpy==1.16.5" NIGHTLY_BUILD: "true" py_3.7_64: MB_PYTHON_VERSION: "3.7" - NP_BUILD_DEP: "numpy==1.15.4" + NP_BUILD_DEP: "numpy==1.16.5" NIGHTLY_BUILD: "true" py_3.8_32: MB_PYTHON_VERSION: "3.8" @@ -102,12 +89,9 @@ jobs: name: macOS vmImage: macOS-10.14 matrix: - # py_3.6_64: - # MB_PYTHON_VERSION: "3.6" - # NP_BUILD_DEP: "numpy==1.13.3" py_3.7_64: MB_PYTHON_VERSION: "3.7" - NP_BUILD_DEP: "numpy==1.15.4" + NP_BUILD_DEP: "numpy==1.16.5" NIGHTLY_BUILD: "true" py_3.8_64: MB_PYTHON_VERSION: "3.8" diff --git a/azure/posix.yml b/azure/posix.yml index 02a7c77..27f8435 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -11,7 +11,7 @@ jobs: REPO_DIR: "pandas" BUILD_COMMIT: "master" PLAT: "x86_64" - NP_BUILD_DEP: "numpy==1.15.4" + NP_BUILD_DEP: "numpy==1.16.5" CYTHON_BUILD_DEP: "cython==0.29.21" NIGHTLY_BUILD_COMMIT: "master" NIGHTLY_BUILD: "false" diff --git a/azure/windows.yml b/azure/windows.yml index 342c97a..b41a16d 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -9,7 +9,7 @@ jobs: vmImage: ${{ parameters.vmImage }} variables: BUILD_COMMIT: "master" - NP_BUILD_DEP: "1.15.4" + NP_BUILD_DEP: "1.16.5" CYTHON_BUILD_DEP: "0.29.21" NIGHTLY_BUILD_COMMIT: "master" NIGHTLY_BUILD: "false" From 3191bf267d28b542b6500dd3ee9fe433338fe128 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Tue, 8 Dec 2020 13:35:55 +0000 Subject: [PATCH 19/19] set BUILD_COMMIT to v1.2.0rc0 --- .travis.yml | 2 +- azure/posix.yml | 2 +- azure/windows.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1b64a63..1815a82 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="master" + - BUILD_COMMIT="v1.2.0rc0" - UNICODE_WIDTH=32 - PLAT=aarch64 - NP_BUILD_DEP="numpy==1.16.5" diff --git a/azure/posix.yml b/azure/posix.yml index 27f8435..64620f1 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -9,7 +9,7 @@ jobs: vmImage: ${{ parameters.vmImage }} variables: REPO_DIR: "pandas" - BUILD_COMMIT: "master" + BUILD_COMMIT: "v1.2.0rc0" PLAT: "x86_64" NP_BUILD_DEP: "numpy==1.16.5" CYTHON_BUILD_DEP: "cython==0.29.21" diff --git a/azure/windows.yml b/azure/windows.yml index b41a16d..fc85bac 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -8,7 +8,7 @@ jobs: pool: vmImage: ${{ parameters.vmImage }} variables: - BUILD_COMMIT: "master" + BUILD_COMMIT: "v1.2.0rc0" NP_BUILD_DEP: "1.16.5" CYTHON_BUILD_DEP: "0.29.21" NIGHTLY_BUILD_COMMIT: "master"