Kaynağa Gözat

Update supported Django/Python versions and tox configuration.

- Drop support for Django 1.9 (EOL)
- Drop support for Python 3.6 with Django 1.8 to 1.10
master
Samir Shah 8 yıl önce
ebeveyn
işleme
03eb166be9
4 değiştirilmiş dosya ile 10 ekleme ve 21 silme
  1. 0
    12
      .travis.yml
  2. 2
    2
      docs/source/releases/v1.5.rst
  3. 3
    1
      setup.py
  4. 5
    6
      tox.ini

+ 0
- 12
.travis.yml Dosyayı Görüntüle

@@ -5,8 +5,6 @@ matrix:
5 5
   include:
6 6
     - python: 2.7
7 7
       env: TOXENV=py27-django18
8
-    - python: 2.7
9
-      env: TOXENV=py27-django19
10 8
     - python: 2.7
11 9
       env: TOXENV=py27-django110
12 10
     - python: 2.7
@@ -15,26 +13,16 @@ matrix:
15 13
       env: TOXENV=py33-django18
16 14
     - python: 3.4
17 15
       env: TOXENV=py34-django18
18
-    - python: 3.4
19
-      env: TOXENV=py34-django19
20 16
     - python: 3.4
21 17
       env: TOXENV=py34-django110
22 18
     - python: 3.4
23 19
       env: TOXENV=py34-django111
24 20
     - python: 3.5
25 21
       env: TOXENV=py35-django18
26
-    - python: 3.5
27
-      env: TOXENV=py35-django19
28 22
     - python: 3.5
29 23
       env: TOXENV=py35-django110
30 24
     - python: 3.5
31 25
       env: TOXENV=py35-django111
32
-    - python: 3.6
33
-      env: TOXENV=py36-django18
34
-    - python: 3.6
35
-      env: TOXENV=py36-django19
36
-    - python: 3.6
37
-      env: TOXENV=py36-django110
38 26
     - python: 3.6
39 27
       env: TOXENV=py36-django111
40 28
 

+ 2
- 2
docs/source/releases/v1.5.rst Dosyayı Görüntüle

@@ -19,8 +19,8 @@ Table of contents:
19 19
 Compatibility
20 20
 -------------
21 21
 
22
-Oscar 1.5 is compatible with Django 1.8, 1.9, 1.10  and 1.11 as well as Python 2.7,
23
-3.3, 3.4, 3.5 and 3.6.
22
+Oscar 1.5 is compatible with Django 1.8, 1.10 and 1.11 as well as Python 2.7,
23
+3.3, 3.4, 3.5 and 3.6. Support for Django 1.9 is dropped in this version.
24 24
 
25 25
 
26 26
 .. _new_in_1.5:

+ 3
- 1
setup.py Dosyayı Görüntüle

@@ -94,7 +94,8 @@ setup(
94 94
         'Environment :: Web Environment',
95 95
         'Framework :: Django',
96 96
         'Framework :: Django :: 1.8',
97
-        'Framework :: Django :: 1.9',
97
+        'Framework :: Django :: 1.10',
98
+        'Framework :: Django :: 1.11',
98 99
         'Intended Audience :: Developers',
99 100
         'License :: OSI Approved :: BSD License',
100 101
         'Operating System :: Unix',
@@ -105,6 +106,7 @@ setup(
105 106
         'Programming Language :: Python :: 3.3',
106 107
         'Programming Language :: Python :: 3.4',
107 108
         'Programming Language :: Python :: 3.5',
109
+        'Programming Language :: Python :: 3.6',
108 110
         'Topic :: Software Development :: Libraries :: Application Frameworks']
109 111
 )
110 112
 

+ 5
- 6
tox.ini Dosyayı Görüntüle

@@ -1,14 +1,13 @@
1 1
 [tox]
2
-envlist = py{27,34,35,36}-django{18,19,110,111},py33-django18,lint,sandbox
2
+envlist = py{27,33,34,35}-django18,py{27,34,35}-django110,py{27,34,35,36}-django111,lint,sandbox
3 3
 
4 4
 [testenv]
5 5
 commands = coverage run --parallel -m pytest {posargs}
6 6
 extras = test
7 7
 pip_pre = true
8
-deps = 
8
+deps =
9 9
     -r{toxinidir}/requirements.txt
10 10
     django18: django>=1.8,<1.9
11
-    django19: django>=1.9,<1.10
12 11
     django110: django>=1.10,<1.11
13 12
     django111: django>=1.11,<1.12
14 13
 
@@ -24,16 +23,16 @@ commands =
24 23
 [testenv:lint]
25 24
 basepython = python3.5
26 25
 deps = flake8
27
-commands = 
26
+commands =
28 27
     flake8 src tests setup.py
29 28
     isort -q --recursive --diff src/ tests/
30 29
 
31 30
 
32 31
 [testenv:sandbox]
33 32
 basepython = python3.5
34
-deps = 
33
+deps =
35 34
     -r{toxinidir}/requirements.txt
36 35
     django>=1.10,<1.11
37 36
 whitelist_externals = make
38
-commands = 
37
+commands =
39 38
     make build_sandbox

Loading…
İptal
Kaydet