Browse Source

Add Python 3.4 to list of supported Python versions

Tests currently don't pass, but I'm hopeful they will in time for the
release of 0.8.
master
Maik Hoepfel 11 years ago
parent
commit
52486f1e5d
3 changed files with 16 additions and 1 deletions
  1. 2
    0
      .travis.yml
  2. 3
    0
      docs/source/releases/v0.8.rst
  3. 11
    1
      tox.ini

+ 2
- 0
.travis.yml View File

3
 python:
3
 python:
4
   - '2.7'
4
   - '2.7'
5
   - '3.3'
5
   - '3.3'
6
+  - '3.4'
6
 
7
 
7
 env:
8
 env:
8
   global:
9
   global:
15
 matrix:
16
 matrix:
16
   allow_failures:
17
   allow_failures:
17
     - python: '3.3'
18
     - python: '3.3'
19
+    - python: '3.4'
18
 
20
 
19
 install:
21
 install:
20
   - easy_install Django==$DJANGO_VERSION
22
   - easy_install Django==$DJANGO_VERSION

+ 3
- 0
docs/source/releases/v0.8.rst View File

13
 Compatibility
13
 Compatibility
14
 =============
14
 =============
15
 
15
 
16
+Oscar 0.8 is compatible with Django 1.5-1.7. Support for Python 2.6 has been
17
+dropped; it works with Python 2.7, Python 3.3 and Python 3.4.
18
+
16
 
19
 
17
 What's new in Oscar 0.8?
20
 What's new in Oscar 0.8?
18
 ========================
21
 ========================

+ 11
- 1
tox.ini View File

8
 max-complexity = 10
8
 max-complexity = 10
9
 
9
 
10
 [tox]
10
 [tox]
11
-envlist = py27-1.5, py27-1.6, py33-1.5, py33-1.6
11
+envlist = py27-1.5, py27-1.6, py33-1.5, py33-1.6, py34-1.5, py34-1.6
12
 
12
 
13
 [testenv]
13
 [testenv]
14
 commands = python runtests.py []
14
 commands = python runtests.py []
23
 deps = -r{toxinidir}/requirements.txt
23
 deps = -r{toxinidir}/requirements.txt
24
        django==1.5.5
24
        django==1.5.5
25
 
25
 
26
+[testenv:py34-1.5]
27
+basepython = python3.4
28
+deps = -r{toxinidir}/requirements.txt
29
+       django==1.5.5
30
+
26
 [testenv:py27-1.6]
31
 [testenv:py27-1.6]
27
 basepython = python2.7
32
 basepython = python2.7
28
 deps = -r{toxinidir}/requirements_py2.txt
33
 deps = -r{toxinidir}/requirements_py2.txt
32
 basepython = python3.3
37
 basepython = python3.3
33
 deps = -r{toxinidir}/requirements.txt
38
 deps = -r{toxinidir}/requirements.txt
34
        django==1.6.1
39
        django==1.6.1
40
+
41
+[testenv:py34-1.6]
42
+basepython = python3.4
43
+deps = -r{toxinidir}/requirements.txt
44
+       django==1.6.1

Loading…
Cancel
Save