From a952b8e5d7cf049323dddb3a785e3bf2632fee65 Mon Sep 17 00:00:00 2001 From: jeremie du boisberranger Date: Fri, 28 Feb 2020 13:47:35 +0100 Subject: [PATCH 1/5] tst release branch --- .gitmodules | 2 +- azure/posix.yml | 2 +- azure/windows.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index e00dfbb9..13a7a85d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "scikit-learn"] path = scikit-learn - url = git://github.com/scikit-learn/scikit-learn.git + url = git://github.com/jeremiedbb/scikit-learn.git [submodule "multibuild"] path = multibuild url = https://github.com/matthew-brett/multibuild.git diff --git a/azure/posix.yml b/azure/posix.yml index 6e28200c..971d96f4 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -9,7 +9,7 @@ jobs: vmImage: ${{ parameters.vmImage }} variables: REPO_DIR: "scikit-learn" - BUILD_COMMIT: "0.22.1" + BUILD_COMMIT: "0.22.1-release-branch" PLAT: "x86_64" NP_BUILD_DEP: "numpy==1.11.0" CYTHON_BUILD_DEP: "cython==0.29.14" diff --git a/azure/windows.yml b/azure/windows.yml index fe65c36a..508f6d08 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -8,7 +8,7 @@ jobs: pool: vmImage: ${{ parameters.vmImage }} variables: - BUILD_COMMIT: "0.22.1" + BUILD_COMMIT: "0.22.1-release-branch" SKLEARN_SKIP_NETWORK_TESTS: "1" NP_BUILD_DEP: "1.11.0" CYTHON_BUILD_DEP: "0.29.14" From b951a5651155cafaaa3d9e673ad795b782a64f48 Mon Sep 17 00:00:00 2001 From: jeremie du boisberranger Date: Fri, 28 Feb 2020 13:53:39 +0100 Subject: [PATCH 2/5] 0.22.2 ... --- azure/posix.yml | 2 +- azure/windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 971d96f4..c75c9bb3 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -9,7 +9,7 @@ jobs: vmImage: ${{ parameters.vmImage }} variables: REPO_DIR: "scikit-learn" - BUILD_COMMIT: "0.22.1-release-branch" + BUILD_COMMIT: "0.22.2-release-branch" PLAT: "x86_64" NP_BUILD_DEP: "numpy==1.11.0" CYTHON_BUILD_DEP: "cython==0.29.14" diff --git a/azure/windows.yml b/azure/windows.yml index 508f6d08..25712452 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -8,7 +8,7 @@ jobs: pool: vmImage: ${{ parameters.vmImage }} variables: - BUILD_COMMIT: "0.22.1-release-branch" + BUILD_COMMIT: "0.22.2-release-branch" SKLEARN_SKIP_NETWORK_TESTS: "1" NP_BUILD_DEP: "1.11.0" CYTHON_BUILD_DEP: "0.29.14" From b86c0d5b2603b40806019fe6d52cf4aac20b95d0 Mon Sep 17 00:00:00 2001 From: jeremie du boisberranger Date: Fri, 28 Feb 2020 16:39:28 +0100 Subject: [PATCH 3/5] re trigger ci with latest changes on the release branch From 3e73bd09a16878c9cd0b1bfb602715dfb9c9bbf5 Mon Sep 17 00:00:00 2001 From: jeremie du boisberranger Date: Fri, 28 Feb 2020 17:59:24 +0100 Subject: [PATCH 4/5] point to 0.22.2 --- .gitmodules | 2 +- azure/posix.yml | 2 +- azure/windows.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 13a7a85d..e00dfbb9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "scikit-learn"] path = scikit-learn - url = git://github.com/jeremiedbb/scikit-learn.git + url = git://github.com/scikit-learn/scikit-learn.git [submodule "multibuild"] path = multibuild url = https://github.com/matthew-brett/multibuild.git diff --git a/azure/posix.yml b/azure/posix.yml index c75c9bb3..6bd50b62 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -9,7 +9,7 @@ jobs: vmImage: ${{ parameters.vmImage }} variables: REPO_DIR: "scikit-learn" - BUILD_COMMIT: "0.22.2-release-branch" + BUILD_COMMIT: "0.22.2" PLAT: "x86_64" NP_BUILD_DEP: "numpy==1.11.0" CYTHON_BUILD_DEP: "cython==0.29.14" diff --git a/azure/windows.yml b/azure/windows.yml index 25712452..ef834454 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -8,7 +8,7 @@ jobs: pool: vmImage: ${{ parameters.vmImage }} variables: - BUILD_COMMIT: "0.22.2-release-branch" + BUILD_COMMIT: "0.22.2" SKLEARN_SKIP_NETWORK_TESTS: "1" NP_BUILD_DEP: "1.11.0" CYTHON_BUILD_DEP: "0.29.14" From f8e7b757db564309571024664f7c144b40632dbd Mon Sep 17 00:00:00 2001 From: jeremie du boisberranger Date: Fri, 28 Feb 2020 18:20:43 +0100 Subject: [PATCH 5/5] re trigger build with correct 0.22.2 tag