Merge branch 'master' of https://github.com/okfn/goodtables-web

frictionlessdata · Aug 28, 2015 · 5fe41db · 5fe41db
2 parents 0c886e9 + 8b5382c
commit 5fe41db
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,8 @@ python:
   - 3.4
 
 install:
+  - pip install --upgrade -r requirements/base.txt
+  - pip install --upgrade -r requirements/local.txt  
   - pip install --upgrade -r requirements/test.txt
   - pip install coveralls
 

diff --git a/requirements.txt b/requirements.txt
@@ -1 +1 @@
--r requirements/local.txt
+-r requirements/base.txt
diff --git a/requirements/local.txt b/requirements/local.txt
@@ -1,4 +1,2 @@
--r base.txt
-
 ipython
 ipdb
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -1,5 +1,3 @@
--r base.txt
-
 coverage
 pytest
 pytest-cov

diff --git a/shippable.yaml b/shippable.yaml
@@ -6,6 +6,8 @@ python:
   - 3.4
 
 install:
+  - pip install --upgrade -r requirements/base.txt
+  - pip install --upgrade -r requirements/local.txt  
   - pip install --upgrade -r requirements/test.txt
 
 before_script: