diff --git a/DevMetaDesktop/Dockerfile b/DevMetaDesktop/Dockerfile index 32985c78aed2523dbc2e17b0a466dc9ceb33de28..b8479f5e4b4676c43231f2cc510105e15d3dfed2 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 afaf50602dd43f7095de71f8b8b8bd9de0029b3b..c0bd8794ffdb7872507e9a44f157775b703419d4 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 5842c0183b6620ee9fcd9c7e7536925179520860..62285ddf3622a26531f1d2451888c104e696156b 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