Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/patiences/scrapy into pat…
Browse files Browse the repository at this point in the history
…iences-master
  • Loading branch information
lopuhin committed Jul 9, 2018
2 parents 666e237 + f10a43d commit 1d2e273
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ matrix:
env: TOXENV=py36
- python: 3.6
env: TOXENV=docs
- python: 3.7-dev
env: TOXENV=py37
install:
- |
if [ "$TOXENV" = "pypy" ]; then
Expand Down
2 changes: 1 addition & 1 deletion requirements-py3.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Twisted >= 17.9.0
git+https://github.com/lopuhin/twisted.git@9384-remove-async-param
lxml>=3.2.4
pyOpenSSL>=0.13.1
cssselect>=0.9
Expand Down
4 changes: 4 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ deps = {[testenv:py34]deps}
basepython = python3.6
deps = {[testenv:py34]deps}

[testenv:py37]
basepython = python3.7
deps = {[testenv:py34]deps}

[testenv:pypy3]
basepython = pypy3
deps = {[testenv:py34]deps}
Expand Down

0 comments on commit 1d2e273

Please sign in to comment.