Skip to content

Commit bc984bd

Browse files
committed
upgrade some modules, use pinned modules at install
1 parent 5745bb6 commit bc984bd

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

environment-pinned.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ dependencies:
9797
- libopus=1.2.1=hb9ed12e_0
9898
- libpng=1.6.34=hb9fc6fc_0
9999
- libprotobuf=3.5.2=h6f1eeef_0
100-
- librosa=0.6.1=py_1
100+
- librosa=0.6.3=py_0
101101
- libsndfile=1.0.28=hfc679d8_0
102102
- libsodium=1.0.16=h1bed415_0
103103
- libstdcxx-ng=7.2.0=hdf63c60_3
@@ -232,8 +232,9 @@ dependencies:
232232
- argh==0.26.2
233233
- billiard==3.3.0.23
234234
- celery==3.1.26.post2
235+
- coreapi
235236
- deezer-python==0.6.1
236-
- django==1.9.13
237+
- django==1.10
237238
- django-bootstrap-pagination==1.6.4
238239
- django-bootstrap3==10.0.1
239240
- django-bower==5.2.0
@@ -242,7 +243,8 @@ dependencies:
242243
- django-debug-toolbar==1.9.1
243244
- django-environ==0.4.5
244245
- django-extensions==2.1.0
245-
- djangorestframework==3.6.4
246+
- django-filter==1.1.0
247+
- djangorestframework==3.8
246248
- essentia==2.1b5.dev416
247249
- ghp-import==0.5.5
248250
- jsonfield==2.0.2
@@ -253,6 +255,7 @@ dependencies:
253255
- mysql-python==1.2.5
254256
- pathtools==0.1.2
255257
- ply==3.11
258+
- psycopg2-binary
256259
- py-sonicvisualiser==0.3
257260
- pympi-ling==1.69
258261
- redis==2.10.6
@@ -261,4 +264,5 @@ dependencies:
261264
- uwsgi==2.0.17.1
262265
- vamp==1.1.0
263266
- watchdog==0.8.3
267+
- xmljson
264268
prefix: /opt/miniconda

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def get_dependencies(env_yml_file):
4545
elif isinstance(dep, dict) and 'pip' in dep:
4646
pip_dependencies = dep['pip']
4747

48-
return conda_dependencies + pip_dependencies
48+
return pip_dependencies
4949

5050
# Pytest
5151

@@ -90,7 +90,7 @@ def run_tests(self):
9090
author_email="yomguy@parisson.com, piem@piem.org, thomas@parisson.com, riccardo.zaccarelli@gmail.com, olivier@samalyse.com",
9191
version='0.9.2',
9292
setup_requires=['pyyaml'],
93-
install_requires=[get_dependencies('conda-environment.yml')],
93+
install_requires=[get_dependencies('environment-pinned.yml')],
9494
platforms=['OS Independent'],
9595
license='Gnu Public License V2',
9696
classifiers=CLASSIFIERS,

0 commit comments

Comments
 (0)