From e740eec4841c8cc1efb2d3f9dfa701547b88862c Mon Sep 17 00:00:00 2001
From: Stefano Alberto Russo <stefano.russo@gmail.com>
Date: Sun, 21 Feb 2021 23:21:00 +0100
Subject: [PATCH] Removed Python 2 support, upadated pip and Python
 dependencies.

---
 DevMetaDesktop/Dockerfile            |  1 -
 DevMetaDesktop/files/python_deps.txt | 27 ++++++++++++++++-----------
 DevMetaDesktop/files/system_deps.sh  | 10 +---------
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/DevMetaDesktop/Dockerfile b/DevMetaDesktop/Dockerfile
index 32985c7..b8479f5 100644
--- a/DevMetaDesktop/Dockerfile
+++ b/DevMetaDesktop/Dockerfile
@@ -15,7 +15,6 @@ RUN apt-get update
 COPY files/system_deps.sh /root/
 COPY files/python_deps.txt /root/
 RUN bash /root/system_deps.sh
-RUN pip install -r /root/python_deps.txt
 RUN pip3 install -r /root/python_deps.txt
 
 #--------------------------------------
diff --git a/DevMetaDesktop/files/python_deps.txt b/DevMetaDesktop/files/python_deps.txt
index afaf506..c0bd879 100644
--- a/DevMetaDesktop/files/python_deps.txt
+++ b/DevMetaDesktop/files/python_deps.txt
@@ -1,17 +1,22 @@
-numpy==1.14.0
-scipy==1.0.0
-Cython==0.27.3
-Keras==2.1.3
 pydub==0.20.0
-scikit-image==0.14.0
-scikit-learn==0.19.1
 audioread==2.1.5
 matplotlib==2.1.2
 mpld3==0.3
-h5py==2.8.0
-pandas==0.21.0
 Jinja2==2.10
-astropy==2.0.7
-tensorflow==1.9.0
 theano==1.0.2
-jupyter==1.0.0
+h5py==2.8.0
+Keras==2.1.3
+tensorflow==1.14.0
+matplotlib==2.1.2
+numpy==1.19.5
+scikit-image==0.15.0
+scikit-learn==0.22
+pandas==0.23.4
+chardet==3.0.4
+convertdate==2.1.2
+lunarcalendar==0.0.9
+holidays==0.10.3
+pystan==2.19.1.1
+plotly==4.9.0
+requests==2.5.3
+notebook==5.7.10
\ No newline at end of file
diff --git a/DevMetaDesktop/files/system_deps.sh b/DevMetaDesktop/files/system_deps.sh
index 5842c01..62285dd 100644
--- a/DevMetaDesktop/files/system_deps.sh
+++ b/DevMetaDesktop/files/system_deps.sh
@@ -11,17 +11,9 @@ apt-get install curl -y
 # Install get-pip script
 curl -O https://bootstrap.pypa.io/get-pip.py
 
-# Install Python and pip in this order (first Python 3 and then Python 2), or 
-# you will end ap with python defaulting to python2 and pip defaulting to pip3
-# Otherwise, do somethign like "ln -s /usr/local/bin/pip3 /usr/local/bin/pip"
-
 # Install Python3 and Pip3 (python3-distutils required for pip3)
 apt-get install python3 python3-distutils -y 
-python3 get-pip.py 'pip==10.0.1'
-
-# Install Python2 and Pip2
-apt-get install python -y
-python get-pip.py 'pip==10.0.1'
+python3 get-pip.py 'pip==21.0.1'
 
 # Python-tk required by matplotlib/six
 apt-get install python-tk python3-tk -y
-- 
GitLab