diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0239ab9..e220441 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,7 +17,7 @@ jobs: - template: azure/windows.yml parameters: name: windows - vmImage: vs2017-win2016 + vmImage: windows-2019 matrix: py_3.8_32: PYTHON_VERSION: "3.8" diff --git a/azure/windows.yml b/azure/windows.yml index 364db6f..4d5a88a 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -68,8 +68,11 @@ jobs: pip install --timeout=60 $TEST_DEPENDS Cython==$CYTHON_BUILD_DEP pip install twine wheel pushd pandas - 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 + cp "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/14.29.30133/$PYTHON_ARCH/Microsoft.VC142.CRT/msvcp140.dll" pandas/_libs/window + cp "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/14.29.30133/$PYTHON_ARCH/Microsoft.VC142.CRT/concrt140.dll" pandas/_libs/window + if [ "$PYTHON_ARCH" == "x64" ]; then + cp "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/14.29.30133/x64/Microsoft.VC142.CRT/vcruntime140_1.dll" pandas/_libs/window + fi python setup.py build python setup.py bdist_wheel ls dist @@ -88,6 +91,13 @@ jobs: displayName: Install wheel and test condition: eq(variables['SKIP_BUILD'], 'false') + - script: | + docker pull python:$(PYTHON_VERSION)-windowsservercore + docker run -v %cd%:c:\pandas python:$(PYTHON_VERSION)-windowsservercore /pandas/check_windows_dlls.bat + displayName: Ensure wheel imports correctly + # No Windows images for x86 + condition: and(eq(variables['SKIP_BUILD'], 'false'), eq(variables['PYTHON_ARCH'], 'x64')) + - bash: echo "##vso[task.prependpath]$CONDA/Scripts" displayName: Add conda to PATH condition: and(succeeded(), eq(variables['SKIP_BUILD'], 'false'), ne(variables['Build.Reason'], 'PullRequest')) diff --git a/check_windows_dlls.bat b/check_windows_dlls.bat new file mode 100644 index 0000000..f7b04be --- /dev/null +++ b/check_windows_dlls.bat @@ -0,0 +1,4 @@ +python --version +pip install pytz six numpy python-dateutil +pip install --find-links=pandas/pandas/dist --no-index pandas +python -c "import pandas as pd; print(pd.__version__)"