From 722971e854f3f16aa56095d8b32d8e06dfd91d2c Mon Sep 17 00:00:00 2001 From: Martin Mahner Date: Tue, 6 Sep 2016 14:31:30 +0200 Subject: [PATCH] Trying different version identifiers. Refs #82. --- .travis.yml | 8 ++++---- requirements.txt | 9 +++------ tox.ini | 8 ++++---- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index fa0db70..c85e366 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,15 +5,15 @@ python: - 3.5 env: - - DJANGO=1.8.* - - DJANGO=1.9.* - - DJANGO=1.10.* + - DJANGO: django>=1.8,<1.9 + - DJANGO: django>=1.9,<1.10 + - DJANGO: django>=1.10 before_install: - pip install codecov install: - - pip install django==$DJANGO + - pip install $DJANGO - pip install -e . script: diff --git a/requirements.txt b/requirements.txt index 0325e0b..7e459fc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ # ----------------------------------------------------------------------------- # Project dependencies -django==1.10.* +django>=1.10 django-mptt pygments requests @@ -16,10 +16,7 @@ tox docutils sphinx sphinx_rtd_theme -mysql-python # Deployment specific -django-redis==3.8.0 -gunicorn==19.1.1 -south==1.0.2 - +gunicorn +mysql-python diff --git a/tox.ini b/tox.ini index a7717a5..b19a3ae 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] toxworkdir=/tmp/tox/dpaste envlist= - py{27,35}-django-{18,19,110} + py{27,35}-django-{18,19,latest} [testenv] install_command = @@ -12,6 +12,6 @@ commands= deps= # Django versions - django-18: django==1.8.* - django-19: django==1.9.* - django-110: django==1.10.* + django-18: django>=1.8,<1.9 + django-19: django>=1.9,<1.10 + django-latest: django>=1.10