From e9119f3b42bac3aed16f0a2abd38266f59f3d771 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Wed, 17 Nov 2021 18:13:00 -0800 Subject: [PATCH 1/3] Update submodules --- .gitmodules | 4 ++-- multibuild | 2 +- pandas | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index d8ad0c4..997fab9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "pandas"] path = pandas - url = git://github.com/pydata/pandas.git + url = git://github.com/pandas-dev/pandas.git [submodule "multibuild"] path = multibuild - url = https://github.com/matthew-brett/multibuild.git + url = https://github.com/multi-build/multibuild.git diff --git a/multibuild b/multibuild index 7684e52..041625d 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit 7684e52bcb023d511c4f17b638d497203f218a68 +Subproject commit 041625d47880e11ae3d2333874027e749b35fa72 diff --git a/pandas b/pandas index 2243629..6240b1f 160000 --- a/pandas +++ b/pandas @@ -1 +1 @@ -Subproject commit 224362951942e1f4e05fb8948596620aedac26d9 +Subproject commit 6240b1f26780112fa54ddda25cd5aad27e31f32a From c6439efb9e2b998fd218e523dd523ab559b1662d Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Wed, 17 Nov 2021 18:16:09 -0800 Subject: [PATCH 2/3] Update azure-pipelines.yml --- azure-pipelines.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0334b7d..9477fc4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -126,6 +126,11 @@ jobs: NIGHTLY_BUILD: "true" py_3.10_64: MB_PYTHON_VERSION: "3.10" - PLAT: universal2 # No numpy x86_64 wheels on MacOS anymore + PLAT: "x86_64" + NP_BUILD_DEP: "numpy==1.21.3" + NIGHTLY_BUILD: "true" + py_3.10_64: + MB_PYTHON_VERSION: "3.10" + PLAT: universal2 NP_BUILD_DEP: "numpy==1.21.3" NIGHTLY_BUILD: "true" From a85e0fba61c7df24b41fcf4ad1d57ee3a4cab02d Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Wed, 17 Nov 2021 18:37:39 -0800 Subject: [PATCH 3/3] 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 9477fc4..fdec2ac 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -129,7 +129,7 @@ jobs: PLAT: "x86_64" NP_BUILD_DEP: "numpy==1.21.3" NIGHTLY_BUILD: "true" - py_3.10_64: + py_3.10_universal2: MB_PYTHON_VERSION: "3.10" PLAT: universal2 NP_BUILD_DEP: "numpy==1.21.3"