Fix pull

diff --git a/.gitignore b/.gitignore
index 1bc9b49ec7152fd5501aed08daffc9b15b45d12f..a3c2995a6e73980310533b35f8b407c40338941a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,10 @@ develop-eggs
 .installed.cfg
 *.directory
 app/.init
+tmp
+dist
+doc/output/
+doc/pelican-plugins/
 
 # Installer logs
 pip-log.txt

diff --git a/.travis.yml b/.travis.yml
index c88814cef94d426f6848764823d2b774a48a6ca4..b0a02e4a8d18527567a762143392adcc2663c1b8 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,8 @@ install:
   - docker-compose build
 
 script:
+  - docker-compose run app conda list
+  - docker-compose run app pytest /srv/src/telemeta/telemeta
   - docker-compose up -d
   - sleep 60
   - curl --fail --retry 10 --retry-delay 5  -v $(docker-compose port nginx 80)

diff --git a/Dockerfile b/Dockerfile
index 38ff4935382083ed1ad63337d582b69b491d5de8..5480650d34316e43ef531a33669de92fdadf08a8 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,13 +30,14 @@ RUN chown www-data:www-data $PYTHON_EGG_CACHE
 COPY . /srv/src/telemeta
 WORKDIR /srv/src/telemeta
 
-RUN pip install -r requirements.txt
-RUN pip install -r requirements-dev.txt --src /srv/src
-
 # Install Timeside and plugins from ./lib
 COPY ./app/scripts/setup_plugins.sh /srv/app/scripts/setup_plugins.sh
 COPY ./lib/ /srv/src/plugins/
 RUN /bin/bash /srv/app/scripts/setup_plugins.sh
 
+# Install Telemeta
+RUN pip install -r requirements.txt
+RUN pip install -r requirements-dev.txt --src /srv/src
+
 WORKDIR /srv/app
 EXPOSE 8000

diff --git a/README.rst b/README.rst
index 2302f801370eef3f68d769e15cb3dd6091ec60c5..89cad7442d6b34fb207c9f1061c2731ba488e004 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -43,10 +43,6 @@ The *Telemeta* name stands for *Tele* as "remote access" and *meta* for "metadat
    :target: https://pypi.python.org/pypi/Telemeta/
    :alt: Version
 
-.. |downloads| image:: https://img.shields.io/pypi/dm/telemeta.svg
-   :target: https://pypi.python.org/pypi/Telemeta/
-   :alt: Downloads
-
 .. |travis_master| image:: https://secure.travis-ci.org/Parisson/Telemeta.png?branch=master
    :target: https://travis-ci.org/Parisson/Telemeta/
    :alt: Travis
@@ -70,6 +66,16 @@ Thank you so much for your help!
 
 News
 =====
+1.6.4
++++++
+   * Minor bug fixes and improvments
+   * Fix HTML5 audio compatibility (#173) for the web audio player. The SoundManager Flash player fallback should not be used in most modern web browser. Media files are now serves through Nginx (#155) which enables to stream music with byte range requests.
+   * Add a User permission "can_run_analysis" to specify that a user or a group of users has the right to list and select advanced Timeside analysis to be displayed in the Timeside web audio player.
+   * Add enumeration management and statitics
+   * Improved media security allowing streaming through Nginx only from the application
+   * Add TimeSide as a submodule
+   * Add a validator for Corpus and Fonds
+   * Upgrade various dependencies
 
 1.6
 ++++