Skip to content

Commit e05a81f

Browse files
committed
Added python3.5 and django 1.9 to envs
1 parent 26abf67 commit e05a81f

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

.travis.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@ python:
77
- "3.2"
88
- "3.3"
99
- "3.4"
10+
- "3.5"
11+
- "3.5-dev"
12+
- "nightly"
1013

1114
env:
1215
- DJANGO="https://github.com/django/django/archive/master.tar.gz"
16+
- DJANGO="django>=1.9.0,<1.10.0"
1317
- DJANGO="django>=1.8.0,<1.9.0"
1418
- DJANGO="django>=1.7.0,<1.8.0"
1519
- DJANGO="django>=1.6.0,<1.7.0"
@@ -19,6 +23,7 @@ env:
1923
install:
2024
- travis_retry pip install $DJANGO
2125
- travis_retry pip install pytz
26+
- travis_retry pip install coverage==3.7.1 # required by python 3.2
2227
- travis_retry pip install coveralls
2328
- travis_retry pip install django-discover-runner
2429

@@ -35,10 +40,22 @@ matrix:
3540
exclude:
3641
- python: "3.2"
3742
env: DJANGO="django>=1.4.0,<1.5.0"
43+
- python: "3.2"
44+
env: DJANGO="django>=1.9.0,<1.10.0"
3845
- python: "3.3"
3946
env: DJANGO="django>=1.4.0,<1.5.0"
47+
- python: "3.3"
48+
env: DJANGO="django>=1.9.0,<1.10.0"
4049
- python: "3.4"
4150
env: DJANGO="django>=1.4.0,<1.5.0"
51+
- python: "3.5"
52+
env: DJANGO="django>=1.4.0,<1.5.0"
53+
- python: "3.5"
54+
env: DJANGO="django>=1.5.0,<1.6.0"
55+
- python: "3.5"
56+
env: DJANGO="django>=1.6.0,<1.7.0"
57+
- python: "3.5"
58+
env: DJANGO="django>=1.7.0,<1.8.0"
4259
# - python: "pypy"
4360
# env: DJANGO="django>=1.4.0,<1.5.0"
4461
# - python: "pypy3"
@@ -47,10 +64,14 @@ matrix:
4764
env: DJANGO="django>=1.7.0,<1.8.0"
4865
- python: "2.6"
4966
env: DJANGO="django>=1.8.0,<1.9.0"
67+
- python: "2.6"
68+
env: DJANGO="django>=1.9.0,<1.10.0"
5069
- python: "2.6"
5170
env: DJANGO="https://github.com/django/django/archive/master.tar.gz"
5271
- python: "2.6"
5372
env: DJANGO="https://github.com/django/django/archive/master.tar.gz"
5473
allow_failures:
5574
- env: DJANGO="https://github.com/django/django/archive/master.tar.gz"
75+
- python: "3.5-dev"
76+
- python: "nightly"
5677
fast_finish: true

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
packages=['timezone_utils'],
2222
install_requires=[
2323
'pytz',
24-
'django>=1.4,<1.9'
24+
'django>=1.4,<1.10'
2525
],
2626
zip_safe=False,
2727
platforms='any',
@@ -41,6 +41,7 @@
4141
'Programming Language :: Python :: 3.2',
4242
'Programming Language :: Python :: 3.3',
4343
'Programming Language :: Python :: 3.4',
44+
'Programming Language :: Python :: 3.5',
4445
'Topic :: Database',
4546
'Topic :: Software Development :: Libraries',
4647
],

0 commit comments

Comments
 (0)