Skip to content

Commit c036ed3

Browse files
authored
Merge pull request #5 from Jakeway/update_requirements
Update project requirements and travis file
2 parents 288ac25 + 0504f51 commit c036ed3

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55
*.swp
66
*.egg*
77
*.un~
8-
.idea
8+
.idea
9+
build/

.travis.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,18 @@ language: python
22
python:
33
- 3.4
44
env:
5-
- DJANGO_VERSION=1.8.17
5+
- DJANGO_VERSION=1.7.11
6+
- DJANGO_VERSION=1.8.19
7+
- DJANGO_VERSION=1.9.13
8+
- DJANGO_VERSION=1.10.8
9+
- DJANGO_VERSION=1.11.17
10+
- DJANGO_VERSION=2.0.10
11+
- DJANGO_VERSION=2.1.4
612
install:
7-
# Install django/nose
8-
- pip install Django==$DJANGO_VERSION
9-
- pip install django-nose
13+
- pip install -r requirements.txt
14+
# Install dev requirements for testing
15+
- pip install -r dev_requirements.txt
1016
# Install cache helper
1117
- pip install -e .
12-
- pip install pylibmc
1318
script:
1419
- python test_project/manage.py test

dev_requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
django-nose

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Django >= 1.7

0 commit comments

Comments
 (0)