From bc984bdafbdae5f2839252584e61da0972c413f9 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 1 Jul 2019 12:58:03 +0200
Subject: [PATCH] upgrade some modules, use pinned modules at install

---
 environment-pinned.yml | 10 +++++++---
 setup.py               |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/environment-pinned.yml b/environment-pinned.yml
index b28191ad..25b6965f 100644
--- a/environment-pinned.yml
+++ b/environment-pinned.yml
@@ -97,7 +97,7 @@ dependencies:
   - libopus=1.2.1=hb9ed12e_0
   - libpng=1.6.34=hb9fc6fc_0
   - libprotobuf=3.5.2=h6f1eeef_0
-  - librosa=0.6.1=py_1
+  - librosa=0.6.3=py_0
   - libsndfile=1.0.28=hfc679d8_0
   - libsodium=1.0.16=h1bed415_0
   - libstdcxx-ng=7.2.0=hdf63c60_3
@@ -232,8 +232,9 @@ dependencies:
     - argh==0.26.2
     - billiard==3.3.0.23
     - celery==3.1.26.post2
+    - coreapi
     - deezer-python==0.6.1
-    - django==1.9.13
+    - django==1.10
     - django-bootstrap-pagination==1.6.4
     - django-bootstrap3==10.0.1
     - django-bower==5.2.0
@@ -242,7 +243,8 @@ dependencies:
     - django-debug-toolbar==1.9.1
     - django-environ==0.4.5
     - django-extensions==2.1.0
-    - djangorestframework==3.6.4
+    - django-filter==1.1.0
+    - djangorestframework==3.8
     - essentia==2.1b5.dev416
     - ghp-import==0.5.5
     - jsonfield==2.0.2
@@ -253,6 +255,7 @@ dependencies:
     - mysql-python==1.2.5
     - pathtools==0.1.2
     - ply==3.11
+    - psycopg2-binary
     - py-sonicvisualiser==0.3
     - pympi-ling==1.69
     - redis==2.10.6
@@ -261,4 +264,5 @@ dependencies:
     - uwsgi==2.0.17.1
     - vamp==1.1.0
     - watchdog==0.8.3
+    - xmljson
 prefix: /opt/miniconda
diff --git a/setup.py b/setup.py
index a13c1d1d..ec9d97ea 100755
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ def get_dependencies(env_yml_file):
         elif isinstance(dep, dict) and 'pip' in dep:
             pip_dependencies = dep['pip']
 
-    return conda_dependencies + pip_dependencies
+    return pip_dependencies
 
 # Pytest
 
@@ -90,7 +90,7 @@ def run_tests(self):
     author_email="yomguy@parisson.com, piem@piem.org, thomas@parisson.com, riccardo.zaccarelli@gmail.com, olivier@samalyse.com",
     version='0.9.2',
     setup_requires=['pyyaml'],
-    install_requires=[get_dependencies('conda-environment.yml')],
+    install_requires=[get_dependencies('environment-pinned.yml')],
     platforms=['OS Independent'],
     license='Gnu Public License V2',
     classifiers=CLASSIFIERS,