From 42ac895f23015d5e504b4c85932d6a19bb8445c4 Mon Sep 17 00:00:00 2001 From: Chris Bartak Date: Thu, 2 Apr 2020 15:04:46 -0500 Subject: [PATCH 1/8] BLD: add msvcp DLLL to windows wheel build --- azure/windows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure/windows.yml b/azure/windows.yml index 21c0595..2b117ae 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -71,6 +71,8 @@ jobs: pushd pandas python setup.py build python setup.py bdist_wheel + copy /Y /B "C:\windows\system32\MSVCP140.DLL" pandas\_libs\window + copy /Y /B "C:\windows\system32\CONCRT140.DLL" pandas\_libs\window ls dist twine check dist/* popd From d1a8ea62f3965327793ddb7e1e1a3c2d26589543 Mon Sep 17 00:00:00 2001 From: Chris Bartak Date: Thu, 2 Apr 2020 16:31:21 -0500 Subject: [PATCH 2/8] bash not cmd.exe --- azure/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 2b117ae..6675564 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -71,8 +71,8 @@ jobs: pushd pandas python setup.py build python setup.py bdist_wheel - copy /Y /B "C:\windows\system32\MSVCP140.DLL" pandas\_libs\window - copy /Y /B "C:\windows\system32\CONCRT140.DLL" pandas\_libs\window + cp /mnt/c/windows/system32/MSVCP140.DLL pandas\_libs\window + cp /mnt/c/windows/system32/CONCRT140.DLL pandas\_libs\window ls dist twine check dist/* popd From 7c3ee9f93d4ae651b100b1efc6fb55ef3a0742dc Mon Sep 17 00:00:00 2001 From: Chris Bartak Date: Tue, 28 Apr 2020 15:20:38 -0500 Subject: [PATCH 3/8] some debugging --- azure/windows.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/azure/windows.yml b/azure/windows.yml index 6675564..20c5596 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -71,6 +71,9 @@ jobs: pushd pandas python setup.py build python setup.py bdist_wheel + ls / + ls /mnt + ls /mnt/c/ cp /mnt/c/windows/system32/MSVCP140.DLL pandas\_libs\window cp /mnt/c/windows/system32/CONCRT140.DLL pandas\_libs\window ls dist From ff848e8c291544770aaaaa6f297928a3072aca18 Mon Sep 17 00:00:00 2001 From: Chris Bartak Date: Tue, 28 Apr 2020 15:30:14 -0500 Subject: [PATCH 4/8] try again --- azure/windows.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 20c5596..db960bb 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -71,9 +71,8 @@ jobs: pushd pandas python setup.py build python setup.py bdist_wheel - ls / - ls /mnt - ls /mnt/c/ + ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Tools\MSVC\14.16.27023\bin\HostX86\x64\" + ls /usr/ cp /mnt/c/windows/system32/MSVCP140.DLL pandas\_libs\window cp /mnt/c/windows/system32/CONCRT140.DLL pandas\_libs\window ls dist From 7a8071235375239ff924225c5e275c0fe9d35cfe Mon Sep 17 00:00:00 2001 From: Chris Bartak Date: Tue, 28 Apr 2020 15:57:32 -0500 Subject: [PATCH 5/8] forward slashes --- azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index db960bb..0529a93 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -71,7 +71,7 @@ jobs: pushd pandas python setup.py build python setup.py bdist_wheel - ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Tools\MSVC\14.16.27023\bin\HostX86\x64\" + ls "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Tools/MSVC/14.16.27023/bin/HostX86/x64/" ls /usr/ cp /mnt/c/windows/system32/MSVCP140.DLL pandas\_libs\window cp /mnt/c/windows/system32/CONCRT140.DLL pandas\_libs\window From ea4c849f44935092fe723d9723b9cc0226cf4efe Mon Sep 17 00:00:00 2001 From: Chris Bartak Date: Tue, 28 Apr 2020 16:12:12 -0500 Subject: [PATCH 6/8] try from redist directory --- azure-pipelines.yml | 3 +++ azure/windows.yml | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index efda4e2..f0de54a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -25,6 +25,7 @@ jobs: NP_BUILD_DEP: "1.13.3" py_3.6_64: PYTHON_VERSION: "3.6.x" + PYTHON_ARCH: "x64" NP_BUILD_DEP: "1.13.3" py_3.7_32: PYTHON_VERSION: "3.7.x" @@ -33,6 +34,7 @@ jobs: NIGHTLY_BUILD: "true" py_3.7_64: PYTHON_VERSION: "3.7.x" + PYTHON_ARCH: "x64" NP_BUILD_DEP: "1.14.5" NIGHTLY_BUILD: "true" py_3.8_32: @@ -42,6 +44,7 @@ jobs: NIGHTLY_BUILD: "true" py_3.8_64: PYTHON_VERSION: "3.8.x" + PYTHON_ARCH: "x64" NP_BUILD_DEP: "1.17.3" NIGHTLY_BUILD: "true" diff --git a/azure/windows.yml b/azure/windows.yml index 0529a93..447c583 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -71,10 +71,8 @@ jobs: pushd pandas python setup.py build python setup.py bdist_wheel - ls "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Tools/MSVC/14.16.27023/bin/HostX86/x64/" - ls /usr/ - cp /mnt/c/windows/system32/MSVCP140.DLL pandas\_libs\window - cp /mnt/c/windows/system32/CONCRT140.DLL pandas\_libs\window + cp "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Redist/MSVC/14.16.27023/$PYTHON_ARCH/Microsoft.VC142.CRT/msvcp140.dll" pandas/_libs/window + cp "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Redist/MSVC/14.16.27023/$PYTHON_ARCH/Microsoft.VC142.CRT/concrt140.dll" pandas/_libs/window ls dist twine check dist/* popd From 893d5aa0deaf9354742df943f5078560a64073dd Mon Sep 17 00:00:00 2001 From: Chris Bartak Date: Tue, 28 Apr 2020 16:34:38 -0500 Subject: [PATCH 7/8] back to ls --- azure/windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure/windows.yml b/azure/windows.yml index 447c583..2b4e651 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -71,6 +71,7 @@ jobs: pushd pandas python setup.py build python setup.py bdist_wheel + ls -R "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC" cp "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Redist/MSVC/14.16.27023/$PYTHON_ARCH/Microsoft.VC142.CRT/msvcp140.dll" pandas/_libs/window cp "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Redist/MSVC/14.16.27023/$PYTHON_ARCH/Microsoft.VC142.CRT/concrt140.dll" pandas/_libs/window ls dist From 59b5d8cbff460db17e06be68e38cc06ffd3adef1 Mon Sep 17 00:00:00 2001 From: Chris Bartak Date: Tue, 28 Apr 2020 16:45:08 -0500 Subject: [PATCH 8/8] different vs --- azure/windows.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 2b4e651..b02d84e 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -71,9 +71,8 @@ jobs: pushd pandas python setup.py build python setup.py bdist_wheel - ls -R "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC" - cp "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Redist/MSVC/14.16.27023/$PYTHON_ARCH/Microsoft.VC142.CRT/msvcp140.dll" pandas/_libs/window - cp "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Redist/MSVC/14.16.27023/$PYTHON_ARCH/Microsoft.VC142.CRT/concrt140.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/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 ls dist twine check dist/* popd