From fc3ab61d81eb9e04ddd25d72d6978cbe85166c66 Mon Sep 17 00:00:00 2001
From: Julien <peloton@lal.in2p3.fr>
Date: Fri, 5 Jan 2024 09:57:51 +0100
Subject: [PATCH] Upgrade pip before installation of packages (#775)

* Upgrade pip before installation of packages

* Isolate no-deps

* Keep isolating no-deps

* Change the number of topics to check from 10 to 11. FIXME: externalise the list of topics inside a configuration file.
---
 Dockerfile                            |  2 +-
 deps/requirements-science-no-deps.txt | 13 +++++++++++++
 deps/requirements-science.txt         |  7 -------
 3 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 deps/requirements-science-no-deps.txt

diff --git a/Dockerfile b/Dockerfile
index c587b1b9..4a7be739 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -54,7 +54,7 @@ RUN mkdir -p $FINK_HOME/deps
 # when fink-broker code changes
 ENV PIP_NO_CACHE_DIR 1
 ADD deps/requirements.txt $FINK_HOME/deps
-RUN pip install -r $FINK_HOME/deps/requirements.txt
+RUN pip install --no-cache-dir --upgrade pip setuptools wheel && pip install -r $FINK_HOME/deps/requirements.txt
 
 RUN git clone -c advice.detachedHead=false --depth 1 -b "latest" --single-branch https://github.com/astrolabsoftware/fink-alert-schemas.git
 
diff --git a/deps/requirements-science-no-deps.txt b/deps/requirements-science-no-deps.txt
new file mode 100644
index 00000000..bf3a82d3
--- /dev/null
+++ b/deps/requirements-science-no-deps.txt
@@ -0,0 +1,13 @@
+# fink-fat
+fink_fat @ https://github.com/FusRoman/fink-fat/archive/v0.16.0.zip
+sbpy
+
+# Fink MM
+fink_MM @ https://github.com/FusRoman/Fink_MM/archive/v0.16.10.zip
+
+# Installation of torch without GPU support (lighter)
+-f https://download.pytorch.org/whl/torch_stable.html
+torch==1.12.0+cpu
+
+# Astronet
+-e git+https://github.com/tallamjr/astronet.git#egg=astronet
diff --git a/deps/requirements-science.txt b/deps/requirements-science.txt
index bf263f36..2c3bdda8 100644
--- a/deps/requirements-science.txt
+++ b/deps/requirements-science.txt
@@ -22,10 +22,6 @@ iminuit==2.21.0
 # kilonova @ sklearn==1.0.2
 -e git+https://github.com/b-biswas/kndetect@kndetect#egg=kndetect
 
-# Installation of torch without GPU support (lighter)
--f https://download.pytorch.org/whl/torch_stable.html
-torch==1.12.0+cpu
-
 # CATS dependencies
 tensorflow==2.9.2
 tensorflow_addons==0.18.0
@@ -35,11 +31,9 @@ onnx==1.12.0
 onnxruntime
 
 # fink-fat
-fink_fat @ https://github.com/FusRoman/fink-fat/archive/v0.16.0.zip --install-option="--no-deps"
 sbpy
 
 # Fink MM
-fink_MM @ https://github.com/FusRoman/Fink_MM/archive/v0.16.10.zip --install-option="--no-deps"
 gcn-kafka==0.3.0
 voevent-parse==1.0.3
 tabulate==0.9.0
@@ -50,7 +44,6 @@ importlib-resources==5.9.0
 pandera==0.14.5
 
 # Installation of astronet
--e git+https://github.com/tallamjr/astronet.git#egg=astronet --install-option="--no-deps"
 imbalanced-learn==0.7.0
 optuna==2.3.0
 george