summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYohann Lepage <yohann@lepage.info>2015-04-01 21:06:20 (GMT)
committerYohann Lepage <yohann@lepage.info>2015-04-01 21:21:55 (GMT)
commita1588e5b47147803b3a2eb9c7c13d2b09653462b (patch)
tree5478ab0c7e3a8fe6ab0cb6a7d0e74360b9f26e5b
parent7565910bf952366c074d547bd3ff8ce8fa900a19 (diff)
downloaddjango-import-export-a1588e5b47147803b3a2eb9c7c13d2b09653462b.zip
django-import-export-a1588e5b47147803b3a2eb9c7c13d2b09653462b.tar.gz
django-import-export-a1588e5b47147803b3a2eb9c7c13d2b09653462b.tar.bz2
Bump to Django 1.8
-rw-r--r--.travis.yml2
-rw-r--r--tox.ini6
2 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 30ed028..71de561 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ env:
- DJANGO=1.5.5
- DJANGO=1.6.1
- DJANGO=1.7.0
- - DJANGO=1.8c1
+ - DJANGO=1.8
install:
- pip install -q Django==$DJANGO --use-mirrors
- pip install -e git+https://github.com/kennethreitz/tablib.git#egg=tablib
diff --git a/tox.ini b/tox.ini
index e4534c9..babf6f5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -64,16 +64,16 @@ deps =
[testenv:py27-1.8]
basepython = python2.7
deps =
- django==1.8c1
+ django==1.8
[testenv:py33-1.8]
basepython = python3.3
deps =
- django==1.8c1
+ django==1.8
-egit+https://github.com/kennethreitz/tablib.git#egg=tablib
[testenv:py34-1.8]
basepython = python3.4
deps =
- django==1.8c1
+ django==1.8
-egit+https://github.com/kennethreitz/tablib.git#egg=tablib