Skip to content

Commit fd9a6af

Browse files
committed
Merge pull request fossasia#317 from shivamMg/req-fix
Segregate requirements
2 parents 960e39a + 91d6611 commit fd9a6af

File tree

8 files changed

+26
-23
lines changed

8 files changed

+26
-23
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ language: python
22
python:
33
- "2.7"
44
# command to install dependencies
5-
install: "pip install -r requirements.txt"
5+
install: "pip install -r requirements/tests.txt"
66
# command to run tests
77
script: nosetests --with-coverage
88
# upload coverage

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ USER root
4141

4242
RUN export DATABASE_URL=postgresql://open_event_user:start@localhost:5432/test
4343
#install dependencies
44-
RUN pip install -r requirements.txt
44+
RUN pip install -r requirements/prod.txt
4545
#create db
4646
RUN python create_db.py
4747
#set environment

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Now you are inside a synced up copy of the project directory. if you do `ls`, th
9292
* Before running the app , install the requirements from
9393
requirements.txt .
9494
```
95-
pip install -r requirements.txt
95+
pip install -r requirements/dev.txt
9696
```
9797
* Time to run the app, if the DB migrations went well, then doing this will be okay
9898
```

install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export DATABASE_URL=postgresql://$APP_DB_USER:$APP_DB_PASS@localhost:5432/$APP_D
114114
cd /vagrant
115115
#Flask
116116
echo "Installing requirements"
117-
pip install -r requirements.txt
117+
pip install -r requirements/dev.txt
118118

119119
python create_db.py
120120

requirements.txt renamed to requirements/common.txt

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,3 @@ xlrd
2121
mock
2222
SQLAlchemy-Utils
2323
cryptography==1.3.2
24-
25-
# these prevent SSL warnings in urllib3
26-
pyopenssl
27-
ndg-httpsclient
28-
pyasn1
29-
30-
# dev
31-
livereload==2.4.1
32-
nose==1.3.7
33-
coverage==4.0.3
34-
pylint==1.5.5
35-
pep8==1.7.0
36-
glob2==0.4.1
37-
coveralls==1.1.0
38-
codeclimate-test-reporter==0.1.1
39-
40-
# deploy
41-
gunicorn==19.5.0
42-
Fabric==1.11.1

requirements/dev.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
-r common.txt
2+
3+
nose==1.3.7
4+
livereload==2.4.1
5+
glob2==0.4.1
6+
7+
pylint==1.5.5
8+
pep8==1.7.0
9+
10+
# these prevent SSL warnings in urllib3
11+
pyopenssl
12+
ndg-httpsclient
13+
pyasn1

requirements/prod.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-r common.txt
2+
3+
gunicorn==19.5.0
4+
Fabric==1.11.1

requirements/tests.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
-r dev.txt
2+
3+
coverage==4.0.3
4+
coveralls==1.1.0
5+
codeclimate-test-reporter==0.1.1

0 commit comments

Comments
 (0)