From 58233cf8d6185871b73b95e4130d4b469fb7d86a Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 27 Jun 2019 10:18:45 +0200 Subject: [PATCH 1/7] goto 0.9.1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2bb638f3..0491854d 100755 --- a/setup.py +++ b/setup.py @@ -88,7 +88,7 @@ def run_tests(self): long_description=open_here('README.rst').read(), author="Guillaume Pellerin, Paul Brossier, Thomas Fillon, Riccardo Zaccarelli, Olivier Guilyardi", author_email="yomguy@parisson.com, piem@piem.org, thomas@parisson.com, riccardo.zaccarelli@gmail.com, olivier@samalyse.com", - version='0.8.2', + version='0.9.1', setup_requires=['pyyaml'], install_requires=[get_dependencies('conda-environment.yml')], platforms=['OS Independent'], From 1be2ef1c3e349e28eecd4a03e5ea0f0ca5a3049d Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 27 Jun 2019 10:20:14 +0200 Subject: [PATCH 2/7] goto 0.9.2 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0491854d..a13c1d1d 100755 --- a/setup.py +++ b/setup.py @@ -88,7 +88,7 @@ def run_tests(self): long_description=open_here('README.rst').read(), author="Guillaume Pellerin, Paul Brossier, Thomas Fillon, Riccardo Zaccarelli, Olivier Guilyardi", author_email="yomguy@parisson.com, piem@piem.org, thomas@parisson.com, riccardo.zaccarelli@gmail.com, olivier@samalyse.com", - version='0.9.1', + version='0.9.2', setup_requires=['pyyaml'], install_requires=[get_dependencies('conda-environment.yml')], platforms=['OS Independent'], From b9f3586ae20bc0322ec2637aeca6a5d9956e6838 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 27 Jun 2019 11:02:59 +0200 Subject: [PATCH 3/7] remove kymatio ATM --- environment-pinned.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/environment-pinned.yml b/environment-pinned.yml index 57eb5e6e..3d22cd15 100644 --- a/environment-pinned.yml +++ b/environment-pinned.yml @@ -248,7 +248,6 @@ dependencies: - ghp-import==0.5.5 - jsonfield==2.0.2 - jupyterthemes==0.19.6 - - kymatio==0.1.0b0 - kombu==3.0.37 - lesscpy==0.13.0 - mutagen==1.41.1 From 87e53557f7090c4fc820a4c416fa123f5be00f2a Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 27 Jun 2019 11:38:50 +0200 Subject: [PATCH 4/7] Add environment-explicit.yml --- environment-explicit.yml | 176 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 176 insertions(+) create mode 100644 environment-explicit.yml diff --git a/environment-explicit.yml b/environment-explicit.yml new file mode 100644 index 00000000..fea33193 --- /dev/null +++ b/environment-explicit.yml @@ -0,0 +1,176 @@ +# This file may be used to create an environment using: +# $ conda create --name --file +# platform: linux-64 +@EXPLICIT +https://conda.anaconda.org/conda-forge/linux-64/alabaster-0.7.10-py27_1.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/argtable2-2.13-1.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/asn1crypto-0.22.0-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/aubio-0.4.5-np112py27_2.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/audioread-2.1.4-py27_2.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/babel-2.4.0-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/backports-1.0-py27_1.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/backports.functools_lru_cache-1.4-py27_1.tar.bz2 +https://conda.anaconda.org/conda-forge/noarch/backports.shutil_get_terminal_size-1.0.0-py_3.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/backports.weakref-1.0rc1-py27_1.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/backports_abc-0.5-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/blas-1.1-openblas.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/bleach-1.5.0-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.6-1.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2017.7.27.1-0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/certifi-2017.7.27.1-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/cffi-1.10.0-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/chardet-3.0.4-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/main/linux-64/conda-4.3.30-py27h6ae6dc7_0.tar.bz2 +https://repo.continuum.io/pkgs/main/linux-64/conda-env-2.6.0-h36134e3_1.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/configparser-3.5.0-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/cryptography-2.0.3-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/cycler-0.10.0-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/dbus-1.10.22-0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/decorator-4.1.2-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/docutils-0.14-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/eigen-3.3.3-0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/entrypoints-0.2.3-py27_1.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/enum34-1.1.6-py27_1.tar.bz2 +https://conda.anaconda.org/thomasfillon/linux-64/essentia-2.1_beta4-py27hf6fdc9d_2.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/expat-2.2.1-0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/ffmpeg-2.8.6-5.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/fftw-3.3.6-3.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/fontconfig-2.12.1-4.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/freetype-2.7-1.tar.bz2 +https://conda.anaconda.org/conda-forge/noarch/funcsigs-1.0.2-py_2.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/functools32-3.2.3.2-py27_1.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/gdbm-1.12-0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/gettext-0.19.7-1.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/glib-2.53.5-0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/gmp-6.1.2-0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/gst-plugins-base-1.8.0-0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/gstreamer-1.8.0-1.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/h5py-2.7.1-py27_1.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/hdf5-1.8.18-1.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/html5lib-0.9999999-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/icu-58.1-1.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/idna-2.6-py27_1.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/imagesize-0.7.1-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/ipaddress-1.0.18-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/ipykernel-4.6.1-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/ipython-5.5.0-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/ipython_genutils-0.2.0-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/noarch/ipywidgets-7.0.1-py_2.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/jinja2-2.9.6-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/joblib-0.11-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/jpeg-9b-1.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/jsonschema-2.6.0-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/jupyter-1.0.0-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/jupyter_client-5.1.0-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/jupyter_console-5.1.0-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/jupyter_core-4.3.0-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/lapack-3.6.1-1.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/libffi-3.2.1-3.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/libflac-1.3.1-0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/libgcc-5.2.0-0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/libgfortran-3.0.0-1.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.14-4.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/libogg-1.3.2-0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/libpng-1.6.28-1.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/libprotobuf-3.4.0-0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/librosa-0.5.1-py27_1.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/libsndfile-1.0.27-1.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/libsodium-1.0.10-0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.0.7-0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/libvorbis-1.3.5-0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/libxcb-1.12-1.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.9.5-0.tar.bz2 +https://repo.continuum.io/pkgs/main/linux-64/llvmlite-0.20.0-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/lzo-2.06-0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/markdown-2.6.9-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/markupsafe-1.0-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/matplotlib-2.1.0-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/mistune-0.7.4-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/mock-2.0.0-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/mpg123-1.24.0-1.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/mysql-python-1.2.5-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/noarch/nbconvert-5.3.1-py_1.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/nbformat-4.4.0-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/ncurses-5.9-10.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/networkx-1.11-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/notebook-5.1.0-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/numba-0.35.0-np112py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/numexpr-2.6.4-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/numpy-1.12.1-py27_blas_openblas_200.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/olefile-0.44-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/openblas-0.2.19-2.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/openssl-1.0.2l-0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/pandas-0.20.3-py27_1.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/pandoc-1.19.2-0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/pandocfilters-1.4.1-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/main/linux-64/path.py-10.3.1-py27hc258cac_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/pathlib2-2.3.0-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/pbr-3.1.1-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/pcre-8.39-0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/pexpect-4.2.1-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/pickleshare-0.7.4-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/pillow-4.2.1-py27_1.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/pip-9.0.1-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/prompt_toolkit-1.0.15-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/protobuf-3.4.0-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/ptyprocess-0.5.2-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/pyasn1-0.2.3-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/pycosat-0.6.1-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/pycparser-2.18-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/pycrypto-2.6.1-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/pygments-2.2.0-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/pyopenssl-17.2.0-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/pyparsing-2.2.0-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/pyqt-5.6.0-py27_4.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/pysocks-1.6.7-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/pytables-3.4.2-np112py27_3.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/python-2.7.13-1.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/python-dateutil-2.6.1-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/pytz-2017.2-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/pyyaml-3.12-py27_1.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/pyzmq-16.0.2-py27_2.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/qt-5.6.2-3.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/qtconsole-4.3.1-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/readline-6.2-0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/redis-3.2.0-0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/requests-2.18.4-py27_1.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/resampy-0.2.0-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/ruamel_yaml-0.11.14-py27_1.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/scandir-1.6-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/scikit-learn-0.19.0-py27_blas_openblas_201.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/scipy-0.19.1-py27_blas_openblas_202.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/setuptools-36.3.0-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/simplegeneric-0.8.1-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/simplejson-3.11.1-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/singledispatch-3.4.0.3-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/sip-4.18-py27_1.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/six-1.11.0-py27_1.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/snowballstemmer-1.2.1-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/sphinx-1.6.4-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/main/linux-64/sphinxcontrib-1.0-py27h1512b58_1.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/sphinxcontrib-websupport-1.0.1-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.13.0-1.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/ssl_match_hostname-3.5.0.1-py27_1.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/subprocess32-3.2.7-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/tensorflow-1.3.0-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/terminado-0.6-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/testpath-0.3.1-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/tk-8.5.19-2.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/tornado-4.5.2-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/traitlets-4.3.2-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/traits-4.6.0-py27_1.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/typing-3.6.2-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/urllib3-1.22-py27_0.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/wcwidth-0.1.7-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/webencodings-0.5-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/noarch/werkzeug-0.12.2-py_1.tar.bz2 +https://conda.anaconda.org/conda-forge/noarch/wheel-0.30.0-py_1.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/widgetsnbextension-3.0.3-py27_2.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/x264-20131217-3.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/xorg-libxau-1.0.8-3.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/xorg-libxdmcp-1.1.2-3.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/xz-5.2.3-0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/yaafe-0.70-py27_2.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/yaml-0.1.6-0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/zeromq-4.2.1-1.tar.bz2 +https://repo.continuum.io/pkgs/free/linux-64/zlib-1.2.8-3.tar.bz2 From 5745bb66730eec12a5042a452f8e40d561a9c436 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 27 Jun 2019 13:06:13 +0200 Subject: [PATCH 5/7] Update conda environment, remove kymatio --- Dockerfile | 8 +- conda-environment.yml | 1 - environment-explicit.yml | 385 ++++++++++++++++++++++----------------- environment-pinned.yml | 21 +-- 4 files changed, 232 insertions(+), 183 deletions(-) diff --git a/Dockerfile b/Dockerfile index 47ad328b..ee28a0eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,7 +34,7 @@ RUN apt-get update && \ # Install conda in /opt/miniconda ENV PATH /opt/miniconda/bin:$PATH -RUN wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh && \ +RUN wget https://repo.anaconda.com/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh && \ /bin/bash miniconda.sh -b -p /opt/miniconda && \ rm miniconda.sh && \ hash -r && \ @@ -43,9 +43,11 @@ RUN wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh - echo "conda activate" >> ~/.bashrc && \ conda config --set always_yes yes --set changeps1 yes -COPY environment-pinned.yml /srv/lib/ +#COPY environment-pinned.yml /srv/lib/ +COPY environment-explicit.yml /srv/lib/ RUN conda config --append channels conda-forge --append channels thomasfillon --append channels soumith &&\ - conda env update --file environment-pinned.yml &&\ + #conda env update --file environment-pinned.yml &&\ + conda install -n base --file environment-explicit.yml &&\ conda clean --all --yes # Link glib-networking with Conda to fix missing TLS/SSL support in Conda Glib library diff --git a/conda-environment.yml b/conda-environment.yml index c43d76fd..d8e68cd5 100644 --- a/conda-environment.yml +++ b/conda-environment.yml @@ -51,7 +51,6 @@ dependencies: - ghp-import - jsonfield - jupyterthemes - - kymatio - markdown - mutagen - numpydoc diff --git a/environment-explicit.yml b/environment-explicit.yml index fea33193..5b07eb7a 100644 --- a/environment-explicit.yml +++ b/environment-explicit.yml @@ -2,175 +2,224 @@ # $ conda create --name --file # platform: linux-64 @EXPLICIT -https://conda.anaconda.org/conda-forge/linux-64/alabaster-0.7.10-py27_1.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/argtable2-2.13-1.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/asn1crypto-0.22.0-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/aubio-0.4.5-np112py27_2.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/audioread-2.1.4-py27_2.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/babel-2.4.0-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/backports-1.0-py27_1.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/backports.functools_lru_cache-1.4-py27_1.tar.bz2 -https://conda.anaconda.org/conda-forge/noarch/backports.shutil_get_terminal_size-1.0.0-py_3.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/backports.weakref-1.0rc1-py27_1.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/backports_abc-0.5-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/blas-1.1-openblas.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/bleach-1.5.0-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.6-1.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2017.7.27.1-0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/certifi-2017.7.27.1-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/cffi-1.10.0-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/chardet-3.0.4-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/main/linux-64/conda-4.3.30-py27h6ae6dc7_0.tar.bz2 -https://repo.continuum.io/pkgs/main/linux-64/conda-env-2.6.0-h36134e3_1.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/configparser-3.5.0-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/cryptography-2.0.3-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/cycler-0.10.0-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/dbus-1.10.22-0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/decorator-4.1.2-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/docutils-0.14-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/eigen-3.3.3-0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/entrypoints-0.2.3-py27_1.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/enum34-1.1.6-py27_1.tar.bz2 -https://conda.anaconda.org/thomasfillon/linux-64/essentia-2.1_beta4-py27hf6fdc9d_2.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/expat-2.2.1-0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/ffmpeg-2.8.6-5.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/fftw-3.3.6-3.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/fontconfig-2.12.1-4.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/freetype-2.7-1.tar.bz2 -https://conda.anaconda.org/conda-forge/noarch/funcsigs-1.0.2-py_2.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/functools32-3.2.3.2-py27_1.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/gdbm-1.12-0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/gettext-0.19.7-1.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/glib-2.53.5-0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/gmp-6.1.2-0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/gst-plugins-base-1.8.0-0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/gstreamer-1.8.0-1.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/h5py-2.7.1-py27_1.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/hdf5-1.8.18-1.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/html5lib-0.9999999-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/icu-58.1-1.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/idna-2.6-py27_1.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/imagesize-0.7.1-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/ipaddress-1.0.18-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/ipykernel-4.6.1-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/ipython-5.5.0-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/ipython_genutils-0.2.0-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/noarch/ipywidgets-7.0.1-py_2.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/jinja2-2.9.6-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/joblib-0.11-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/jpeg-9b-1.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/jsonschema-2.6.0-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/jupyter-1.0.0-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/jupyter_client-5.1.0-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/jupyter_console-5.1.0-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/jupyter_core-4.3.0-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/conda-env-2.6.0-1.tar.bz2 +https://repo.anaconda.com/pkgs/free/linux-64/gdbm-1.12-0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/blas-1.0-mkl.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/ca-certificates-2019.1.23-0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/cudatoolkit-9.0-h13b8566_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/intel-openmp-2018.0.3-0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/libgcc-ng-8.2.0-hdf63c60_1.tar.bz2 +https://repo.anaconda.com/pkgs/free/linux-64/libgfortran-3.0.0-1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/libgfortran-ng-7.2.0-hdf63c60_3.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/libogg-1.3.2-0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/libstdcxx-ng-7.2.0-hdf63c60_3.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/yaml-0.1.7-had09818_2.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/argtable2-2.13-h470a237_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/bzip2-1.0.6-h14c3975_5.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/cudnn-7.1.2-cuda9.0_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/eigen-3.3.3-h5721d7b_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/expat-2.2.5-he0dffb1_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/fftw-3.3.8-h14c3975_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/gmp-6.1.2-h6c8ec71_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/icu-58.2-h9c2bf20_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/jpeg-9b-h024ee3a_2.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/lapack-3.6.1-1.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/libffi-3.2.1-3.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/libffi-3.2.1-hd88cf55_4.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/libflac-1.3.1-0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/libgcc-5.2.0-0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/libgfortran-3.0.0-1.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.14-4.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/libogg-1.3.2-0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/libpng-1.6.28-1.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/libprotobuf-3.4.0-0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/librosa-0.5.1-py27_1.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/libsndfile-1.0.27-1.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/libsodium-1.0.10-0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.0.7-0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/libgcc-7.2.0-h69d50b8_2.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/libiconv-1.15-h63c8f33_5.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/libopenblas-0.2.20-h9ac9557_7.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/libopus-1.2.1-hb9ed12e_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/libsodium-1.0.16-h1bed415_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/libuuid-1.0.3-h1bed415_2.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/libvorbis-1.3.5-0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/libxcb-1.12-1.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.9.5-0.tar.bz2 -https://repo.continuum.io/pkgs/main/linux-64/llvmlite-0.20.0-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/lzo-2.06-0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/markdown-2.6.9-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/markupsafe-1.0-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/matplotlib-2.1.0-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/mistune-0.7.4-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/mock-2.0.0-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/mpg123-1.24.0-1.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/mysql-python-1.2.5-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/noarch/nbconvert-5.3.1-py_1.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/nbformat-4.4.0-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/ncurses-5.9-10.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/networkx-1.11-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/notebook-5.1.0-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/numba-0.35.0-np112py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/numexpr-2.6.4-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/numpy-1.12.1-py27_blas_openblas_200.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/olefile-0.44-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/openblas-0.2.19-2.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/openssl-1.0.2l-0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/pandas-0.20.3-py27_1.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/pandoc-1.19.2-0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/pandocfilters-1.4.1-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/main/linux-64/path.py-10.3.1-py27hc258cac_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/pathlib2-2.3.0-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/pbr-3.1.1-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/pcre-8.39-0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/pexpect-4.2.1-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/pickleshare-0.7.4-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/pillow-4.2.1-py27_1.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/pip-9.0.1-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/prompt_toolkit-1.0.15-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/protobuf-3.4.0-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/ptyprocess-0.5.2-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/pyasn1-0.2.3-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/pycosat-0.6.1-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/pycparser-2.18-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/pycrypto-2.6.1-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/pygments-2.2.0-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/pyopenssl-17.2.0-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/pyparsing-2.2.0-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/pyqt-5.6.0-py27_4.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/pysocks-1.6.7-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/pytables-3.4.2-np112py27_3.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/python-2.7.13-1.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/python-dateutil-2.6.1-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/pytz-2017.2-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/libvpx-1.7.0-h439df22_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/libxcb-1.13-h1bed415_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/lzo-2.10-h49e0be7_2.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/mkl-2018.0.3-1.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/mpg123-1.25.8-hfc679d8_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/nccl-1.3.5-cuda9.0_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/ncurses-6.1-hf484d3e_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/openblas-0.2.20-4.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/openssl-1.0.2p-h14c3975_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/pcre-8.42-h439df22_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/snappy-1.1.7-hbae5bb6_3.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/tk-8.6.7-hc745277_3.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/x264-1!152.20180717-h470a237_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/xorg-libxau-1.0.8-h470a237_5.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/xorg-libxdmcp-1.1.2-h470a237_6.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/xz-5.2.4-h14c3975_4.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/zlib-1.2.11-ha838bed_2.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/blosc-1.14.3-hdbcaa40_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/gettext-0.19.8.1-hd7bead4_3.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/glib-2.56.1-h000015b_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/hdf5-1.10.2-hba1933b_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/libedit-3.1.20170329-h6b74fdf_2.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/libpng-1.6.34-hb9fc6fc_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/libprotobuf-3.5.2-h6f1eeef_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/libsndfile-1.0.28-hfc679d8_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/libtiff-4.0.9-he85c1e1_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/libxml2-2.9.8-h26e45fe_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/mysql-connector-c-6.1.11-hf4847fb_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/pandoc-2.2.1-h629c226_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/readline-7.0-ha6073c6_4.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/zeromq-4.2.5-hf484d3e_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/dbus-1.13.2-h714fa37_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/freetype-2.9.1-h8a8886c_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/gstreamer-1.14.0-hb453b48_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/sqlite-3.24.0-h84994c4_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/ffmpeg-4.0-hcdf2ecd_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/fontconfig-2.13.0-h9420a91_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/gst-plugins-base-1.14.0-hbbd80ab_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/python-2.7.15-h1571d57_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/alabaster-0.7.11-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/appdirs-1.4.3-py27h28b3542_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/asn1crypto-0.24.0-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/noarch/astor-0.7.1-py_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/attrs-18.1.0-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/audioread-2.1.4-py27_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/backports-1.0-py27_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/backports_abc-0.5-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/certifi-2018.11.29-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/chardet-3.0.4-py27_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/constantly-15.1.0-py27h28b3542_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/decorator-4.3.0-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/docutils-0.14-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/enum34-1.1.6-py27_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/funcsigs-1.0.2-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/functools32-3.2.3.2-py27_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/futures-3.2.0-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/noarch/gast-0.2.0-py_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/idna-2.7-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/imagesize-1.0.0-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/incremental-17.5.0-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/ipaddress-1.0.22-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/ipython_genutils-0.2.0-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/noarch/itypes-1.1.0-py_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/joblib-0.12-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/kiwisolver-1.0.1-py27hf484d3e_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/linecache2-1.0.0-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/markdown-2.6.11-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/markupsafe-1.0-py27h14c3975_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/mistune-0.8.3-py27h14c3975_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/mysqlclient-1.3.14-py27h7b6447c_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/ninja-1.8.2-py27h6bb024c_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/olefile-0.45.1-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/pandocfilters-1.4.2-py27_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/path.py-11.0.1-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/ptyprocess-0.6.0-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/pyasn1-0.4.3-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/pycosat-0.6.3-py27h14c3975_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/pycparser-2.18-py27_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/pycrypto-2.6.1-py27h14c3975_9.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/pyparsing-2.2.0-py27_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/pysocks-1.6.8-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/pytz-2018.5-py27_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/pyyaml-3.12-py27_1.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/pyzmq-16.0.2-py27_2.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/qt-5.6.2-3.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/qtconsole-4.3.1-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/readline-6.2-0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/redis-3.2.0-0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/requests-2.18.4-py27_1.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/resampy-0.2.0-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/ruamel_yaml-0.11.14-py27_1.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/scandir-1.6-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/scikit-learn-0.19.0-py27_blas_openblas_201.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/scipy-0.19.1-py27_blas_openblas_202.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/setuptools-36.3.0-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/simplegeneric-0.8.1-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/simplejson-3.11.1-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/singledispatch-3.4.0.3-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/sip-4.18-py27_1.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/six-1.11.0-py27_1.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/snowballstemmer-1.2.1-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/sphinx-1.6.4-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/main/linux-64/sphinxcontrib-1.0-py27h1512b58_1.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/sphinxcontrib-websupport-1.0.1-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.13.0-1.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/ssl_match_hostname-3.5.0.1-py27_1.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/subprocess32-3.2.7-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/tensorflow-1.3.0-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/terminado-0.6-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/testpath-0.3.1-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/tk-8.5.19-2.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/tornado-4.5.2-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/traitlets-4.3.2-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/traits-4.6.0-py27_1.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/typing-3.6.2-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/urllib3-1.22-py27_0.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/wcwidth-0.1.7-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/webencodings-0.5-py27_0.tar.bz2 -https://conda.anaconda.org/conda-forge/noarch/werkzeug-0.12.2-py_1.tar.bz2 -https://conda.anaconda.org/conda-forge/noarch/wheel-0.30.0-py_1.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/widgetsnbextension-3.0.3-py27_2.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/x264-20131217-3.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/xorg-libxau-1.0.8-3.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/xorg-libxdmcp-1.1.2-3.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/xz-5.2.3-0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/yaafe-0.70-py27_2.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/yaml-0.1.6-0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/zeromq-4.2.1-1.tar.bz2 -https://repo.continuum.io/pkgs/free/linux-64/zlib-1.2.8-3.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/pyzmq-17.0.0-py27h14c3975_3.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/qt-5.9.6-h52aff34_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/ruamel_yaml-0.15.42-py27h14c3975_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/scandir-1.7-py27h14c3975_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/send2trash-1.5.0-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/simplegeneric-0.8.1-py27_2.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/simplejson-3.16.0-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/sip-4.19.8-py27hf484d3e_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/six-1.11.0-py27_1.tar.bz2 +https://repo.anaconda.com/pkgs/free/linux-64/snowballstemmer-1.2.1-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/sphinxcontrib-1.0-py27_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/subprocess32-3.5.2-py27h14c3975_0.tar.bz2 +https://conda.anaconda.org/conda-forge/noarch/termcolor-1.1.0-py_2.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/traits-4.6.0-py27h470a237_2.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/typing-3.6.4-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/wcwidth-0.1.7-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/webencodings-0.5.1-py27_1.tar.bz2 +https://conda.anaconda.org/conda-forge/noarch/werkzeug-0.14.1-py_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/yaafe-0.70-py27h0bee7d0_1.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/youtube-dl-2019.2.8-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/zope-1.0-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/noarch/absl-py-0.3.0-py_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/automat-0.7.0-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/babel-2.6.0-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/backports.shutil_get_terminal_size-1.0.0-py27_2.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/backports.weakref-1.0.post1-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/cffi-1.11.5-py27h9745a5d_0.tar.bz2 +https://repo.anaconda.com/pkgs/free/linux-64/configparser-3.5.0-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/cycler-0.10.0-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/html5lib-1.0.1-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/hyperlink-18.0.0-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/jsonschema-2.6.0-py27_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/llvmlite-0.24.0-py27hdbcaa40_0.tar.bz2 +https://repo.anaconda.com/pkgs/free/linux-64/networkx-1.11-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/packaging-17.1-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/pathlib2-2.3.2-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/pexpect-4.6.0-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/pillow-5.2.0-py27heded4f4_0.tar.bz2 +https://repo.anaconda.com/pkgs/free/linux-64/prompt_toolkit-1.0.15-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/protobuf-3.5.2-py27hf484d3e_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/pyasn1-modules-0.2.2-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/pyqt-5.9.2-py27h22d08a2_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/python-dateutil-2.7.3-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/setuptools-39.2.0-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/singledispatch-3.4.0.3-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/sphinxcontrib-websupport-1.1.0-py27_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/ssl_match_hostname-3.5.0.1-py27_2.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/traceback2-1.4.0-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/free/linux-64/traitlets-4.3.2-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/noarch/uritemplate-3.0.0-py_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/backports.functools_lru_cache-1.5-py27_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/bleach-2.1.3-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/cryptography-2.2.2-py27h14c3975_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/entrypoints-0.2.3-py27_2.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/grpcio-1.12.1-py27hdbcaa40_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/jinja2-2.10-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/jupyter_core-4.4.0-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/free/linux-64/pickleshare-0.7.4-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/pygments-2.2.0-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/testpath-0.3.1-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/tornado-5.0.2-py27h14c3975_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/unittest2-1.1.0-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/wheel-0.31.1-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/zope.interface-4.5.0-py27h14c3975_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/ipython-5.7.0-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/jupyter_client-5.2.3-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/nbformat-4.4.0-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/pip-18.0-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/pyopenssl-18.0.0-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/noarch/python-coreschema-0.0.4-py_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/terminado-0.8.1-py27_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/ipykernel-4.8.2-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/nbconvert-5.3.1-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/pbr-4.0.4-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/service_identity-17.0.0-py27h28b3542_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/urllib3-1.23-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/jupyter_console-5.2.0-py27_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/mock-2.0.0-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/free/linux-64/qtconsole-4.3.1-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/requests-2.19.1-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/twisted-18.4.0-py27h14c3975_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/conda-4.6.3-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/prometheus_client-0.2.0-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/noarch/python-coreapi-2.3.3-py_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/sphinx-1.7.5-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/notebook-5.6.0-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/widgetsnbextension-3.2.1-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/ipywidgets-7.2.1-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/noarch/jupyter-1.0.0-py_1.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/aubio-0.4.6-py27h7273d18_2.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/h5py-2.8.0-py27hb794570_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/matplotlib-2.2.2-py27hb69df0a_2.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/mkl_fft-1.0.4-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/mkl_random-1.0.1-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/numpy-1.14.2-py27hdbf6ddf_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/numba-0.39.0-py27h04863e7_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/numexpr-2.6.5-py27hedc7406_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/pandas-0.23.3-py27hf8a1672_1.tar.bz2 +https://conda.anaconda.org/soumith/linux-64/pytorch-0.4.1-py27_cuda9.0.176_cudnn7.1.2_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/scipy-1.1.0-py27hc49cb51_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/tensorboard-1.9.0-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/pytables-3.4.4-py27h4f72b40_1.tar.bz2 +https://conda.anaconda.org/conda-forge/noarch/resampy-0.2.1-py_1.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/scikit-learn-0.19.1-py27hedc7406_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/tensorflow-1.9.0-py27_0.tar.bz2 +https://repo.anaconda.com/pkgs/main/linux-64/torchvision-0.2.1-py27_0.tar.bz2 +https://conda.anaconda.org/conda-forge/noarch/librosa-0.6.1-py_1.tar.bz2 diff --git a/environment-pinned.yml b/environment-pinned.yml index 3d22cd15..b28191ad 100644 --- a/environment-pinned.yml +++ b/environment-pinned.yml @@ -26,10 +26,10 @@ dependencies: - blosc=1.14.3=hdbcaa40_0 - bzip2=1.0.6=h14c3975_5 - ca-certificates=2019.1.23=0 - - certifi=2019.3.9=py27_0 + - certifi=2018.11.29=py27_0 - cffi=1.11.5=py27h9745a5d_0 - chardet=3.0.4=py27_1 - - conda=4.6.12=py27_1 + - conda=4.6.3=py27_0 - conda-env=2.6.0=1 - configparser=3.5.0=py27_0 - constantly=15.1.0=py27h28b3542_0 @@ -75,15 +75,13 @@ dependencies: - ipywidgets=7.2.1=py27_0 - itypes=1.1.0=py_0 - jinja2=2.10=py27_0 - - joblib=0.13.2=py27_0 + - joblib=0.12=py27_0 - jpeg=9b=h024ee3a_2 - jsonschema=2.6.0=py27_1 - jupyter=1.0.0=py_1 - jupyter_client=5.2.3=py27_0 - jupyter_console=5.2.0=py27_1 - jupyter_core=4.4.0=py27_0 - - jupyterlab=0.33.11=py27_0 - - jupyterlab_launcher=0.11.2=py27h28b3542_0 - kiwisolver=1.0.1=py27hf484d3e_0 - lapack=3.6.1=1 - libedit=3.1.20170329=h6b74fdf_2 @@ -99,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.3=py_0 + - librosa=0.6.1=py_1 - libsndfile=1.0.28=hfc679d8_0 - libsodium=1.0.16=h1bed415_0 - libstdcxx-ng=7.2.0=hdf63c60_3 @@ -135,7 +133,7 @@ dependencies: - numpy=1.14.2=py27hdbf6ddf_1 - olefile=0.45.1=py27_0 - openblas=0.2.20=4 - - openssl=1.0.2r=h7b6447c_0 + - openssl=1.0.2p=h14c3975_0 - packaging=17.1=py27_0 - pandas=0.23.3=py27hf8a1672_1 - pandoc=2.2.1=h629c226_0 @@ -164,6 +162,8 @@ dependencies: - pysocks=1.6.8=py27_0 - pytables=3.4.4=py27h4f72b40_1 - python=2.7.15=h1571d57_0 + - python-coreapi=2.3.3=py_0 + - python-coreschema=0.0.4=py_0 - python-dateutil=2.7.3=py27_0 - pytorch=0.4.1=py27_cuda9.0.176_cudnn7.1.2_1 - pytz=2018.5=py27_0 @@ -233,7 +233,7 @@ dependencies: - billiard==3.3.0.23 - celery==3.1.26.post2 - deezer-python==0.6.1 - - django==1.10 + - django==1.9.13 - django-bootstrap-pagination==1.6.4 - django-bootstrap3==10.0.1 - django-bower==5.2.0 @@ -242,8 +242,7 @@ dependencies: - django-debug-toolbar==1.9.1 - django-environ==0.4.5 - django-extensions==2.1.0 - - django-filter==1.1.0 - - djangorestframework==3.7.0 + - djangorestframework==3.6.4 - essentia==2.1b5.dev416 - ghp-import==0.5.5 - jsonfield==2.0.2 @@ -251,6 +250,7 @@ dependencies: - kombu==3.0.37 - lesscpy==0.13.0 - mutagen==1.41.1 + - mysql-python==1.2.5 - pathtools==0.1.2 - ply==3.11 - py-sonicvisualiser==0.3 @@ -261,5 +261,4 @@ dependencies: - uwsgi==2.0.17.1 - vamp==1.1.0 - watchdog==0.8.3 - - xmljson==0.2.0 prefix: /opt/miniconda From bc984bdafbdae5f2839252584e61da0972c413f9 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 1 Jul 2019 12:58:03 +0200 Subject: [PATCH 6/7] 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, From 66874c9d35026c80d169505e7377e4b4d1c55114 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 1 Jul 2019 19:06:27 +0200 Subject: [PATCH 7/7] use /srv/static for bower modules --- app/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/settings.py b/app/settings.py index ddb598f6..cd7d1847 100644 --- a/app/settings.py +++ b/app/settings.py @@ -217,7 +217,7 @@ from worker import app -BOWER_COMPONENTS_ROOT = '/srv/bower/' +BOWER_COMPONENTS_ROOT = '/srv/static/' BOWER_PATH = '/usr/local/bin/bower' BOWER_INSTALLED_APPS = ( 'jquery#2.2.4',