From 210c707775194ad9670a352710cb7017d38aea76 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Thu, 26 Feb 2015 21:36:22 +0100 Subject: [PATCH 1/3] Add versioned dependency on taggit to avoid issues in django 1.7 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 170b9e6..cc6bb14 100755 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ setup( install_requires=[ 'django-parler>=1.2', 'django-cms>=3.0', - 'django-taggit', + 'django-taggit>=0.12.2', 'django-filer', 'pytz', 'django-taggit-templatetags', From 4052fb3e8d20c21a40dfe36eb30d613b9f92ed84 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Tue, 17 Feb 2015 13:20:30 +0100 Subject: [PATCH 2/3] Removed Django 1.5 from supported version --- .travis.yml | 1 - README.rst | 1 - tox.ini | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4d01925..8cfccdb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ python: env: matrix: - - DJANGO='django15' - DJANGO='django16' - DJANGO='django17' diff --git a/README.rst b/README.rst index e527f47..bc8dff4 100644 --- a/README.rst +++ b/README.rst @@ -27,7 +27,6 @@ you encounter any issue, please open an issue. Supported Django versions: -* Django 1.5 * Django 1.6 * Django 1.7 diff --git a/tox.ini b/tox.ini index c6ca027..3c5d04f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,8 @@ [tox] -envlist = py{26}-django{15,16},py{27,33,34}-django{15,16,17} +envlist = py{26}-django{16},py{27,33,34}-django{16,17} [testenv] deps = - django15: Django>=1.5,<1.6 django16: Django>=1.6,<1.7 django17: Django>=1.7,<1.8 py26: unittest2 From d20a40c52ded209bc0ef87ddf9c0ce96db3e1927 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Thu, 26 Feb 2015 21:47:41 +0100 Subject: [PATCH 3/3] Use temporary django CMS branch for tests --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 3c5d04f..a82c3fa 100644 --- a/tox.ini +++ b/tox.ini @@ -5,6 +5,7 @@ envlist = py{26}-django{16},py{27,33,34}-django{16,17} deps = django16: Django>=1.6,<1.7 django17: Django>=1.7,<1.8 + django17: https://github.com/divio/django-cms/archive/support/3.0.x.zip py26: unittest2 py26: django-select2 py27: django-select2