From 9b4b705d61ccce23038b0204349362b1b7445493 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Sat, 10 Jul 2021 11:12:05 -0700 Subject: [PATCH 1/9] CI: Bump VM Image Versions in Azure --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 44f69a1..c90e0ba 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.7_32: PYTHON_VERSION: "3.7" @@ -91,7 +91,7 @@ jobs: - template: azure/posix.yml parameters: name: macOS - vmImage: macOS-10.14 + vmImage: macOS-10.15 matrix: py_3.7_64: MB_PYTHON_VERSION: "3.7" From 3bcd1a77b873da0430d31a1b72f1a522231fe814 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Sat, 10 Jul 2021 11:31:57 -0700 Subject: [PATCH 2/9] Revert windows changes --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c90e0ba..b555ebc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,7 +17,7 @@ jobs: - template: azure/windows.yml parameters: name: windows - vmImage: windows-2019 + vmImage: vs2017-win2016 matrix: py_3.7_32: PYTHON_VERSION: "3.7" From f7a7ac89314f41b94731a99a4e14a1a30792d1cc Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 12 Jul 2021 08:47:31 -0700 Subject: [PATCH 3/9] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b555ebc..c90e0ba 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.7_32: PYTHON_VERSION: "3.7" From 2f099263c46df3a2382a6e803749956f310176a5 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 12 Jul 2021 09:00:20 -0700 Subject: [PATCH 4/9] Update windows.yml --- azure/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index c12c1a5..5a86380 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -68,8 +68,8 @@ 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/16.10.31410/$PYTHON_ARCH/Microsoft.VC141.CRT/msvcp140.dll" pandas/_libs/window + cp "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/16.10.31410/$PYTHON_ARCH/Microsoft.VC141.CRT/concrt140.dll" pandas/_libs/window python setup.py build python setup.py bdist_wheel ls dist From 68bf26669ce121562cae118b3e66369b9702b13d Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 12 Jul 2021 09:23:46 -0700 Subject: [PATCH 5/9] Update windows.yml --- azure/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 5a86380..6f62697 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -68,8 +68,8 @@ 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/2019/Enterprise/VC/Redist/MSVC/16.10.31410/$PYTHON_ARCH/Microsoft.VC141.CRT/msvcp140.dll" pandas/_libs/window - cp "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/16.10.31410/$PYTHON_ARCH/Microsoft.VC141.CRT/concrt140.dll" pandas/_libs/window + cp "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/14.24.28127/$PYTHON_ARCH/Microsoft.VC141.CRT/msvcp140.dll" pandas/_libs/window + cp "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/14.24.28127/$PYTHON_ARCH/Microsoft.VC141.CRT/concrt140.dll" pandas/_libs/window python setup.py build python setup.py bdist_wheel ls dist From c664264834ccb9d02299bf7566da8c350cb8b526 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 12 Jul 2021 09:27:42 -0700 Subject: [PATCH 6/9] Debug --- azure/windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure/windows.yml b/azure/windows.yml index 6f62697..ef3a96d 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -68,6 +68,7 @@ jobs: pip install --timeout=60 $TEST_DEPENDS Cython==$CYTHON_BUILD_DEP pip install twine wheel pushd pandas + ls "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/" cp "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/14.24.28127/$PYTHON_ARCH/Microsoft.VC141.CRT/msvcp140.dll" pandas/_libs/window cp "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/14.24.28127/$PYTHON_ARCH/Microsoft.VC141.CRT/concrt140.dll" pandas/_libs/window python setup.py build From 8802c55429017fc462282ab7df389eec644d6b75 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 12 Jul 2021 09:33:20 -0700 Subject: [PATCH 7/9] Update windows.yml --- azure/windows.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index ef3a96d..86cada6 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -68,9 +68,8 @@ jobs: pip install --timeout=60 $TEST_DEPENDS Cython==$CYTHON_BUILD_DEP pip install twine wheel pushd pandas - ls "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/" - cp "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/14.24.28127/$PYTHON_ARCH/Microsoft.VC141.CRT/msvcp140.dll" pandas/_libs/window - cp "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/14.24.28127/$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.30036/$PYTHON_ARCH/Microsoft.VC141.CRT/msvcp140.dll" pandas/_libs/window + cp "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/14.29.30036/$PYTHON_ARCH/Microsoft.VC141.CRT/concrt140.dll" pandas/_libs/window python setup.py build python setup.py bdist_wheel ls dist From cf3848f3c3b64068fdbb74a83a5ddc5fe7955dfb Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 12 Jul 2021 09:36:44 -0700 Subject: [PATCH 8/9] Update windows.yml --- azure/windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure/windows.yml b/azure/windows.yml index 86cada6..182a715 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -68,6 +68,7 @@ jobs: pip install --timeout=60 $TEST_DEPENDS Cython==$CYTHON_BUILD_DEP pip install twine wheel pushd pandas + ls "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/14.29.30036/x86/" cp "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/14.29.30036/$PYTHON_ARCH/Microsoft.VC141.CRT/msvcp140.dll" pandas/_libs/window cp "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/14.29.30036/$PYTHON_ARCH/Microsoft.VC141.CRT/concrt140.dll" pandas/_libs/window python setup.py build From e777cef1fc6d2f0ec854533366ff92d18877280a Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 12 Jul 2021 09:42:08 -0700 Subject: [PATCH 9/9] Update windows.yml --- azure/windows.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 182a715..ac219af 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -68,9 +68,8 @@ jobs: pip install --timeout=60 $TEST_DEPENDS Cython==$CYTHON_BUILD_DEP pip install twine wheel pushd pandas - ls "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/14.29.30036/x86/" - cp "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/14.29.30036/$PYTHON_ARCH/Microsoft.VC141.CRT/msvcp140.dll" pandas/_libs/window - cp "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/14.29.30036/$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.30036/$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.30036/$PYTHON_ARCH/Microsoft.VC142.CRT/concrt140.dll" pandas/_libs/window python setup.py build python setup.py bdist_wheel ls dist