From 7542e03057a42cf2e6dbba85abc92a8f34b2a691 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Wed, 19 Aug 2020 10:29:28 +0100 Subject: [PATCH 1/6] test 1.1.x - DO NOT MERGE --- azure/posix.yml | 2 +- azure/windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 4ba8880..f1fbdfa 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.0" + BUILD_COMMIT: "v1.1.x" PLAT: "x86_64" NP_BUILD_DEP: "numpy==1.13.3" CYTHON_BUILD_DEP: "cython==0.29.16" diff --git a/azure/windows.yml b/azure/windows.yml index 6ca13c7..257efa8 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -8,7 +8,7 @@ jobs: pool: vmImage: ${{ parameters.vmImage }} variables: - BUILD_COMMIT: "v1.1.0" + BUILD_COMMIT: "v1.1.x" NP_BUILD_DEP: "1.13.3" CYTHON_BUILD_DEP: "0.29.16" NIGHTLY_BUILD_COMMIT: "master" From d28a73a334ed08fab6e280d698ffb65ee61f6983 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Wed, 19 Aug 2020 10:32:33 +0100 Subject: [PATCH 2/6] remove v --- azure/posix.yml | 2 +- azure/windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index f1fbdfa..c42a755 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.x" + BUILD_COMMIT: "1.1.x" PLAT: "x86_64" NP_BUILD_DEP: "numpy==1.13.3" CYTHON_BUILD_DEP: "cython==0.29.16" diff --git a/azure/windows.yml b/azure/windows.yml index 257efa8..df5cb06 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -8,7 +8,7 @@ jobs: pool: vmImage: ${{ parameters.vmImage }} variables: - BUILD_COMMIT: "v1.1.x" + BUILD_COMMIT: "1.1.x" NP_BUILD_DEP: "1.13.3" CYTHON_BUILD_DEP: "0.29.16" NIGHTLY_BUILD_COMMIT: "master" From 61ead8028c4064d16afc1fa47c6108ce98b30230 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Wed, 19 Aug 2020 17:10:30 +0100 Subject: [PATCH 3/6] pin pytest-xdist --- azure/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/posix.yml b/azure/posix.yml index c42a755..e046ea6 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -15,7 +15,7 @@ jobs: CYTHON_BUILD_DEP: "cython==0.29.16" NIGHTLY_BUILD_COMMIT: "master" NIGHTLY_BUILD: "false" - TEST_DEPENDS: "pytest pytest-xdist hypothesis" + TEST_DEPENDS: "pytest pytest-xdist==1.* hypothesis" TEST_DIR: "tmp_for_test" strategy: matrix: From 1242f8e39fc9799d1e26dadba39562c3ed9d51dd Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Wed, 19 Aug 2020 17:59:31 +0100 Subject: [PATCH 4/6] skip failing tests --- config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.sh b/config.sh index a13b7d3..9e7afd9 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 # test_missing_required_dependencies: https://github.com/pandas-dev/pandas/issues/33999 # 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_missing_required_dependency"]) 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_missing_required_dependency and not test_file_descriptor_leak and not test_groupby_rolling_center_center and not test_groupby_subselect_rolling and not test_groupby_rolling_custom_indexer and not test_groupby_rolling_subset_with_closed and not test_groupby_subset_rolling_subset_with_closed"]) if sys.version_info[:2] != (3, 7) else None' } From 43d088894fe24d1e084fd829849809963e8555db Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Wed, 19 Aug 2020 18:51:23 +0100 Subject: [PATCH 5/6] remove test_file_descriptor_leak from skip list --- config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.sh b/config.sh index 9e7afd9..f85ba71 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 # test_missing_required_dependencies: https://github.com/pandas-dev/pandas/issues/33999 # 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_missing_required_dependency and not test_file_descriptor_leak and not test_groupby_rolling_center_center and not test_groupby_subselect_rolling and not test_groupby_rolling_custom_indexer and not test_groupby_rolling_subset_with_closed and not test_groupby_subset_rolling_subset_with_closed"]) 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_missing_required_dependency and not test_groupby_rolling_center_center and not test_groupby_subselect_rolling and not test_groupby_rolling_custom_indexer and not test_groupby_rolling_subset_with_closed and not test_groupby_subset_rolling_subset_with_closed"]) if sys.version_info[:2] != (3, 7) else None' } From 169450c42bbe6b722d3f88ca853c59bed539296a Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Thu, 20 Aug 2020 14:36:01 +0100 Subject: [PATCH 6/6] remove skips for 32bit fails --- config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.sh b/config.sh index f85ba71..a13b7d3 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 # test_missing_required_dependencies: https://github.com/pandas-dev/pandas/issues/33999 # 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_missing_required_dependency and not test_groupby_rolling_center_center and not test_groupby_subselect_rolling and not test_groupby_rolling_custom_indexer and not test_groupby_rolling_subset_with_closed and not test_groupby_subset_rolling_subset_with_closed"]) 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_missing_required_dependency"]) if sys.version_info[:2] != (3, 7) else None' }