Skip to content

Commit

Permalink
fix requirements path
Browse files Browse the repository at this point in the history
  • Loading branch information
areski committed Sep 30, 2015
1 parent deb26f0 commit a4f0cba
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
install:
# - pip install -q Django==$DJANGO --use-mirrors
- sudo apt-get install flite
- bash install/requirements/install.sh
- bash requirements/install.sh
# - pip install pep8 --use-mirrors
# - pip install https://github.com/dcramer/pyflakes/tarball/master
before_script:
Expand Down
8 changes: 4 additions & 4 deletions requirements/all.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-r basic-requirements.txt
-r django-requirements.txt
-r dev-requirements.txt
-r test-requirements.txt
-r basic.txt
-r django.txt
-r dev.txt
-r test.txt
8 changes: 4 additions & 4 deletions requirements/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,25 @@
#

echo "Install basic requirements..."
for line in $(cat install/requirements/basic-requirements.txt | grep -v \#)
for line in $(cat requirements/basic.txt | grep -v \#)
do
pip install $line --use-mirrors
done

echo "Install Django requirements..."
for line in $(cat install/requirements/django-requirements.txt | grep -v \#)
for line in $(cat requirements/django.txt | grep -v \#)
do
pip install $line --use-mirrors --allow-all-external --allow-unverified django-admin-tools
done

echo "Install Dev requirements..."
for line in $(cat install/requirements/dev-requirements.txt | grep -v \#)
for line in $(cat requirements/dev.txt | grep -v \#)
do
pip install $line
done

echo "Install test requirements..."
for line in $(cat install/requirements/test-requirements.txt | grep -v \#)
for line in $(cat requirements/test.txt | grep -v \#)
do
pip install $line --use-mirrors
done
4 changes: 2 additions & 2 deletions requirements/rtd.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
-r basic-requirements.txt
-r django-requirements.txt
-r basic.txt
-r django.txt

0 comments on commit a4f0cba

Please sign in to comment.