From 12aff12cdd0ef78ce676e1b6125ccd56a0e3a0e1 Mon Sep 17 00:00:00 2001
From: Benjamin Bertrand <benjamin.bertrand@ess.eu>
Date: Thu, 6 Feb 2020 13:52:10 +0100
Subject: [PATCH] Update Python environment

- update pyepics to 3.4.1
- switch from ics-conda to ics-conda-forge
---
 PythonServer/environment-to-freeze.yml |  4 +--
 PythonServer/environment.yml           | 49 ++++++++++++++------------
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/PythonServer/environment-to-freeze.yml b/PythonServer/environment-to-freeze.yml
index cde3d4b..300d800 100644
--- a/PythonServer/environment-to-freeze.yml
+++ b/PythonServer/environment-to-freeze.yml
@@ -1,7 +1,7 @@
 name: pos
 channels:
   - conda-e3
-  - ics-conda
+  - ics-conda-forge
   - conda-forge
   - anaconda-main
 dependencies:
@@ -12,7 +12,7 @@ dependencies:
   - numpy
   - pandas
   - pip
-  - pyepics
+  - pyepics=3.4.1
   - python=3.7
   - requests
   - pip:
diff --git a/PythonServer/environment.yml b/PythonServer/environment.yml
index cbc6e5d..7316cbb 100644
--- a/PythonServer/environment.yml
+++ b/PythonServer/environment.yml
@@ -1,59 +1,62 @@
 name: pos
 channels:
   - conda-e3
-  - ics-conda
+  - ics-conda-forge
   - conda-forge
   - anaconda-main
 dependencies:
-  - bzip2=1.0.8=h516909a_1
-  - ca-certificates=2019.9.11=hecc5488_0
-  - certifi=2019.9.11=py37_0
+  - _libgcc_mutex=0.1=conda_forge
+  - _openmp_mutex=4.5=0_gnu
+  - ca-certificates=2019.11.28=hecc5488_0
+  - certifi=2019.11.28=py37_0
   - cffi=1.13.2=py37h8022711_0
   - chardet=3.0.4=py37_1003
   - click=7.0=py_0
-  - cryptography=2.8=py37h72c5cf5_0
+  - cryptography=2.8=py37h72c5cf5_1
   - cycler=0.10.0=py_2
-  - epics-base=7.0.3=h68659b9_1
+  - epics-base=7.0.3.1=h68659b9_2
   - freetype=2.10.0=he983fc9_1
   - gitdb2=2.0.6=py_0
-  - gitpython=3.0.4=py_0
+  - gitpython=3.0.5=py_0
   - icu=64.2=he1b5a44_1
   - idna=2.8=py37_1000
   - kiwisolver=1.1.0=py37hc9558a2_0
+  - ld_impl_linux-64=2.33.1=h53a641e_8
   - libblas=3.8.0=14_openblas
   - libcblas=3.8.0=14_openblas
   - libffi=3.2.1=he1b5a44_1006
-  - libgcc-ng=9.1.0=hdf63c60_0
-  - libgfortran-ng=7.3.0=hdf63c60_2
+  - libgcc-ng=9.2.0=h24d8f2e_2
+  - libgfortran-ng=7.3.0=hdf63c60_5
+  - libgomp=9.2.0=h24d8f2e_2
   - liblapack=3.8.0=14_openblas
-  - libopenblas=0.3.7=h6e990d7_3
+  - libopenblas=0.3.7=h5ec1e0e_6
   - libpng=1.6.37=hed695b0_0
-  - libstdcxx-ng=9.1.0=hdf63c60_0
-  - matplotlib-base=3.1.2=py37h250f245_0
+  - libstdcxx-ng=9.2.0=hdf63c60_2
+  - matplotlib-base=3.1.3=py37h250f245_0
   - ncurses=6.1=hf484d3e_1002
-  - numpy=1.17.3=py37h95a1406_0
+  - numpy=1.18.1=py37h95a1406_0
   - openssl=1.1.1d=h516909a_0
-  - pandas=0.25.3=py37hb3f55d8_0
+  - pandas=1.0.1=py37hb3f55d8_0
   - perl=5.26.2=h516909a_1006
-  - pip=19.3.1=py37_0
+  - pip=20.0.2=py_2
   - pycparser=2.19=py37_1
-  - pyepics=3.4.0=py37_0
-  - pyopenssl=19.0.0=py37_0
-  - pyparsing=2.4.5=py_0
+  - pyepics=3.4.1
+  - pyopenssl=19.1.0=py37_0
+  - pyparsing=2.4.6=py_0
   - pysocks=1.7.1=py37_0
-  - python=3.7.3=h33d41f4_1
+  - python=3.7.6=h357f687_2
   - 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
+  - setuptools=45.1.0=py37_0
+  - six=1.14.0=py37_0
   - smmap2=2.0.5=py_0
   - sqlite=3.30.1=hcee41ef_0
-  - tk=8.6.9=hed695b0_1003
+  - tk=8.6.10=hed695b0_0
   - tornado=6.0.3=py37h516909a_0
   - urllib3=1.25.7=py37_0
-  - wheel=0.33.6=py37_0
+  - wheel=0.34.2=py_1
   - xz=5.2.4=h14c3975_1001
   - zlib=1.2.11=h516909a_1006
   - pip:
-- 
GitLab