Merge branch 'dev' into wasabi

Author: yomguy

conda-environment.yml

@@ -7,6 +7,8 @@ dependencies:
   - h5py
   - jsonschema
   - jupyter
+  - jupyterhub
+  - jupyterlab
   - librosa
   - matplotlib
   - mysqlclient

docker-compose.yml

@@ -53,7 +53,6 @@ app:
     - ./app:/srv/app
     - ./timeside:/srv/lib/timeside/timeside
     - ./lib/plugins:/srv/lib/plugins
-    - ./etc/apt/sources.list:/etc/apt/sources.list
   volumes_from:
     - var
   env_file:
@@ -81,5 +80,3 @@ worker:
   links:
     - broker
     - db
-  #mac_address: 02:42:ac:11:00:07
-  # user: www-data

env/jupyterhub.yml

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (c) 2015-2016 Parisson SARL
+
+# This file is part of Telemeta.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+
+# TimeSide is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with TimeSide.  If not, see <http://www.gnu.org/licenses/>.
+
+# Authors:
+# Guillaume Pellerin <yomguy@parisson.com>
+# Thomas Fillon <thomas@parisson.com>
+
+tensorboard:
+  image: parisson/timeside:latest-dev
+  #build: .
+  ports:
+    - "8889:8000"
+  volumes_from:
+    - app
+  command: sh -c "cd /srv/lib/timeside/docs/ipynb; jupyterhub"

env/nginx.yml

@@ -2,7 +2,7 @@
 nginx:
   image: nginx
   ports:
-    - "8030:80"
+    - "8000:80"
   volumes:
     - ./etc/nginx.conf:/etc/nginx/conf.d/default.conf
   volumes_from:

env/tensorboard.yml

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (c) 2015-2016 Parisson SARL
+
+# This file is part of Telemeta.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+
+# TimeSide is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with TimeSide.  If not, see <http://www.gnu.org/licenses/>.
+
+# Authors:
+# Guillaume Pellerin <yomguy@parisson.com>
+# Thomas Fillon <thomas@parisson.com>
+
+tensorboard:
+  image: parisson/timeside:latest-dev
+  #build: .
+  ports:
+    - "6006:6006"
+  volumes_from:
+    - app
+  command: sh -c "cd /srv/lib/timeside/docs/ipynb; tensorboard --logdir=."

environment-pinned.yml

@@ -25,11 +25,11 @@ dependencies:
   - bleach=2.1.3=py27_0
   - blosc=1.14.3=hdbcaa40_0
   - bzip2=1.0.6=h14c3975_5
-  - ca-certificates=2018.03.07=0
-  - certifi=2018.4.16=py27_0
+  - ca-certificates=2019.1.23=0
+  - certifi=2019.3.9=py27_0
   - cffi=1.11.5=py27h9745a5d_0
   - chardet=3.0.4=py27_1
-  - conda=4.6.9=py27_0
+  - conda=4.6.12=py27_1
   - conda-env=2.6.0=1
   - configparser=3.5.0=py27_0
   - constantly=15.1.0=py27h28b3542_0
@@ -73,21 +73,24 @@ dependencies:
   - ipython=5.7.0=py27_0
   - ipython_genutils=0.2.0=py27_0
   - ipywidgets=7.2.1=py27_0
+  - itypes=1.1.0=py_0
   - jinja2=2.10=py27_0
-  - joblib=0.12=py27_0
+  - joblib=0.13.2=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
   - libffi=3.2.1=hd88cf55_4
   - libflac=1.3.1=0
   - libgcc=7.2.0=h69d50b8_2
-  - libgcc-ng=7.2.0=hdf63c60_3
+  - libgcc-ng=8.2.0=hdf63c60_1
   - libgfortran=3.0.0=1
   - libgfortran-ng=7.2.0=hdf63c60_3
   - libiconv=1.15=h63c8f33_5
@@ -118,7 +121,8 @@ dependencies:
   - mkl_random=1.0.1=py27_0
   - mock=2.0.0=py27_0
   - mpg123=1.25.8=hfc679d8_0
-  - mysql-python=1.2.5=py27_0
+  - mysql-connector-c=6.1.11=hf4847fb_0
+  - mysqlclient=1.3.14=py27h7b6447c_0
   - nbconvert=5.3.1=py27_0
   - nbformat=4.4.0=py27_0
   - nccl=1.3.5=cuda9.0_0
@@ -128,12 +132,10 @@ dependencies:
   - notebook=5.6.0=py27_0
   - numba=0.39.0=py27h04863e7_0
   - numexpr=2.6.5=py27hedc7406_0
-  - numpy=1.14.5=py27h1b885b7_4
-  - numpy-base=1.14.5=py27hdbf6ddf_4
+  - numpy=1.14.2=py27hdbf6ddf_1
   - olefile=0.45.1=py27_0
   - openblas=0.2.20=4
-  - openblas-devel=0.2.20=7
-  - openssl=1.0.2o=h20670df_0
+  - openssl=1.0.2r=h7b6447c_0
   - packaging=17.1=py27_0
   - pandas=0.23.3=py27hf8a1672_1
   - pandoc=2.2.1=h629c226_0
@@ -206,6 +208,7 @@ dependencies:
   - twisted=18.4.0=py27h14c3975_0
   - typing=3.6.4=py27_0
   - unittest2=1.1.0=py27_0
+  - uritemplate=3.0.0=py_1
   - urllib3=1.23=py27_0
   - wcwidth=0.1.7=py27_0
   - webencodings=0.5.1=py27_1
@@ -218,6 +221,7 @@ dependencies:
   - xz=5.2.4=h14c3975_4
   - yaafe=0.70=py27h0bee7d0_1
   - yaml=0.1.7=had09818_2
+  - youtube-dl=2019.2.8=py27_0
   - zeromq=4.2.5=hf484d3e_0
   - zlib=1.2.11=ha838bed_2
   - zope=1.0=py27_0