Skip to content

Commit f63a8bc

Browse files
authored
Merge pull request #60 from scrapinghub/test-py36
Test with Python 3.6
2 parents 934ee34 + 8003079 commit f63a8bc

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ matrix:
55
include:
66
- python: 2.7
77
env: TOXENV=py27
8+
- python: 2.7
9+
env: TOXENV=py27-scrapy1.0.x
810
- python: 3.5
911
env: TOXENV=py35
10-
- python: 2.7
11-
env: TOXENV=scrapy10
12+
- python: 3.6
13+
env: TOXENV=py36
1214

1315
script: tox
1416

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
'Programming Language :: Python :: 2.7',
2828
'Programming Language :: Python :: 3',
2929
'Programming Language :: Python :: 3.5',
30+
'Programming Language :: Python :: 3.6',
3031
'Operating System :: OS Independent',
3132
'Environment :: Console',
3233
'Environment :: No Input/Output (Daemon)',

tox.ini

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
[tox]
2-
envlist = py27,py35,scrapy10
2+
envlist = py27, py27-scrapy1.0.x, py35, py36
33

44
[testenv]
55
deps =
6-
-rrequirements.txt
7-
-rrequirements-dev.txt
6+
-r{toxinidir}/requirements.txt
7+
-r{toxinidir}/requirements-dev.txt
88
commands = py.test {posargs}
99

10-
[testenv:py35]
11-
basepython = python3.5
12-
13-
[testenv:scrapy10]
14-
basepython = python2.7
10+
[testenv:py27-scrapy1.0.x]
1511
deps =
16-
-rrequirements-dev.txt
17-
scrapy==1.0.0
12+
Scrapy<1.1
13+
-r{toxinidir}/requirements-dev.txt

0 commit comments

Comments
 (0)