From 3c5c19b873d800a4a54a338740a0a43a7eaff771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Alfaro=20Jim=C3=A9nez?=
 <JuanCarlos.Alfaro@uclm.es>
Date: Tue, 23 Feb 2021 09:07:23 +0100
Subject: [PATCH 01/19] FIX Install anaconda-project before installing
 anaconda-client [cd build]

---
 .github/workflows/wheels.yml          | 2 +-
 build_tools/github/upload_anaconda.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index ffddf9ef88db3..f245f77f663e8 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -147,7 +147,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build_wheels, build_sdist]
     # The artifacts cannot be uploaded on PRs
-    if: github.event_name != 'pull_request'
+    # if: github.event_name != 'pull_request'
 
     steps:
       - name: Checkout scikit-learn
diff --git a/build_tools/github/upload_anaconda.sh b/build_tools/github/upload_anaconda.sh
index 7651576cf558e..ceb72caf1102e 100644
--- a/build_tools/github/upload_anaconda.sh
+++ b/build_tools/github/upload_anaconda.sh
@@ -11,6 +11,7 @@ else
     ANACONDA_TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN"
 fi
 
+pip install git+https://github.com/Anaconda-Platform/anaconda-project
 pip install git+https://github.com/Anaconda-Server/anaconda-client
 
 # Force a replacement if the remote file already exists

From eb701d7452972d8a7e46b0e014b96afd219e4544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Alfaro=20Jim=C3=A9nez?=
 <JuanCarlos.Alfaro@uclm.es>
Date: Tue, 23 Feb 2021 09:43:31 +0100
Subject: [PATCH 02/19] FIX Use conda install instead of pip install

---
 .travis.yml                           | 8 ++++----
 build_tools/github/upload_anaconda.sh | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1e6ed78d28ac2..1f061f801a7b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,7 @@ jobs:
     - python: 3.6
       os: linux
       arch: arm64
-      if: type = cron or commit_message =~ /\[cd build\]/
+      if: type = cron
       env:
         - BUILD_WHEEL=true
         - CIBW_BUILD=cp36-manylinux_aarch64
@@ -56,7 +56,7 @@ jobs:
     - python: 3.7
       os: linux
       arch: arm64
-      if: type = cron or commit_message =~ /\[cd build\]/
+      if: type = cron
       env:
         - BUILD_WHEEL=true
         - CIBW_BUILD=cp37-manylinux_aarch64
@@ -64,7 +64,7 @@ jobs:
     - python: 3.8
       os: linux
       arch: arm64
-      if: type = cron or commit_message =~ /\[cd build\]/
+      if: type = cron
       env:
         - BUILD_WHEEL=true
         - CIBW_BUILD=cp38-manylinux_aarch64
@@ -72,7 +72,7 @@ jobs:
     - python: 3.9
       os: linux
       arch: arm64
-      if: type = cron or commit_message =~ /\[cd build\]/
+      if: type = cron
       env:
         - BUILD_WHEEL=true
         - CIBW_BUILD=cp39-manylinux_aarch64
diff --git a/build_tools/github/upload_anaconda.sh b/build_tools/github/upload_anaconda.sh
index ceb72caf1102e..22ddba39906ff 100644
--- a/build_tools/github/upload_anaconda.sh
+++ b/build_tools/github/upload_anaconda.sh
@@ -11,8 +11,7 @@ else
     ANACONDA_TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN"
 fi
 
-pip install git+https://github.com/Anaconda-Platform/anaconda-project
-pip install git+https://github.com/Anaconda-Server/anaconda-client
+conda install anaconda-client
 
 # Force a replacement if the remote file already exists
 anaconda -t $ANACONDA_TOKEN upload --force -u $ANACONDA_ORG dist/artifact/*

From 31e7154b9faf613619c8dc29a3b2494dbc1734bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Alfaro=20Jim=C3=A9nez?=
 <JuanCarlos.Alfaro@uclm.es>
Date: Tue, 23 Feb 2021 09:44:01 +0100
Subject: [PATCH 03/19]  Trigger build [cd build]


From 1932a5c0432c599f6723578012f29a6cddd30f34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Alfaro=20Jim=C3=A9nez?=
 <JuanCarlos.Alfaro@uclm.es>
Date: Tue, 23 Feb 2021 09:45:29 +0100
Subject: [PATCH 04/19] Trigger build [cd build]


From c8d4c353b05b02e215386cd30865e107a83acff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Alfaro=20Jim=C3=A9nez?=
 <JuanCarlos.Alfaro@uclm.es>
Date: Tue, 23 Feb 2021 10:36:39 +0100
Subject: [PATCH 05/19] Revert [cd build]

---
 build_tools/github/upload_anaconda.sh | 3 ++-
 build_tools/travis/after_success.sh   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build_tools/github/upload_anaconda.sh b/build_tools/github/upload_anaconda.sh
index 22ddba39906ff..050d72f30c31b 100644
--- a/build_tools/github/upload_anaconda.sh
+++ b/build_tools/github/upload_anaconda.sh
@@ -11,7 +11,8 @@ else
     ANACONDA_TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN"
 fi
 
-conda install anaconda-client
+pip install git+https://github.com/Anaconda-Platform/anaconda-project
+pip install git+https://github.com/Anaconda-Platform/anaconda-client
 
 # Force a replacement if the remote file already exists
 anaconda -t $ANACONDA_TOKEN upload --force -u $ANACONDA_ORG dist/artifact/*
diff --git a/build_tools/travis/after_success.sh b/build_tools/travis/after_success.sh
index 2123f7efafc22..d42c03dbc16b0 100755
--- a/build_tools/travis/after_success.sh
+++ b/build_tools/travis/after_success.sh
@@ -18,7 +18,7 @@ if [[ $BUILD_WHEEL == true && $TRAVIS_EVENT_TYPE != pull_request ]]; then
         ANACONDA_TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN"
     fi
 
-    pip install git+https://github.com/Anaconda-Server/anaconda-client
+    pip install git+https://github.com/Anaconda-Platform/anaconda-client
 
     # Force a replacement if the remote file already exists
     anaconda -t $ANACONDA_TOKEN upload --force -u $ANACONDA_ORG wheelhouse/*.whl

From 06e3ad70771f3ff2dc79549476fb509e4f87bb74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Alfaro=20Jim=C3=A9nez?=
 <JuanCarlos.Alfaro@uclm.es>
Date: Tue, 23 Feb 2021 10:39:02 +0100
Subject: [PATCH 06/19] MNT Add in Travis [cd build]

---
 build_tools/travis/after_success.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build_tools/travis/after_success.sh b/build_tools/travis/after_success.sh
index d42c03dbc16b0..2f033695764fa 100755
--- a/build_tools/travis/after_success.sh
+++ b/build_tools/travis/after_success.sh
@@ -18,6 +18,7 @@ if [[ $BUILD_WHEEL == true && $TRAVIS_EVENT_TYPE != pull_request ]]; then
         ANACONDA_TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN"
     fi
 
+    pip install git+https://github.com/Anaconda-Platform/anaconda-project
     pip install git+https://github.com/Anaconda-Platform/anaconda-client
 
     # Force a replacement if the remote file already exists

From de542f5b8e9c98e4cd79706c8b59b6195da7b8fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Alfaro=20Jim=C3=A9nez?=
 <JuanCarlos.Alfaro@uclm.es>
Date: Tue, 23 Feb 2021 13:33:52 +0100
Subject: [PATCH 07/19] MNT Use conda instead of pip [cd build]

---
 build_tools/github/upload_anaconda.sh |  6 ++++--
 build_tools/travis/after_success.sh   | 11 +++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/build_tools/github/upload_anaconda.sh b/build_tools/github/upload_anaconda.sh
index 050d72f30c31b..0f62f4ffc4e32 100644
--- a/build_tools/github/upload_anaconda.sh
+++ b/build_tools/github/upload_anaconda.sh
@@ -11,8 +11,10 @@ else
     ANACONDA_TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN"
 fi
 
-pip install git+https://github.com/Anaconda-Platform/anaconda-project
-pip install git+https://github.com/Anaconda-Platform/anaconda-client
+export PATH=$CONDA/bin:$PATH
+conda create -n upload -y python
+source activate upload
+conda install -y anaconda-client
 
 # Force a replacement if the remote file already exists
 anaconda -t $ANACONDA_TOKEN upload --force -u $ANACONDA_ORG dist/artifact/*
diff --git a/build_tools/travis/after_success.sh b/build_tools/travis/after_success.sh
index 2f033695764fa..6974b9aa6d38e 100755
--- a/build_tools/travis/after_success.sh
+++ b/build_tools/travis/after_success.sh
@@ -18,8 +18,15 @@ if [[ $BUILD_WHEEL == true && $TRAVIS_EVENT_TYPE != pull_request ]]; then
         ANACONDA_TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN"
     fi
 
-    pip install git+https://github.com/Anaconda-Platform/anaconda-project
-    pip install git+https://github.com/Anaconda-Platform/anaconda-client
+    MINICONDA_URL="https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-aarch64.sh"
+    wget $MINICONDA_URL -O miniconda.sh
+    MINICONDA_PATH=$HOME/miniconda
+    chmod +x miniconda.sh && ./miniconda.sh -b -p $MINICONDA_PATH
+
+    export PATH=$MINICONDA_PATH/bin:$PATH
+    conda create -n upload -y python
+    source activate upload
+    conda install -y anaconda-client
 
     # Force a replacement if the remote file already exists
     anaconda -t $ANACONDA_TOKEN upload --force -u $ANACONDA_ORG wheelhouse/*.whl

From 127065a2588ca514efd9c73dc8abf5cd6fb26aa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Alfaro=20Jim=C3=A9nez?=
 <JuanCarlos.Alfaro@uclm.es>
Date: Tue, 23 Feb 2021 14:40:29 +0100
Subject: [PATCH 08/19] CLN Revert temporary changes

---
 .github/workflows/wheels.yml | 2 +-
 .travis.yml                  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index f245f77f663e8..ffddf9ef88db3 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -147,7 +147,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build_wheels, build_sdist]
     # The artifacts cannot be uploaded on PRs
-    # if: github.event_name != 'pull_request'
+    if: github.event_name != 'pull_request'
 
     steps:
       - name: Checkout scikit-learn
diff --git a/.travis.yml b/.travis.yml
index 1f061f801a7b9..1e6ed78d28ac2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,7 @@ jobs:
     - python: 3.6
       os: linux
       arch: arm64
-      if: type = cron
+      if: type = cron or commit_message =~ /\[cd build\]/
       env:
         - BUILD_WHEEL=true
         - CIBW_BUILD=cp36-manylinux_aarch64
@@ -56,7 +56,7 @@ jobs:
     - python: 3.7
       os: linux
       arch: arm64
-      if: type = cron
+      if: type = cron or commit_message =~ /\[cd build\]/
       env:
         - BUILD_WHEEL=true
         - CIBW_BUILD=cp37-manylinux_aarch64
@@ -64,7 +64,7 @@ jobs:
     - python: 3.8
       os: linux
       arch: arm64
-      if: type = cron
+      if: type = cron or commit_message =~ /\[cd build\]/
       env:
         - BUILD_WHEEL=true
         - CIBW_BUILD=cp38-manylinux_aarch64
@@ -72,7 +72,7 @@ jobs:
     - python: 3.9
       os: linux
       arch: arm64
-      if: type = cron
+      if: type = cron or commit_message =~ /\[cd build\]/
       env:
         - BUILD_WHEEL=true
         - CIBW_BUILD=cp39-manylinux_aarch64

From fb415a11f9c880407ff5e907f0c1852ef27841be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Alfaro=20Jim=C3=A9nez?=
 <JuanCarlos.Alfaro@uclm.es>
Date: Wed, 3 Mar 2021 11:12:22 +0100
Subject: [PATCH 09/19] MNT Test that the changes are working [cd build]

---
 .github/workflows/wheels.yml          | 9 +++++----
 build_tools/github/upload_anaconda.sh | 6 ++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index ffddf9ef88db3..0b432e2a8c490 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -8,12 +8,13 @@ on:
   push:
     branches:
       - main
+      - fix_anaconda_upload
       # Release branches
       - "[0-9]+.[0-9]+.X"
-  pull_request:
-    branches:
-      - main
-      - "[0-9]+.[0-9]+.X"
+  # pull_request:
+  #  branches:
+  #    - main
+  #    - "[0-9]+.[0-9]+.X"
   # Manual run
   workflow_dispatch:
 
diff --git a/build_tools/github/upload_anaconda.sh b/build_tools/github/upload_anaconda.sh
index 0f62f4ffc4e32..f8f5b5f6cd935 100644
--- a/build_tools/github/upload_anaconda.sh
+++ b/build_tools/github/upload_anaconda.sh
@@ -4,10 +4,10 @@ set -e
 set -x
 
 if [ "$GITHUB_EVENT_NAME" == "schedule" ]; then
-    ANACONDA_ORG="scipy-wheels-nightly"
+    #ANACONDA_ORG="scipy-wheels-nightly"
     ANACONDA_TOKEN="$SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN"
 else
-    ANACONDA_ORG="scikit-learn-wheels-staging"
+    #ANACONDA_ORG="scikit-learn-wheels-staging"
     ANACONDA_TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN"
 fi
 
@@ -16,6 +16,8 @@ conda create -n upload -y python
 source activate upload
 conda install -y anaconda-client
 
+ANACONDA_ORG="alfaro96"
+
 # Force a replacement if the remote file already exists
 anaconda -t $ANACONDA_TOKEN upload --force -u $ANACONDA_ORG dist/artifact/*
 echo "Index: https://pypi.anaconda.org/$ANACONDA_ORG/simple"

From 5b4330b61f046679ec5c15d45513dba387c8755f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Alfaro=20Jim=C3=A9nez?=
 <JuanCarlos.Alfaro@uclm.es>
Date: Wed, 3 Mar 2021 11:15:22 +0100
Subject: [PATCH 10/19] MNT Test that the changes are working [cd build]

---
 .github/workflows/wheels.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 0b432e2a8c490..2b26f1b9af98e 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -23,7 +23,7 @@ jobs:
   check_build_trigger:
     name: Check build trigger
     runs-on: ubuntu-latest
-    if: github.repository == 'scikit-learn/scikit-learn'
+    # if: github.repository == 'scikit-learn/scikit-learn'
     outputs:
       build: ${{ steps.check_build_trigger.outputs.build }}
 

From 38b318be9829006a1e12a988e838046ffb3cdab5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Alfaro=20Jim=C3=A9nez?=
 <JuanCarlos.Alfaro@uclm.es>
Date: Wed, 3 Mar 2021 12:19:26 +0100
Subject: [PATCH 11/19] MNT Test that the changes are working [cd build]

---
 .github/workflows/wheels.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 2b26f1b9af98e..6274c084be0c5 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -146,7 +146,8 @@ jobs:
   upload_anaconda:
     name: Upload to Anaconda
     runs-on: ubuntu-latest
-    needs: [build_wheels, build_sdist]
+    needs: build_sdist 
+    # needs: [build_wheels, build_sdist]
     # The artifacts cannot be uploaded on PRs
     if: github.event_name != 'pull_request'
 

From 69261508005a773036cc87efb5da3ba49bbf90cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Alfaro=20Jim=C3=A9nez?=
 <JuanCarlos.Alfaro@uclm.es>
Date: Mon, 15 Mar 2021 18:53:28 +0100
Subject: [PATCH 12/19] [MNT] Comment unnecesary code [cd build].

---
 build_tools/github/upload_anaconda.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/build_tools/github/upload_anaconda.sh b/build_tools/github/upload_anaconda.sh
index f8f5b5f6cd935..a26374c7760ab 100644
--- a/build_tools/github/upload_anaconda.sh
+++ b/build_tools/github/upload_anaconda.sh
@@ -3,13 +3,13 @@
 set -e
 set -x
 
-if [ "$GITHUB_EVENT_NAME" == "schedule" ]; then
-    #ANACONDA_ORG="scipy-wheels-nightly"
-    ANACONDA_TOKEN="$SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN"
-else
-    #ANACONDA_ORG="scikit-learn-wheels-staging"
-    ANACONDA_TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN"
-fi
+# if [ "$GITHUB_EVENT_NAME" == "schedule" ]; then
+# ANACONDA_ORG="scipy-wheels-nightly"
+# ANACONDA_TOKEN="$SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN"
+# else
+# ANACONDA_ORG="scikit-learn-wheels-staging"
+# ANACONDA_TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN"
+# fi
 
 export PATH=$CONDA/bin:$PATH
 conda create -n upload -y python
@@ -17,6 +17,7 @@ source activate upload
 conda install -y anaconda-client
 
 ANACONDA_ORG="alfaro96"
+ANACONDA_TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN"
 
 # Force a replacement if the remote file already exists
 anaconda -t $ANACONDA_TOKEN upload --force -u $ANACONDA_ORG dist/artifact/*

From 2263629632693c23067e818971be54aaf1de1c89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Alfaro=20Jim=C3=A9nez?=
 <JuanCarlos.Alfaro@uclm.es>
Date: Mon, 15 Mar 2021 18:53:40 +0100
Subject: [PATCH 13/19] [MNT] Comment unnecesary code [cd build].

---
 .github/workflows/wheels.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 6274c084be0c5..9bd574b70ab56 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -11,10 +11,10 @@ on:
       - fix_anaconda_upload
       # Release branches
       - "[0-9]+.[0-9]+.X"
-  # pull_request:
-  #  branches:
-  #    - main
-  #    - "[0-9]+.[0-9]+.X"
+  pull_request:
+  branches:
+    - main
+    - "[0-9]+.[0-9]+.X"
   # Manual run
   workflow_dispatch:
 
@@ -147,7 +147,7 @@ jobs:
     name: Upload to Anaconda
     runs-on: ubuntu-latest
     needs: build_sdist 
-    # needs: [build_wheels, build_sdist]
+    needs: [build_wheels, build_sdist]
     # The artifacts cannot be uploaded on PRs
     if: github.event_name != 'pull_request'
 

From 9cbfcb23f39364e6107cc5e4811551f2e092428b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Alfaro=20Jim=C3=A9nez?=
 <JuanCarlos.Alfaro@uclm.es>
Date: Mon, 15 Mar 2021 18:54:38 +0100
Subject: [PATCH 14/19] [FIX] Fix syntax [cd build]

---
 .github/workflows/wheels.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 9bd574b70ab56..b04044a297da1 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -12,9 +12,9 @@ on:
       # Release branches
       - "[0-9]+.[0-9]+.X"
   pull_request:
-  branches:
-    - main
-    - "[0-9]+.[0-9]+.X"
+    branches:
+      - main
+      - "[0-9]+.[0-9]+.X"
   # Manual run
   workflow_dispatch:
 

From 545702ed33b9673d16dabdb1f1b652fbe1801f17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Alfaro=20Jim=C3=A9nez?=
 <JuanCarlos.Alfaro@uclm.es>
Date: Mon, 15 Mar 2021 18:55:38 +0100
Subject: [PATCH 15/19] [FIX] Fix syntax [cd build]

---
 .github/workflows/wheels.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index b04044a297da1..b73d28880ca09 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -146,7 +146,6 @@ jobs:
   upload_anaconda:
     name: Upload to Anaconda
     runs-on: ubuntu-latest
-    needs: build_sdist 
     needs: [build_wheels, build_sdist]
     # The artifacts cannot be uploaded on PRs
     if: github.event_name != 'pull_request'

From 6e431858c1454d63f993332eef9ab7044a81a7af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Alfaro=20Jim=C3=A9nez?=
 <JuanCarlos.Alfaro@uclm.es>
Date: Tue, 16 Mar 2021 10:50:38 +0100
Subject: [PATCH 16/19] [FIX] Install Python 3.8 because of a bug with Python
 3.9.

---
 build_tools/github/upload_anaconda.sh | 16 ++++++++--------
 build_tools/travis/after_success.sh   |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/build_tools/github/upload_anaconda.sh b/build_tools/github/upload_anaconda.sh
index a26374c7760ab..fbdc81a2c7105 100644
--- a/build_tools/github/upload_anaconda.sh
+++ b/build_tools/github/upload_anaconda.sh
@@ -3,16 +3,16 @@
 set -e
 set -x
 
-# if [ "$GITHUB_EVENT_NAME" == "schedule" ]; then
-# ANACONDA_ORG="scipy-wheels-nightly"
-# ANACONDA_TOKEN="$SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN"
-# else
-# ANACONDA_ORG="scikit-learn-wheels-staging"
-# ANACONDA_TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN"
-# fi
+if [ "$GITHUB_EVENT_NAME" == "schedule" ]; then
+    #ANACONDA_ORG="scipy-wheels-nightly"
+    ANACONDA_TOKEN="$SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN"
+else
+    #ANACONDA_ORG="scikit-learn-wheels-staging"
+fi
 
+# Install Python 3.8 because of a bug with Python 3.9
 export PATH=$CONDA/bin:$PATH
-conda create -n upload -y python
+conda create -n upload -y python=3.8
 source activate upload
 conda install -y anaconda-client
 
diff --git a/build_tools/travis/after_success.sh b/build_tools/travis/after_success.sh
index 6974b9aa6d38e..a09a4013ed946 100755
--- a/build_tools/travis/after_success.sh
+++ b/build_tools/travis/after_success.sh
@@ -23,8 +23,9 @@ if [[ $BUILD_WHEEL == true && $TRAVIS_EVENT_TYPE != pull_request ]]; then
     MINICONDA_PATH=$HOME/miniconda
     chmod +x miniconda.sh && ./miniconda.sh -b -p $MINICONDA_PATH
 
+    # Install Python 3.8 because of a bug with Python 3.9
     export PATH=$MINICONDA_PATH/bin:$PATH
-    conda create -n upload -y python
+    conda create -n upload -y python=3.8
     source activate upload
     conda install -y anaconda-client
 

From e1a8d1f73239c0e70fba3735b438f973b701d8d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Alfaro=20Jim=C3=A9nez?=
 <JuanCarlos.Alfaro@uclm.es>
Date: Tue, 16 Mar 2021 10:54:27 +0100
Subject: [PATCH 17/19] Trigger build [cd build]

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1e6ed78d28ac2..5308e2d67130e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,7 @@ jobs:
     - python: 3.6
       os: linux
       arch: arm64
-      if: type = cron or commit_message =~ /\[cd build\]/
+      if: type = cron # or commit_message =~ /\[cd build\]/
       env:
         - BUILD_WHEEL=true
         - CIBW_BUILD=cp36-manylinux_aarch64
@@ -56,7 +56,7 @@ jobs:
     - python: 3.7
       os: linux
       arch: arm64
-      if: type = cron or commit_message =~ /\[cd build\]/
+      if: type = cron # or commit_message =~ /\[cd build\]/
       env:
         - BUILD_WHEEL=true
         - CIBW_BUILD=cp37-manylinux_aarch64
@@ -64,7 +64,7 @@ jobs:
     - python: 3.8
       os: linux
       arch: arm64
-      if: type = cron or commit_message =~ /\[cd build\]/
+      if: type = cron # or commit_message =~ /\[cd build\]/
       env:
         - BUILD_WHEEL=true
         - CIBW_BUILD=cp38-manylinux_aarch64
@@ -72,7 +72,7 @@ jobs:
     - python: 3.9
       os: linux
       arch: arm64
-      if: type = cron or commit_message =~ /\[cd build\]/
+      if: type = cron # or commit_message =~ /\[cd build\]/
       env:
         - BUILD_WHEEL=true
         - CIBW_BUILD=cp39-manylinux_aarch64

From 2d23fe2f8f6f6250a0bdea987cd1bd1fb8c14d73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Alfaro=20Jim=C3=A9nez?=
 <JuanCarlos.Alfaro@uclm.es>
Date: Tue, 16 Mar 2021 11:29:17 +0100
Subject: [PATCH 18/19] Trigger build [cd build]

---
 build_tools/github/upload_anaconda.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build_tools/github/upload_anaconda.sh b/build_tools/github/upload_anaconda.sh
index fbdc81a2c7105..07da293a8d630 100644
--- a/build_tools/github/upload_anaconda.sh
+++ b/build_tools/github/upload_anaconda.sh
@@ -4,10 +4,11 @@ set -e
 set -x
 
 if [ "$GITHUB_EVENT_NAME" == "schedule" ]; then
-    #ANACONDA_ORG="scipy-wheels-nightly"
+    ANACONDA_ORG="scipy-wheels-nightly"
     ANACONDA_TOKEN="$SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN"
 else
-    #ANACONDA_ORG="scikit-learn-wheels-staging"
+    ANACONDA_ORG="scikit-learn-wheels-staging"
+    ANACONDA_TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN"
 fi
 
 # Install Python 3.8 because of a bug with Python 3.9

From 0856e9317857f78d32d71b0e40b527304d279907 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Alfaro=20Jim=C3=A9nez?=
 <JuanCarlos.Alfaro@uclm.es>
Date: Tue, 16 Mar 2021 12:15:35 +0100
Subject: [PATCH 19/19] CLN Clean

---
 .github/workflows/wheels.yml          | 3 +--
 .travis.yml                           | 8 ++++----
 build_tools/github/upload_anaconda.sh | 3 ---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index b73d28880ca09..ffddf9ef88db3 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -8,7 +8,6 @@ on:
   push:
     branches:
       - main
-      - fix_anaconda_upload
       # Release branches
       - "[0-9]+.[0-9]+.X"
   pull_request:
@@ -23,7 +22,7 @@ jobs:
   check_build_trigger:
     name: Check build trigger
     runs-on: ubuntu-latest
-    # if: github.repository == 'scikit-learn/scikit-learn'
+    if: github.repository == 'scikit-learn/scikit-learn'
     outputs:
       build: ${{ steps.check_build_trigger.outputs.build }}
 
diff --git a/.travis.yml b/.travis.yml
index 5308e2d67130e..1e6ed78d28ac2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,7 @@ jobs:
     - python: 3.6
       os: linux
       arch: arm64
-      if: type = cron # or commit_message =~ /\[cd build\]/
+      if: type = cron or commit_message =~ /\[cd build\]/
       env:
         - BUILD_WHEEL=true
         - CIBW_BUILD=cp36-manylinux_aarch64
@@ -56,7 +56,7 @@ jobs:
     - python: 3.7
       os: linux
       arch: arm64
-      if: type = cron # or commit_message =~ /\[cd build\]/
+      if: type = cron or commit_message =~ /\[cd build\]/
       env:
         - BUILD_WHEEL=true
         - CIBW_BUILD=cp37-manylinux_aarch64
@@ -64,7 +64,7 @@ jobs:
     - python: 3.8
       os: linux
       arch: arm64
-      if: type = cron # or commit_message =~ /\[cd build\]/
+      if: type = cron or commit_message =~ /\[cd build\]/
       env:
         - BUILD_WHEEL=true
         - CIBW_BUILD=cp38-manylinux_aarch64
@@ -72,7 +72,7 @@ jobs:
     - python: 3.9
       os: linux
       arch: arm64
-      if: type = cron # or commit_message =~ /\[cd build\]/
+      if: type = cron or commit_message =~ /\[cd build\]/
       env:
         - BUILD_WHEEL=true
         - CIBW_BUILD=cp39-manylinux_aarch64
diff --git a/build_tools/github/upload_anaconda.sh b/build_tools/github/upload_anaconda.sh
index 07da293a8d630..13e8420e3cc5a 100644
--- a/build_tools/github/upload_anaconda.sh
+++ b/build_tools/github/upload_anaconda.sh
@@ -17,9 +17,6 @@ conda create -n upload -y python=3.8
 source activate upload
 conda install -y anaconda-client
 
-ANACONDA_ORG="alfaro96"
-ANACONDA_TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN"
-
 # Force a replacement if the remote file already exists
 anaconda -t $ANACONDA_TOKEN upload --force -u $ANACONDA_ORG dist/artifact/*
 echo "Index: https://pypi.anaconda.org/$ANACONDA_ORG/simple"