Support for Django 1.7, migrations included.

Dropping support and tests for Django 1.5.x.
matagus · May 15, 2015 · 07b431d · 07b431d
1 parent e279600
commit 07b431d
Show file tree

Hide file tree

Showing 18 changed files with 504 additions and 283 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,24 +6,22 @@ python:
     - "3.4"
 
 env:
-    - DJANGO="django==1.5.1 --use-mirrors"
-    - DJANGO="django==1.6.9 --use-mirrors"
+    - REQUIREMENTS="Django==1.6.9 South==1.0"
+    - REQUIREMENTS="Django==1.7.7"
 
 cache: pip
 
 install:
-    - pip install $DJANGO
+    - pip install $REQUIREMENTS
     - pip install django-tagging
     - pip install django-pagination-py3
     - pip install feedparser
-    - pip install south
     - pip install pinax-theme-bootstrap
     - pip install beautifulsoup4
     - pip install coverage==3.6
     - pip install python-coveralls==2.4.0
     - pip install factory-boy==2.5.0
     - pip install mock
-    - pip install django-discover-runner
     - export PYTHONPATH=.
 
 before_script: coverage erase

diff --git a/planet/__init__.py b/planet/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-VERSION = (0, 7, 6, "f") # following PEP 386
+VERSION = (0, 8, 0, "f") # following PEP 386
 
 def get_version():
     version = "%s.%s" % (VERSION[0], VERSION[1])

diff --git a/planet/migrations/0001_initial.py b/planet/migrations/0001_initial.py
diff --git a/planet/south_migrations/0001_initial.py b/planet/south_migrations/0001_initial.py
diff --git a/...rations/0002_auto__chg_field_post_guid.py → ...rations/0002_auto__chg_field_post_guid.py b/...rations/0002_auto__chg_field_post_guid.py → ...rations/0002_auto__chg_field_post_guid.py
diff --git a/...grations/0003_auto__chg_field_post_url.py → ...grations/0003_auto__chg_field_post_url.py b/...grations/0003_auto__chg_field_post_url.py → ...grations/0003_auto__chg_field_post_url.py
diff --git a/...0004_auto__chg_field_post_date_created.py → ...0004_auto__chg_field_post_date_created.py b/...0004_auto__chg_field_post_date_created.py → ...0004_auto__chg_field_post_date_created.py
diff --git a/..._add_category__add_field_feed_category.py → ..._add_category__add_field_feed_category.py b/..._add_category__add_field_feed_category.py → ..._add_category__add_field_feed_category.py
diff --git a/...0006_auto__chg_field_generator_version.py → ...0006_auto__chg_field_generator_version.py b/...0006_auto__chg_field_generator_version.py → ...0006_auto__chg_field_generator_version.py
diff --git a/planet/migrations/0007_migrate_guids.py → ...et/south_migrations/0007_migrate_guids.py b/planet/migrations/0007_migrate_guids.py → ...et/south_migrations/0007_migrate_guids.py
diff --git a/...rations/0008_auto__chg_field_feed_guid.py → ...rations/0008_auto__chg_field_feed_guid.py b/...rations/0008_auto__chg_field_feed_guid.py → ...rations/0008_auto__chg_field_feed_guid.py
diff --git a/...rations/0009_auto__chg_field_post_guid.py → ...rations/0009_auto__chg_field_post_guid.py b/...rations/0009_auto__chg_field_post_guid.py → ...rations/0009_auto__chg_field_post_guid.py
diff --git a/...t/migrations/0009_drop_feed_guid_index.py → ...h_migrations/0009_drop_feed_guid_index.py b/...t/migrations/0009_drop_feed_guid_index.py → ...h_migrations/0009_drop_feed_guid_index.py
diff --git a/...t/migrations/0010_add_field_blog_owner.py → ...h_migrations/0010_add_field_blog_owner.py b/...t/migrations/0010_add_field_blog_owner.py → ...h_migrations/0010_add_field_blog_owner.py
diff --git a/planet/south_migrations/__init__.py b/planet/south_migrations/__init__.py
diff --git a/requirements.txt b/requirements.txt
@@ -1,9 +1,8 @@
-Django>=1.5
+Django>=1.6,<1.8
 django-tagging
 django-pagination
 feedparser
-south
 pinax-theme-bootstrap==3.0a4
 beautifulsoup4
-celery>=3.0.0
-django-celery
+celery==3.1.18
+django-celery==3.1.16
diff --git a/testsettings.py b/testsettings.py
@@ -17,7 +17,7 @@
     },
 }
 
-INSTALLED_APPS = (
+INSTALLED_APPS = [
     'django.contrib.sites',
     'django.contrib.contenttypes',
     'django.contrib.auth',
@@ -26,15 +26,15 @@
     'tagging',
     'pagination',
     'planet',
-)
+]
 
 SECRET_KEY = 'abcde12345'
 
 SITE_ID = 1
 
 if django.VERSION[:2] < (1, 6):
     # Since 1.6 version Django comes with discover_runner builtin!
-    INSTALLED_APPS += ('discover_runner', )
+    INSTALLED_APPS += ('discover_runner', 'south')
     TEST_RUNNER = 'discover_runner.DiscoverRunner'
 
 TEMPLATE_CONTEXT_PROCESSORS = (

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27d15, py27d16, py34d15, py34d16
+envlist = py27d16, py34d16, py27d17, py34d17
 
 [testenv]
 skipsdist=True
@@ -8,44 +8,44 @@ deps =
   django-tagging
   django-pagination-py3
   feedparser
-  South
   beautifulsoup4
-  django-discover-runner
   mock
   factory-boy
 
 # Python 2.7
 
-[testenv:py27d15]
+[testenv:py27d16]
 basepython = python2.7
 deps =
-  Django>=1.5,<1.6
+  Django>=1.6,<1.7
+  South==1.0
   {[testenv]deps}
 usedevelop = True
-recreate=False
+recreate = False
 
-[testenv:py27d16]
+[testenv:py27d17]
 basepython = python2.7
 deps =
-  Django>=1.6,<1.7
+  Django>=1.7,<1.8
   {[testenv]deps}
 usedevelop = True
-recreate=False
+recreate = False
 
 # Python 3.4
 
-[testenv:py34d15]
+[testenv:py34d16]
 basepython = python3.4
 deps =
-  Django>=1.5,<1.6
+  Django>=1.6,<1.7
+  South==1.0
   {[testenv]deps}
 usedevelop = True
-recreate=False
+recreate = False
 
-[testenv:py34d16]
+[testenv:py34d17]
 basepython = python3.4
 deps =
-  Django>=1.6,<1.7
+  Django>=1.7,<1.8
   {[testenv]deps}
 usedevelop = True
-recreate=False
+recreate = False