From a6598900913ce1358a2fce81184355c151537b5c Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 23 Aug 2022 07:39:39 -0700 Subject: [PATCH 01/22] BLD: Python 3.11 manylinux wheels --- .travis.yml | 7 +++++++ azure-pipelines.yml | 5 +++++ azure/posix.yml | 1 + 3 files changed, 13 insertions(+) diff --git a/.travis.yml b/.travis.yml index 63b1e32..e7ae6bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,6 +39,13 @@ jobs: - NP_TEST_DEP="numpy==1.21.2" # Xenial is EOL and the pip there doesn't support python 3.10 - DOCKER_TEST_IMAGE="multibuild/focal_arm64v8" + - os: linux + env: + - MB_PYTHON_VERSION="3.11" + - NP_BUILD_DEP="numpy==1.23.2" + - NP_TEST_DEP="numpy==1.23.2" + # Xenial is EOL and the pip there doesn't support python 3.10 + - DOCKER_TEST_IMAGE="multibuild/focal_arm64v8" before_install: # See: # https://github.com/travis-ci/travis-ci/issues/8920#issuecomment-352661024 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 600cc66..fd3bf73 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -44,6 +44,11 @@ jobs: PYTHON_ARCH: "x64" NP_BUILD_DEP: "1.21.3" NIGHTLY_BUILD: "true" + py_3.11_64: + PYTHON_VERSION: "3.11" + PYTHON_ARCH: "x64" + NP_BUILD_DEP: "1.23.2" + NIGHTLY_BUILD: "true" - template: azure/posix.yml parameters: diff --git a/azure/posix.yml b/azure/posix.yml index 1596669..8cff4dd 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -29,6 +29,7 @@ jobs: inputs: versionSpec: $(MB_PYTHON_VERSION) displayName: Set python version + condition: not(eq(variables['MB_PYTHON_VERSION'], '3.11')) - bash: | set -e From dd998950834451dae0cf8dd2ec982a026027161c Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 23 Aug 2022 07:42:55 -0700 Subject: [PATCH 02/22] fix --- azure-pipelines.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fd3bf73..4702ccf 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -44,11 +44,6 @@ jobs: PYTHON_ARCH: "x64" NP_BUILD_DEP: "1.21.3" NIGHTLY_BUILD: "true" - py_3.11_64: - PYTHON_VERSION: "3.11" - PYTHON_ARCH: "x64" - NP_BUILD_DEP: "1.23.2" - NIGHTLY_BUILD: "true" - template: azure/posix.yml parameters: @@ -71,7 +66,11 @@ jobs: NP_BUILD_DEP: "numpy==1.21.2" DOCKER_TEST_IMAGE: "multibuild/focal_{PLAT}" NIGHTLY_BUILD: "true" - + py_3.11_64: + PYTHON_VERSION: "3.11" + PYTHON_ARCH: "x64" + NP_BUILD_DEP: "1.23.2" + NIGHTLY_BUILD: "true" - template: azure/posix.yml parameters: From c972c71101defad86d7a6e8fd4265ad53c32c87c Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 23 Aug 2022 07:45:18 -0700 Subject: [PATCH 03/22] actually fix? --- azure-pipelines.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4702ccf..2b8c174 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -67,9 +67,10 @@ jobs: DOCKER_TEST_IMAGE: "multibuild/focal_{PLAT}" NIGHTLY_BUILD: "true" py_3.11_64: - PYTHON_VERSION: "3.11" - PYTHON_ARCH: "x64" + MB_PYTHON_VERSION: "3.11" + MB_ML_VER: "2014" NP_BUILD_DEP: "1.23.2" + DOCKER_TEST_IMAGE: "multibuild/focal_{PLAT}" NIGHTLY_BUILD: "true" - template: azure/posix.yml From c74b573a4315e1a11c236c606b31a9a927b7bc37 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 23 Aug 2022 08:15:26 -0700 Subject: [PATCH 04/22] 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 2b8c174..aa7d9de 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -69,7 +69,7 @@ jobs: py_3.11_64: MB_PYTHON_VERSION: "3.11" MB_ML_VER: "2014" - NP_BUILD_DEP: "1.23.2" + NP_BUILD_DEP: "numpy==1.23.2" DOCKER_TEST_IMAGE: "multibuild/focal_{PLAT}" NIGHTLY_BUILD: "true" From 6b1328cec087259b61487771068f1a75993dc423 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 23 Aug 2022 18:10:35 -0700 Subject: [PATCH 05/22] bump multibuild --- multibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multibuild b/multibuild index 041625d..85467f2 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit 041625d47880e11ae3d2333874027e749b35fa72 +Subproject commit 85467f2c27ce82519ba763932e0d94d1b43edbf5 From 7aaf2537e56ecbba623b628178c903e6b85d9a59 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 29 Aug 2022 09:39:29 -0400 Subject: [PATCH 06/22] BLD: try adding Windows/Macos Python 3.11 builds (#5) --- azure-pipelines.yml | 15 +++++++++++++++ azure/posix.yml | 1 + azure/windows.yml | 1 + 3 files changed, 17 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index aa7d9de..1e8ad02 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -44,6 +44,11 @@ jobs: PYTHON_ARCH: "x64" NP_BUILD_DEP: "1.21.3" NIGHTLY_BUILD: "true" + py_3.11_64: + PYTHON_VERSION: "3.11-dev" + PYTHON_ARCH: "x64" + NP_BUILD_DEP: "1.23.2" + NIGHTLY_BUILD: "true" - template: azure/posix.yml parameters: @@ -106,3 +111,13 @@ jobs: PLAT: universal2 NP_BUILD_DEP: "numpy==1.21.3" NIGHTLY_BUILD: "true" + py_3.11_64: + MB_PYTHON_VERSION: "3.11-dev" + PLAT: "x86_64" + NP_BUILD_DEP: "numpy==1.23.2" + NIGHTLY_BUILD: "true" + py_3.11_universal2: + MB_PYTHON_VERSION: "3.11-dev" + PLAT: universal2 + NP_BUILD_DEP: "numpy==1.23.2" + NIGHTLY_BUILD: "true" diff --git a/azure/posix.yml b/azure/posix.yml index 1e1d56c..f82e58a 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -28,6 +28,7 @@ jobs: - task: UsePythonVersion@0 inputs: versionSpec: $(MB_PYTHON_VERSION) + allowUnstable: true displayName: Set python version condition: not(eq(variables['MB_PYTHON_VERSION'], '3.11')) diff --git a/azure/windows.yml b/azure/windows.yml index edd44b7..a349a49 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -27,6 +27,7 @@ jobs: inputs: versionSpec: $(PYTHON_VERSION) architecture: $(PYTHON_ARCH) + allowUnstable: true displayName: Set python version - bash: | From a0d90f69c9ce40e1fb7bc7ab15214975a202504c Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 29 Aug 2022 11:32:17 -0400 Subject: [PATCH 07/22] update dll script? --- azure-pipelines.yml | 2 +- azure/windows.yml | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1e8ad02..a47ce0b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -72,7 +72,7 @@ jobs: DOCKER_TEST_IMAGE: "multibuild/focal_{PLAT}" NIGHTLY_BUILD: "true" py_3.11_64: - MB_PYTHON_VERSION: "3.11" + MB_PYTHON_VERSION: "3.11-dev" MB_ML_VER: "2014" NP_BUILD_DEP: "numpy==1.23.2" DOCKER_TEST_IMAGE: "multibuild/focal_{PLAT}" diff --git a/azure/windows.yml b/azure/windows.yml index a349a49..4832405 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -93,8 +93,12 @@ jobs: condition: eq(variables['SKIP_BUILD'], 'false') - script: | + if ($(PYTHON_VERSION) -contains "-dev") { + # Strip out the dev suffix + $Env:PYTHON_VERSION = $(PYTHON_VERSION).Split("-") + } docker pull python:$(PYTHON_VERSION)-windowsservercore - docker run -v %cd%:c:\pandas python:$(PYTHON_VERSION)-windowsservercore /pandas/check_windows_dlls.bat + & "docker run -v %cd%:c:\pandas python:$Env: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')) From 55861fae15c3b46f9a499ebe68274ef909f731ab Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 29 Aug 2022 11:39:31 -0400 Subject: [PATCH 08/22] revert linux changes --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a47ce0b..1e8ad02 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -72,7 +72,7 @@ jobs: DOCKER_TEST_IMAGE: "multibuild/focal_{PLAT}" NIGHTLY_BUILD: "true" py_3.11_64: - MB_PYTHON_VERSION: "3.11-dev" + MB_PYTHON_VERSION: "3.11" MB_ML_VER: "2014" NP_BUILD_DEP: "numpy==1.23.2" DOCKER_TEST_IMAGE: "multibuild/focal_{PLAT}" From f5599cf0e23b4b19db7803911eb348f784457b05 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 29 Aug 2022 12:22:52 -0400 Subject: [PATCH 09/22] Update windows.yml --- azure/windows.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 4832405..cac0697 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -16,6 +16,7 @@ jobs: PYTHON_ARCH: "x64" TEST_DEPENDS: "pytest pytest-xdist hypothesis==6.52.1" TEST_DIR: '$(Agent.WorkFolder)/tmp_for_test' + STRIPPED_PYTHON_VERSION: $[replace(variables['PYTHON_VERSION'], '-dev', '')] strategy: matrix: ${{ insert }}: ${{ parameters.matrix }} @@ -93,12 +94,8 @@ jobs: condition: eq(variables['SKIP_BUILD'], 'false') - script: | - if ($(PYTHON_VERSION) -contains "-dev") { - # Strip out the dev suffix - $Env:PYTHON_VERSION = $(PYTHON_VERSION).Split("-") - } - docker pull python:$(PYTHON_VERSION)-windowsservercore - & "docker run -v %cd%:c:\pandas python:$Env:PYTHON_VERSION-windowsservercore /pandas/check_windows_dlls.bat" + docker pull python:$(STRIPPED_PYTHON_VERSION)-windowsservercore + docker run -v %cd%:c:\pandas python:$(STRIPPED_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')) From 4df4d8675029cd05a45dd0eda18e51fc7f30d758 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 29 Aug 2022 13:01:45 -0400 Subject: [PATCH 10/22] update? --- azure/windows.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index cac0697..1595a53 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -94,8 +94,9 @@ jobs: condition: eq(variables['SKIP_BUILD'], 'false') - script: | - docker pull python:$(STRIPPED_PYTHON_VERSION)-windowsservercore - docker run -v %cd%:c:\pandas python:$(STRIPPED_PYTHON_VERSION)-windowsservercore /pandas/check_windows_dlls.bat + echo '$[variables.STRIPPED_PYTHON_VERSION]' + docker pull python:$[variables.STRIPPED_PYTHON_VERSION]-windowsservercore + docker run -v %cd%:c:\pandas python:$[variables.STRIPPED_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')) From 99539c8b7dee4f0aa51d2ed9562739a145c1c71f Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 29 Aug 2022 13:37:54 -0400 Subject: [PATCH 11/22] Update windows.yml --- azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index 1595a53..e77715d 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -94,7 +94,7 @@ jobs: condition: eq(variables['SKIP_BUILD'], 'false') - script: | - echo '$[variables.STRIPPED_PYTHON_VERSION]' + echo $[variables.STRIPPED_PYTHON_VERSION] docker pull python:$[variables.STRIPPED_PYTHON_VERSION]-windowsservercore docker run -v %cd%:c:\pandas python:$[variables.STRIPPED_PYTHON_VERSION]-windowsservercore /pandas/check_windows_dlls.bat displayName: Ensure wheel imports correctly From d5866c11e23f65c00599d0b08f4d26e56d5810a6 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 29 Aug 2022 16:37:04 -0400 Subject: [PATCH 12/22] Update windows.yml --- azure/windows.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index e77715d..3528658 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -94,9 +94,9 @@ jobs: condition: eq(variables['SKIP_BUILD'], 'false') - script: | - echo $[variables.STRIPPED_PYTHON_VERSION] - docker pull python:$[variables.STRIPPED_PYTHON_VERSION]-windowsservercore - docker run -v %cd%:c:\pandas python:$[variables.STRIPPED_PYTHON_VERSION]-windowsservercore /pandas/check_windows_dlls.bat + echo $(STRIPPED_PYTHON_VERSION) + docker pull python:$(STRIPPED_PYTHON_VERSION)-windowsservercore + docker run -v %cd%:c:\pandas python:$(STRIPPED_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')) From b86357913b197cb7e461186b6e4b38deeed22c3b Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 29 Aug 2022 18:55:19 -0400 Subject: [PATCH 13/22] try templates? --- azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index 3528658..9f82cf5 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -16,7 +16,7 @@ jobs: PYTHON_ARCH: "x64" TEST_DEPENDS: "pytest pytest-xdist hypothesis==6.52.1" TEST_DIR: '$(Agent.WorkFolder)/tmp_for_test' - STRIPPED_PYTHON_VERSION: $[replace(variables['PYTHON_VERSION'], '-dev', '')] + STRIPPED_PYTHON_VERSION: ${{ replace(variables['PYTHON_VERSION'], '-dev', '') }} strategy: matrix: ${{ insert }}: ${{ parameters.matrix }} From 2d2fa5ba6be570a2e149ef5c4866a64a5d01c053 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 29 Aug 2022 20:30:02 -0400 Subject: [PATCH 14/22] try setting from bash --- azure/windows.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 9f82cf5..0dddc40 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -16,7 +16,6 @@ jobs: PYTHON_ARCH: "x64" TEST_DEPENDS: "pytest pytest-xdist hypothesis==6.52.1" TEST_DIR: '$(Agent.WorkFolder)/tmp_for_test' - STRIPPED_PYTHON_VERSION: ${{ replace(variables['PYTHON_VERSION'], '-dev', '') }} strategy: matrix: ${{ insert }}: ${{ parameters.matrix }} @@ -93,10 +92,16 @@ jobs: displayName: Install wheel and test condition: eq(variables['SKIP_BUILD'], 'false') + - bash: + if [[ $string == *"-dev"* ]]; then + stripped_ver=$(echo $(PYTHON_VERSION) | sed -e "s/-dev//") + echo "##vso[task.setvariable variable=PYTHON_VERSION]$stripped_ver" + fi + displayName: Strip dev postfix PYTHON_VERSION for pre-releases + - script: | - echo $(STRIPPED_PYTHON_VERSION) - docker pull python:$(STRIPPED_PYTHON_VERSION)-windowsservercore - docker run -v %cd%:c:\pandas python:$(STRIPPED_PYTHON_VERSION])-windowsservercore /pandas/check_windows_dlls.bat + 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')) From 40f762eaa1ec5b2f4692b49cf72d47517f9ac753 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 29 Aug 2022 21:07:12 -0400 Subject: [PATCH 15/22] Update windows.yml --- azure/windows.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index 0dddc40..ac785d5 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -92,12 +92,13 @@ jobs: displayName: Install wheel and test condition: eq(variables['SKIP_BUILD'], 'false') - - bash: + - bash: | if [[ $string == *"-dev"* ]]; then stripped_ver=$(echo $(PYTHON_VERSION) | sed -e "s/-dev//") echo "##vso[task.setvariable variable=PYTHON_VERSION]$stripped_ver" fi displayName: Strip dev postfix PYTHON_VERSION for pre-releases + condition: eq(variables['SKIP_BUILD'], 'false') - script: | docker pull python:$(PYTHON_VERSION)-windowsservercore From bcc6e627897322d950d4a20fac39711a54f8f3ff Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 29 Aug 2022 21:41:17 -0400 Subject: [PATCH 16/22] debug more --- azure/windows.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index ac785d5..c839fb7 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -95,6 +95,7 @@ jobs: - bash: | if [[ $string == *"-dev"* ]]; then stripped_ver=$(echo $(PYTHON_VERSION) | sed -e "s/-dev//") + echo $stripped_ver echo "##vso[task.setvariable variable=PYTHON_VERSION]$stripped_ver" fi displayName: Strip dev postfix PYTHON_VERSION for pre-releases @@ -102,7 +103,7 @@ jobs: - script: | docker pull python:$(PYTHON_VERSION)-windowsservercore - docker run -v %cd%:c:\pandas python:$(PYTHON_VERSION])-windowsservercore /pandas/check_windows_dlls.bat + 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')) From ead6b39ef71c4d361e2acef07bcd6d3a1c89420c Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 30 Aug 2022 06:09:04 -0400 Subject: [PATCH 17/22] maybe test something? --- azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index c839fb7..f835828 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -94,7 +94,7 @@ jobs: - bash: | if [[ $string == *"-dev"* ]]; then - stripped_ver=$(echo $(PYTHON_VERSION) | sed -e "s/-dev//") + stripped_ver=$(echo $PYTHON_VERSION | sed -e "s/-dev//") echo $stripped_ver echo "##vso[task.setvariable variable=PYTHON_VERSION]$stripped_ver" fi From 9631f69623c684d64adcbc7fe0048c3bc34c23b7 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 30 Aug 2022 08:46:05 -0400 Subject: [PATCH 18/22] actually fix --- azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index f835828..7c9ed73 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -93,7 +93,7 @@ jobs: condition: eq(variables['SKIP_BUILD'], 'false') - bash: | - if [[ $string == *"-dev"* ]]; then + if [[ $PYTHON_VERSION == *"-dev"* ]]; then stripped_ver=$(echo $PYTHON_VERSION | sed -e "s/-dev//") echo $stripped_ver echo "##vso[task.setvariable variable=PYTHON_VERSION]$stripped_ver" From 856824947232f12c846bd4d2999141b6ed4669f3 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 30 Aug 2022 09:24:58 -0400 Subject: [PATCH 19/22] don't modify readonly variable --- azure/windows.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 7c9ed73..31e8d8c 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -95,15 +95,14 @@ jobs: - bash: | if [[ $PYTHON_VERSION == *"-dev"* ]]; then stripped_ver=$(echo $PYTHON_VERSION | sed -e "s/-dev//") - echo $stripped_ver - echo "##vso[task.setvariable variable=PYTHON_VERSION]$stripped_ver" + echo "##vso[task.setvariable variable=STRIPPED_PYTHON_VERSION]$stripped_ver" fi - displayName: Strip dev postfix PYTHON_VERSION for pre-releases + displayName: Strip dev postfix from PYTHON_VERSION for pre-releases 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 + docker pull python:$(STRIPPED_PYTHON_VERSION)-windowsservercore + docker run -v %cd%:c:\pandas python:$(STRIPPED_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')) From e1acac99d69a7b881304fef37c55f251e19441b0 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 30 Aug 2022 10:10:11 -0400 Subject: [PATCH 20/22] adjustments --- azure/windows.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index 31e8d8c..372c166 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -94,8 +94,11 @@ jobs: - bash: | if [[ $PYTHON_VERSION == *"-dev"* ]]; then - stripped_ver=$(echo $PYTHON_VERSION | sed -e "s/-dev//") + stripped_ver=$(echo $PYTHON_VERSION | sed -e "s/dev/rc/g") + echo $stripped_ver echo "##vso[task.setvariable variable=STRIPPED_PYTHON_VERSION]$stripped_ver" + else + echo "##vso[task.setvariable variable=STRIPPED_PYTHON_VERSION]$PYTHON_VERSION" fi displayName: Strip dev postfix from PYTHON_VERSION for pre-releases condition: eq(variables['SKIP_BUILD'], 'false') From 3835e2e7b494d47e8bdc2d2ed947de8a497e1f48 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 30 Aug 2022 19:25:33 -0400 Subject: [PATCH 21/22] try setting mb_python_osx_ver (#6) --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1e8ad02..13315be 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -116,8 +116,10 @@ jobs: PLAT: "x86_64" NP_BUILD_DEP: "numpy==1.23.2" NIGHTLY_BUILD: "true" + MB_PYTHON_OSX_VER: 10.9 py_3.11_universal2: MB_PYTHON_VERSION: "3.11-dev" PLAT: universal2 NP_BUILD_DEP: "numpy==1.23.2" NIGHTLY_BUILD: "true" + MB_PYTHON_OSX_VER: 10.9 From cbe7387b6cbb6219dd6ec3b8a99d6aee17654945 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Wed, 31 Aug 2022 07:14:45 -0400 Subject: [PATCH 22/22] bump pandas version to 1.5.x --- .travis.yml | 2 +- azure/posix.yml | 2 +- azure/windows.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index cea58e3..0b456b4 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.5.0rc0" + - BUILD_COMMIT="v1.5.x" - UNICODE_WIDTH=32 - PLAT=aarch64 - NP_BUILD_DEP="numpy==1.17.3" diff --git a/azure/posix.yml b/azure/posix.yml index f82e58a..e2a0740 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -9,7 +9,7 @@ jobs: vmImage: ${{ parameters.vmImage }} variables: REPO_DIR: "pandas" - BUILD_COMMIT: "v1.5.0rc0" + BUILD_COMMIT: "v1.5.x" PLAT: "x86_64" NP_BUILD_DEP: "numpy==1.17.3" CYTHON_BUILD_DEP: "cython==0.29.32" diff --git a/azure/windows.yml b/azure/windows.yml index 372c166..8f9b517 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -8,7 +8,7 @@ jobs: pool: vmImage: ${{ parameters.vmImage }} variables: - BUILD_COMMIT: "v1.5.0rc0" + BUILD_COMMIT: "v1.5.x" NP_BUILD_DEP: "1.17.3" CYTHON_BUILD_DEP: "0.29.32" NIGHTLY_BUILD_COMMIT: "main"