diff --git a/.travis.yml b/.travis.yml index a243227..d3b859b 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.3" + - BUILD_COMMIT="1.1.x" - UNICODE_WIDTH=32 - PLAT=aarch64 - NP_BUILD_DEP="numpy==1.13.3" diff --git a/azure/posix.yml b/azure/posix.yml index 95c5730..47a8c6f 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.3" + BUILD_COMMIT: "1.1.x" 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 a4d18d2..a610920 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -8,7 +8,7 @@ jobs: pool: vmImage: ${{ parameters.vmImage }} variables: - BUILD_COMMIT: "v1.1.3" + BUILD_COMMIT: "1.1.x" NP_BUILD_DEP: "1.13.3" CYTHON_BUILD_DEP: "0.29.21" NIGHTLY_BUILD_COMMIT: "master" diff --git a/config.sh b/config.sh index ae47601..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 - # 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"]) 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' }