Merge branch 'mh/demopy3'

.travis.yml

@@ -11,12 +11,14 @@ env:
     secure: FuIlzEsGJiAwhaIRBmRNsq9eXmuzs25fX6BChknW4lDyVAySWMp0+Zps9Bd0JgfFYUG3Ip+OTmksYIoTUsG25ZJS9cq1IFt3QKUAN70YCI/4ZBLeIdICPEyxq+Km179+NeEXmBUug17RLMLxh3MWfO+RKUHK9yHIPNNpq0dNyoo=
   matrix:
     - DJANGO=Django==1.6.5
-    - DJANGO=https://www.djangoproject.com/download/1.7c2/tarball/
+    - DJANGO=https://www.djangoproject.com/download/1.7c2/tarball/#egg=Django
 
 matrix:
   allow_failures:
-    - python: '3.3'
-    - python: '3.4'
+    - env: "DJANGO=Django==1.6.5"
+      python: '3.3'
+    - env: "DJANGO=Django==1.6.5"
+      python: '3.4'
 
 install:
   - easy_install $DJANGO

docs/source/releases/v0.8.rst

@@ -37,11 +37,12 @@ availability logic now needs to be handled with strategies.
 Compatibility
 -------------
 
-Oscar 0.8 drops supports for Django 1.5, and is compatible with Django 1.6 and
-Django 1.7.
+This release adds support for Django 1.7. Per our policy of always supporting
+two versions of Django, support for Django 1.5 has been dropped.
 
-Support for Python 2.6 has been dropped; Oscar works with Python 2.7, 3.3
-and 3.4.
+This release also adds full Python 3.3 and 3.4 support. But due to South
+not supporting Python 3, Python 3 support is only supported in combination
+with Django 1.7 and it's new migration framework.
 
 .. _new_in_0.8:
 

requirements_demo.txt

@@ -1,7 +1,7 @@
 # Oscar extensions
 django-oscar-stores==0.5.1
-django-oscar-paypal==0.8
-django-oscar-datacash==0.8.2
+django-oscar-paypal==0.9.1
+django-oscar-datacash==0.8.3
 
 # We need PostGIS as the stores extension uses GeoDjango.
 psycopg2==2.5.1

requirements_vagrant.txt

@@ -1,2 +1,2 @@
-MySQL-python==1.2.5
+PyMySQL==0.6.2
 psycopg2==2.4.5

sites/sandbox/settings_mysql.py

@@ -1,3 +1,6 @@
+import pymysql
+pymysql.install_as_MySQLdb()
+
 from settings import *
 
 DATABASES = {