diff --git a/README.rst b/README.rst index 3b6c2b6..971aef3 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ .. image:: https://dev.azure.com/pandas-dev/pandas-wheels/_apis/build/status/MacPython.pandas-wheels?branchName=master - :target: https://dev.azure.com/pandas-dev/pandas-wheels/_build/latest?definitionId=2&branchName=master + :target: https://dev.azure.com/pandas-dev/pandas-wheels/_build/latest?definitionId=3&branchName=master #################################### diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f0de54a..a0177fb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,30 +20,30 @@ jobs: vmImage: vs2017-win2016 matrix: py_3.6_32: - PYTHON_VERSION: "3.6.x" + PYTHON_VERSION: "3.6" PYTHON_ARCH: "x86" NP_BUILD_DEP: "1.13.3" py_3.6_64: - PYTHON_VERSION: "3.6.x" + PYTHON_VERSION: "3.6" PYTHON_ARCH: "x64" NP_BUILD_DEP: "1.13.3" py_3.7_32: - PYTHON_VERSION: "3.7.x" + PYTHON_VERSION: "3.7" PYTHON_ARCH: "x86" NP_BUILD_DEP: "1.14.5" NIGHTLY_BUILD: "true" py_3.7_64: - PYTHON_VERSION: "3.7.x" + PYTHON_VERSION: "3.7" PYTHON_ARCH: "x64" NP_BUILD_DEP: "1.14.5" NIGHTLY_BUILD: "true" py_3.8_32: - PYTHON_VERSION: "3.8.x" + PYTHON_VERSION: "3.8" PYTHON_ARCH: "x86" NP_BUILD_DEP: "1.17.3" NIGHTLY_BUILD: "true" py_3.8_64: - PYTHON_VERSION: "3.8.x" + PYTHON_VERSION: "3.8" PYTHON_ARCH: "x64" NP_BUILD_DEP: "1.17.3" NIGHTLY_BUILD: "true" diff --git a/azure/posix.yml b/azure/posix.yml index 9544f07..35ae30e 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -9,7 +9,7 @@ jobs: vmImage: ${{ parameters.vmImage }} variables: REPO_DIR: "pandas" - BUILD_COMMIT: "v1.0.5" + BUILD_COMMIT: "master" 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 c73b87b..bf0f055 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -8,7 +8,7 @@ jobs: pool: vmImage: ${{ parameters.vmImage }} variables: - BUILD_COMMIT: "v1.0.5" + BUILD_COMMIT: "master" NP_BUILD_DEP: "1.13.3" CYTHON_BUILD_DEP: "0.29.16" NIGHTLY_BUILD_COMMIT: "master" @@ -68,10 +68,10 @@ jobs: pip install --timeout=60 $TEST_DEPENDS Cython==$CYTHON_BUILD_DEP pip install twine wheel pushd pandas - python setup.py build - python setup.py bdist_wheel cp "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Redist/MSVC/14.16.27012/$PYTHON_ARCH/Microsoft.VC141.CRT/msvcp140.dll" pandas/_libs/window cp "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Redist/MSVC/14.16.27012/$PYTHON_ARCH/Microsoft.VC141.CRT/concrt140.dll" pandas/_libs/window + python setup.py build + python setup.py bdist_wheel ls dist twine check dist/* popd diff --git a/config.sh b/config.sh index 2b51bdd..5929f02 100644 --- a/config.sh +++ b/config.sh @@ -31,5 +31,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 # test_missing_required_dependencies: https://github.com/pandas-dev/pandas/issues/33999 - python -c '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"])' + python -c '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 TestPandasContainer"])' }