Browse Source

Merge branch 'mh/demopy3'

master
Maik Hoepfel 11 years ago
parent
commit
a20990611b

+ 5
- 3
.travis.yml View File

11
     secure: FuIlzEsGJiAwhaIRBmRNsq9eXmuzs25fX6BChknW4lDyVAySWMp0+Zps9Bd0JgfFYUG3Ip+OTmksYIoTUsG25ZJS9cq1IFt3QKUAN70YCI/4ZBLeIdICPEyxq+Km179+NeEXmBUug17RLMLxh3MWfO+RKUHK9yHIPNNpq0dNyoo=
11
     secure: FuIlzEsGJiAwhaIRBmRNsq9eXmuzs25fX6BChknW4lDyVAySWMp0+Zps9Bd0JgfFYUG3Ip+OTmksYIoTUsG25ZJS9cq1IFt3QKUAN70YCI/4ZBLeIdICPEyxq+Km179+NeEXmBUug17RLMLxh3MWfO+RKUHK9yHIPNNpq0dNyoo=
12
   matrix:
12
   matrix:
13
     - DJANGO=Django==1.6.5
13
     - DJANGO=Django==1.6.5
14
-    - DJANGO=https://www.djangoproject.com/download/1.7c2/tarball/
14
+    - DJANGO=https://www.djangoproject.com/download/1.7c2/tarball/#egg=Django
15
 
15
 
16
 matrix:
16
 matrix:
17
   allow_failures:
17
   allow_failures:
18
-    - python: '3.3'
19
-    - python: '3.4'
18
+    - env: "DJANGO=Django==1.6.5"
19
+      python: '3.3'
20
+    - env: "DJANGO=Django==1.6.5"
21
+      python: '3.4'
20
 
22
 
21
 install:
23
 install:
22
   - easy_install $DJANGO
24
   - easy_install $DJANGO

+ 5
- 4
docs/source/releases/v0.8.rst View File

37
 Compatibility
37
 Compatibility
38
 -------------
38
 -------------
39
 
39
 
40
-Oscar 0.8 drops supports for Django 1.5, and is compatible with Django 1.6 and
41
-Django 1.7.
40
+This release adds support for Django 1.7. Per our policy of always supporting
41
+two versions of Django, support for Django 1.5 has been dropped.
42
 
42
 
43
-Support for Python 2.6 has been dropped; Oscar works with Python 2.7, 3.3
44
-and 3.4.
43
+This release also adds full Python 3.3 and 3.4 support. But due to South
44
+not supporting Python 3, Python 3 support is only supported in combination
45
+with Django 1.7 and it's new migration framework.
45
 
46
 
46
 .. _new_in_0.8:
47
 .. _new_in_0.8:
47
 
48
 

+ 2
- 2
requirements_demo.txt View File

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

+ 1
- 1
requirements_vagrant.txt View File

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

+ 3
- 0
sites/sandbox/settings_mysql.py View File

1
+import pymysql
2
+pymysql.install_as_MySQLdb()
3
+
1
 from settings import *
4
 from settings import *
2
 
5
 
3
 DATABASES = {
6
 DATABASES = {

Loading…
Cancel
Save