Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tornado 5.x support #232

Merged
merged 4 commits into from
Apr 7, 2019
Merged

tornado 5.x support #232

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
507b987
allow tornado-5.x in setup.py, add tornado-5.1.1 to test matrix
ploxiln Mar 17, 2019
929b3b2
tornado-5.x compatibility: remove io_loop kwargs, update TLS config
ploxiln Mar 17, 2019
437224d
snappy/deflate socket recv_into() method for compat with tornado 5.x
ploxiln Mar 27, 2019
1a340f9
bump to version 0.9.0-beta1
ploxiln Mar 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
allow tornado-5.x in setup.py, add tornado-5.1.1 to test matrix 
tornado 5.x compatibility to be corrected in the following commits

also test with tornado 4.1 for bitly (it's not yet a real burden)
  • Loading branch information
@ploxiln
ploxiln committed Apr 7, 2019
commit 507b98798b36424bc526fce07041cb4c8b96bec2
25 changes: 11 additions & 14 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,36 @@
dist: xenial
language: python

matrix:
include:
- python: "2.7"
env: TORNADO_VERSION=4.4.3 NSQ_DOWNLOAD=nsq-0.3.8.linux-amd64.go1.6.2
- python: "2.7"
env: TORNADO_VERSION=4.5.3 NSQ_DOWNLOAD=nsq-0.3.8.linux-amd64.go1.6.2
env: TORNADO_VERSION=4.1 NSQ_DOWNLOAD=nsq-1.0.0-compat.linux-amd64.go1.8
- python: "2.7"
env: TORNADO_VERSION=4.4.3 NSQ_DOWNLOAD=nsq-1.0.0-compat.linux-amd64.go1.8
- python: "2.7"
env: TORNADO_VERSION=4.5.3 NSQ_DOWNLOAD=nsq-1.0.0-compat.linux-amd64.go1.8
- python: "2.7"
env: TORNADO_VERSION=4.5.3 NSQ_DOWNLOAD=nsq-1.1.0.linux-amd64.go1.10.3
- python: "2.7"
env: TORNADO_VERSION=5.1.1 NSQ_DOWNLOAD=nsq-1.1.0.linux-amd64.go1.10.3

- python: "3.4"
env: TORNADO_VERSION=4.4.3 NSQ_DOWNLOAD=nsq-0.3.8.linux-amd64.go1.6.2
- python: "3.4"
env: TORNADO_VERSION=4.5.3 NSQ_DOWNLOAD=nsq-1.0.0-compat.linux-amd64.go1.8
- python: "3.4"
env: TORNADO_VERSION=5.1.1 NSQ_DOWNLOAD=nsq-1.1.0.linux-amd64.go1.10.3

- python: "3.5"
env: TORNADO_VERSION=4.5.3 NSQ_DOWNLOAD=nsq-0.3.8.linux-amd64.go1.6.2
- python: "3.5"
env: TORNADO_VERSION=4.4.3 NSQ_DOWNLOAD=nsq-1.0.0-compat.linux-amd64.go1.8
env: TORNADO_VERSION=4.5.3 NSQ_DOWNLOAD=nsq-1.0.0-compat.linux-amd64.go1.8
- python: "3.5"
env: TORNADO_VERSION=4.4.3 NSQ_DOWNLOAD=nsq-1.1.0.linux-amd64.go1.10.3
env: TORNADO_VERSION=5.1.1 NSQ_DOWNLOAD=nsq-1.1.0.linux-amd64.go1.10.3

- python: "3.6"
env: TORNADO_VERSION=4.5.3 NSQ_DOWNLOAD=nsq-0.3.8.linux-amd64.go1.6.2
- python: "3.6"
env: TORNADO_VERSION=4.5.3 NSQ_DOWNLOAD=nsq-1.0.0-compat.linux-amd64.go1.8
- python: "3.6"
env: TORNADO_VERSION=5.1.1 NSQ_DOWNLOAD=nsq-1.1.0.linux-amd64.go1.10.3

- python: "3.7"
env: TORNADO_VERSION=4.5.3 NSQ_DOWNLOAD=nsq-1.0.0-compat.linux-amd64.go1.8
- python: "3.7"
env: TORNADO_VERSION=4.5.3 NSQ_DOWNLOAD=nsq-1.1.0.linux-amd64.go1.10.3
env: TORNADO_VERSION=5.1.1 NSQ_DOWNLOAD=nsq-1.1.0.linux-amd64.go1.10.3

script:
- ./travis_test.sh
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def run_tests(self):
version
),
packages=['nsq'],
install_requires=['tornado<5.0'],
install_requires=['tornado<6'],
include_package_data=True,
zip_safe=False,
tests_require=['pytest>=3.3.1', 'mock', 'python-snappy', 'certifi'],
Expand Down