From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 19 Oct 2017 13:12:39 +0000 (+0200)
Subject: Merge branch 'dev' into release/1.7
X-Git-Tag: 1.7.0~2^2~16
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b5e48f2fb86b7f0c5b26ca5b0afec88315cf5ef7;p=telemeta.git

Merge branch 'dev' into release/1.7
---

b5e48f2fb86b7f0c5b26ca5b0afec88315cf5ef7
diff --cc requirements.txt
index 2c584b27,5230cd71..00f7aed8
--- a/requirements.txt
+++ b/requirements.txt
@@@ -3,7 -3,13 +3,13 @@@
  setuptools
  wheel
  -e .
+ 
  # Tests
 -pytest-django==2.9
 +pytest-django==3.1.2
  pytest-cov
  factory-boy
+ 
+ #doc
+ pelican
+ pdoc
+ ghp-import