From 3057c2bc4265d0cee0481910787de9c0ef812eae Mon Sep 17 00:00:00 2001
From: Benjamin Bertrand <benjamin.bertrand@esss.se>
Date: Wed, 13 Nov 2019 13:14:09 +0100
Subject: [PATCH] Update Python conda env
use_only_tar_bz2 required to use artifactory with conda >= 4.7
JIRA INFRA-1512 #action In Progress
---
PythonServer/Dockerfile | 1 +
PythonServer/environment-to-freeze.yml | 1 +
PythonServer/environment.yml | 79 +++++++++++++-------------
3 files changed, 41 insertions(+), 40 deletions(-)
diff --git a/PythonServer/Dockerfile b/PythonServer/Dockerfile
index 13489c6..cdb1d4f 100644
--- a/PythonServer/Dockerfile
+++ b/PythonServer/Dockerfile
@@ -9,6 +9,7 @@ COPY environment.yml /app/environment.yml
RUN conda update -n base conda \
&& conda config --system --set channel_alias https://artifactory.esss.lu.se/artifactory/api/conda \
+ && conda config --system --set use_only_tar_bz2 true \
&& conda env create -n pos -f /app/environment.yml \
&& conda clean -tipsy
diff --git a/PythonServer/environment-to-freeze.yml b/PythonServer/environment-to-freeze.yml
index 9ab99dd..cde3d4b 100644
--- a/PythonServer/environment-to-freeze.yml
+++ b/PythonServer/environment-to-freeze.yml
@@ -11,6 +11,7 @@ dependencies:
- matplotlib-base
- numpy
- pandas
+ - pip
- pyepics
- python=3.7
- requests
diff --git a/PythonServer/environment.yml b/PythonServer/environment.yml
index f769b9e..cbc6e5d 100644
--- a/PythonServer/environment.yml
+++ b/PythonServer/environment.yml
@@ -5,58 +5,57 @@ channels:
- conda-forge
- anaconda-main
dependencies:
- - asn1crypto=0.24.0=py37_1003
- - bzip2=1.0.6=h14c3975_1002
- - ca-certificates=2019.3.9=hecc5488_0
- - certifi=2019.3.9=py37_0
- - cffi=1.12.3=py37h8022711_0
+ - bzip2=1.0.8=h516909a_1
+ - ca-certificates=2019.9.11=hecc5488_0
+ - certifi=2019.9.11=py37_0
+ - cffi=1.13.2=py37h8022711_0
- chardet=3.0.4=py37_1003
- click=7.0=py_0
- - cryptography=2.6.1=py37h72c5cf5_0
- - cycler=0.10.0=py_1
- - epics-base=7.0.2.1=h8cbf991_1
- - freetype=2.10.0=he983fc9_0
- - gitdb2=2.0.5=py_0
- - gitpython=2.1.11=py_0
- - icu=58.2=hf484d3e_1000
+ - cryptography=2.8=py37h72c5cf5_0
+ - cycler=0.10.0=py_2
+ - epics-base=7.0.3=h68659b9_1
+ - freetype=2.10.0=he983fc9_1
+ - gitdb2=2.0.6=py_0
+ - gitpython=3.0.4=py_0
+ - icu=64.2=he1b5a44_1
- idna=2.8=py37_1000
- kiwisolver=1.1.0=py37hc9558a2_0
- - libblas=3.8.0=7_openblas
- - libcblas=3.8.0=7_openblas
+ - libblas=3.8.0=14_openblas
+ - libcblas=3.8.0=14_openblas
- libffi=3.2.1=he1b5a44_1006
- - libgcc-ng=8.2.0=hdf63c60_1
- - libgfortran=3.0.0=1
- - liblapack=3.8.0=7_openblas
+ - libgcc-ng=9.1.0=hdf63c60_0
+ - libgfortran-ng=7.3.0=hdf63c60_2
+ - liblapack=3.8.0=14_openblas
+ - libopenblas=0.3.7=h6e990d7_3
- libpng=1.6.37=hed695b0_0
- - libstdcxx-ng=8.2.0=hdf63c60_1
- - matplotlib-base=3.0.3=py37h5f35d83_1
+ - libstdcxx-ng=9.1.0=hdf63c60_0
+ - matplotlib-base=3.1.2=py37h250f245_0
- ncurses=6.1=hf484d3e_1002
- - numpy=1.16.3=py37he5ce36f_0
- - openblas=0.3.5=ha44fe06_0
- - openssl=1.1.1b=h14c3975_1
- - pandas=0.24.2=py37hf484d3e_0
+ - numpy=1.17.3=py37h95a1406_0
+ - openssl=1.1.1d=h516909a_0
+ - pandas=0.25.3=py37hb3f55d8_0
- perl=5.26.2=h516909a_1006
- - pip=19.1=py37_0
+ - pip=19.3.1=py37_0
- pycparser=2.19=py37_1
- - pyepics=3.3.3=py37_0
+ - pyepics=3.4.0=py37_0
- pyopenssl=19.0.0=py37_0
- - pyparsing=2.4.0=py_0
- - pysocks=1.6.8=py37_1002
- - python=3.7.3=h5b0a415_0
- - python-dateutil=2.8.0=py_0
- - pytz=2019.1=py_0
- - readline=7.0=hf8c457e_1001
- - requests=2.21.0=py37_1000
- - setuptools=41.0.1=py37_0
- - six=1.12.0=py37_1000
+ - pyparsing=2.4.5=py_0
+ - pysocks=1.7.1=py37_0
+ - python=3.7.3=h33d41f4_1
+ - python-dateutil=2.8.1=py_0
+ - pytz=2019.3=py_0
+ - readline=8.0=hf8c457e_0
+ - requests=2.22.0=py37_1
+ - setuptools=41.6.0=py37_1
+ - six=1.13.0=py37_0
- smmap2=2.0.5=py_0
- - sqlite=3.26.0=h67949de_1001
- - tk=8.6.9=h84994c4_1001
- - tornado=6.0.2=py37h516909a_0
- - urllib3=1.24.2=py37_0
- - wheel=0.33.1=py37_0
+ - sqlite=3.30.1=hcee41ef_0
+ - tk=8.6.9=hed695b0_1003
+ - tornado=6.0.3=py37h516909a_0
+ - urllib3=1.25.7=py37_0
+ - wheel=0.33.6=py37_0
- xz=5.2.4=h14c3975_1001
- - zlib=1.2.11=h14c3975_1004
+ - zlib=1.2.11=h516909a_1006
- pip:
- --index-url https://artifactory.esss.lu.se/artifactory/api/pypi/pypi-virtual/simple
- py-epicsarchiver==0.3.0
--
GitLab