Skip to content

Commit 315c593

Browse files
committed
test django 1.6.11 and 1.10.1
1 parent 519074e commit 315c593

File tree

6 files changed

+51
-17
lines changed

6 files changed

+51
-17
lines changed

.moban.d/travis.yml

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,41 @@
11
{% extends "travis.yml.jj2" %}
22
{%block test_other_environments%}
33
env:
4-
- DJANGO_VERSION=1.7.8
5-
- DJANGO_VERSION=1.8.2
6-
- DJANGO_VERSION=1.9
4+
- DJANGO_VERSION=1.6.11
5+
- DJANGO_VERSION=1.7.11
6+
- DJANGO_VERSION=1.8.14
7+
- DJANGO_VERSION=1.9.9
8+
- DJANGO_VERSION=1.10.1
79
{%endblock%}
810

911
{%block exclusion_matrix%}
1012
matrix:
1113
exclude:
14+
- python: 2.6
15+
env: DJANGO_VERSION=1.7.11
16+
- python: 2.6
17+
env: DJANGO_VERSION=1.8.14
18+
- python: 2.6
19+
env: DJANGO_VERSION=1.9.9
20+
- python: 2.6
21+
env: DJANGO_VERSION=1.10.1
22+
- python: 3.4
23+
env: DJANGO_VERSION=1.6.11
24+
- python: 3.5
25+
env: DJANGO_VERSION=1.6.11
26+
- python: 3.3
27+
env: DJANGO_VERSION=1.9.9
1228
- python: 3.3
13-
env: DJANGO_VERSION=1.9
29+
env: DJANGO_VERSION=1.10.1
1430
- python: 3.5
15-
env: DJANGO_VERSION=1.7.8
31+
env: DJANGO_VERSION=1.7.11
1632
- python: 3.5
17-
env: DJANGO_VERSION=1.8.2
33+
env: DJANGO_VERSION=1.8.14
1834
{%endblock%}
1935

2036
{%block custom_python_versions%}
2137
python:
38+
- 2.6
2239
- 2.7
2340
- 3.3
2441
- 3.4

.travis.yml

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,39 @@ language: python
33
notifications:
44
email: false
55
env:
6-
- DJANGO_VERSION=1.7.8
7-
- DJANGO_VERSION=1.8.2
8-
- DJANGO_VERSION=1.9
6+
- DJANGO_VERSION=1.6.11
7+
- DJANGO_VERSION=1.7.11
8+
- DJANGO_VERSION=1.8.14
9+
- DJANGO_VERSION=1.9.9
10+
- DJANGO_VERSION=1.10.1
911
python:
12+
- 2.6
1013
- 2.7
1114
- 3.3
1215
- 3.4
1316
- 3.5
1417
matrix:
1518
exclude:
19+
- python: 2.6
20+
env: DJANGO_VERSION=1.7.11
21+
- python: 2.6
22+
env: DJANGO_VERSION=1.8.14
23+
- python: 2.6
24+
env: DJANGO_VERSION=1.9.9
25+
- python: 2.6
26+
env: DJANGO_VERSION=1.10.1
27+
- python: 3.4
28+
env: DJANGO_VERSION=1.6.11
29+
- python: 3.5
30+
env: DJANGO_VERSION=1.6.11
31+
- python: 3.3
32+
env: DJANGO_VERSION=1.9.9
1633
- python: 3.3
17-
env: DJANGO_VERSION=1.9
34+
env: DJANGO_VERSION=1.10.1
1835
- python: 3.5
19-
env: DJANGO_VERSION=1.7.8
36+
env: DJANGO_VERSION=1.7.11
2037
- python: 3.5
21-
env: DJANGO_VERSION=1.8.2
38+
env: DJANGO_VERSION=1.8.14
2239
before_install:
2340
- pip install Django==$DJANGO_VERSION
2441
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install flake8==2.6.2; fi

django_excel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ webframework: Django
66
dependencies:
77
- pyexcel>=0.2.2
88
- pyexcel-webio>=0.0.7
9-
- Django>=1.7.1
9+
- Django>=1.6.1
1010
extra_dependencies:
1111
- xls:
1212
- pyexcel-xls>=0.1.0

doc/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
project = u'django-excel'
1818
copyright = u'2015-2016 Onni Software Ltd.'
19-
version = '0.0.5'
20-
release = '0.0.4'
19+
version = '0.0.4'
20+
release = '0.0.5'
2121
exclude_patterns = []
2222
pygments_style = 'sphinx'
2323
import os # noqa

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
pyexcel>=0.2.2
22
pyexcel-webio>=0.0.7
3-
Django>=1.4.1
3+
Django>=1.6.1

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
INSTALL_REQUIRES = [
2828
'pyexcel>=0.2.2',
2929
'pyexcel-webio>=0.0.7',
30-
'Django>=1.7.1',
30+
'Django>=1.6.1',
3131
]
3232

3333
EXTRAS_REQUIRE = {

0 commit comments

Comments
 (0)