Skip to content

Commit 1743ffb

Browse files
authored
Merge pull request #119 from scrapinghub/test-with-python-37
Add Python 3.7 support officially
2 parents 2c06fb4 + 45201a2 commit 1743ffb

File tree

5 files changed

+12
-7
lines changed

5 files changed

+12
-7
lines changed

.travis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ matrix:
2121
env: TOXENV=py36-json
2222
- python: 3.6
2323
env: TOXENV=py36-msgpack
24+
- python: 3.7
25+
dist: xenial
26+
env: TOXENV=py37-json
27+
- python: 3.7
28+
dist: xenial
29+
env: TOXENV=py37-msgpack
2430
install:
2531
- pip install -U tox coverage codecov pytest-xdist
2632
script:

requirements-test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ vcrpy==1.10.3
55
pytest<3.3.0
66
pytest-cov<2.6.0
77
pytest-catchlog
8-
responses==0.5.0
8+
responses==0.10.6

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
'Programming Language :: Python :: 3.4',
3939
'Programming Language :: Python :: 3.5',
4040
'Programming Language :: Python :: 3.6',
41+
'Programming Language :: Python :: 3.7',
4142
'Programming Language :: Python :: Implementation :: CPython',
4243
'Programming Language :: Python :: Implementation :: PyPy',
4344
'Topic :: Internet :: WWW/HTTP',

tests/hubstorage/test_retry.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,13 +202,11 @@ def test_api_delete_can_be_set_to_non_idempotent(hsspiderid):
202202
def test_collection_store_and_delete_are_retried():
203203
# Prepare
204204
client = hsclient_with_retries()
205-
206205
callback_post, attempts_count_post = make_request_callback(2, [])
207206
callback_delete, attempts_count_delete = make_request_callback(2, [])
208-
209-
mock_api(method=POST, callback=callback_delete, url_match='/.*/deleted')
210-
# /!\ default regexp matches all paths, has to be added last
211-
mock_api(method=POST, callback=callback_post)
207+
# responses>0.6.1 could reorder callbacks, let's be concrete
208+
mock_api(method=POST, callback=callback_post, url_match='/.*/foo$')
209+
mock_api(method=POST, callback=callback_delete, url_match='/.*/deleted$')
212210
# Act
213211
project = client.get_project(TEST_PROJECT_ID)
214212
store = project.collections.new_store('foo')

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# and then run "tox" from this directory.
55

66
[tox]
7-
envlist = py{27,py,34,35,36}-{json,msgpack}
7+
envlist = py{27,py,34,35,36,37}-{json,msgpack}
88

99
[testenv]
1010
deps =

0 commit comments

Comments
 (0)