From c252d47f16dd258d1632d448a20480962f642727 Mon Sep 17 00:00:00 2001 From: Peter van Kampen Date: Mon, 29 Oct 2018 19:09:57 +0100 Subject: [PATCH 1/2] fix 3.7 tests --- .travis.yml | 25 ++++++++++--------- setup.py | 2 +- .../tests/test_app/tests/test_manager.py | 2 +- .../test_app/tests/test_model_integration.py | 2 +- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4f67c9b..7198658 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ python: - 3.4 - 3.5 - 3.6 + - 3.7 env: - DJANGO="django>=2.0.0,<2.1.0" - DJANGO="django>=1.11.0,<1.12.0" @@ -12,21 +13,21 @@ env: - DJANGO="django>=1.9.3,<1.10.0" - DJANGO="django>=1.8.10,<1.9.0" matrix: -# include: -# - python: 3.7 -# dist: xenial -# sudo: true + include: + - python: 3.7 + dist: xenial + sudo: true exclude: - python: 2.7 env: DJANGO="django>=2.0.0,<2.1.0" -# - python: 3.7 -# env: DJANGO="django>=1.11.0,<1.12.0" -# - python: 3.7 -# env: DJANGO="django>=1.10.2,<1.11.0" -# - python: 3.7 -# env: DJANGO="django>=1.9.3,<1.10.0" -# - python: 3.7 -# env: DJANGO="django>=1.8.10,<1.9.0" + - python: 3.7 + env: DJANGO="django>=1.11.0,<1.12.0" + - python: 3.7 + env: DJANGO="django>=1.10.2,<1.11.0" + - python: 3.7 + env: DJANGO="django>=1.9.3,<1.10.0" + - python: 3.7 + env: DJANGO="django>=1.8.10,<1.9.0" install: - travis_retry pip install pep8==1.7.0 diff --git a/setup.py b/setup.py index 84cb4f1..8609661 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ ] extras_require = { - 'test': ['httpretty==0.9.4', 'coverage'], + 'test': ['httpretty==0.9.5', 'coverage'], } setup( diff --git a/stream_django/tests/test_app/tests/test_manager.py b/stream_django/tests/test_app/tests/test_manager.py index 15e1bf3..8a5e4c8 100644 --- a/stream_django/tests/test_app/tests/test_manager.py +++ b/stream_django/tests/test_app/tests/test_manager.py @@ -5,7 +5,7 @@ import unittest -api_url = re.compile(r'stream-io-api.com/api/*.') +api_url = re.compile(r'(us-east-api.)?stream-io-api.com/*.') class ManagerTestCase(unittest.TestCase): diff --git a/stream_django/tests/test_app/tests/test_model_integration.py b/stream_django/tests/test_app/tests/test_model_integration.py index 2dd7a39..562d897 100644 --- a/stream_django/tests/test_app/tests/test_model_integration.py +++ b/stream_django/tests/test_app/tests/test_model_integration.py @@ -7,7 +7,7 @@ from stream_django.feed_manager import feed_manager -api_url = re.compile(r'stream-io-api.com/api/*.') +api_url = re.compile(r'(us-east-api.)?stream-io-api.com(/api)?/*.') class PinTest(TestCase): From fd9dc5337587831b16e51598295c2e659ee4c824 Mon Sep 17 00:00:00 2001 From: Peter van Kampen Date: Mon, 29 Oct 2018 22:36:28 +0100 Subject: [PATCH 2/2] Fix test-url --- stream_django/tests/test_app/tests/test_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stream_django/tests/test_app/tests/test_manager.py b/stream_django/tests/test_app/tests/test_manager.py index 8a5e4c8..e832bed 100644 --- a/stream_django/tests/test_app/tests/test_manager.py +++ b/stream_django/tests/test_app/tests/test_manager.py @@ -5,7 +5,7 @@ import unittest -api_url = re.compile(r'(us-east-api.)?stream-io-api.com/*.') +api_url = re.compile(r'(us-east-api.)?stream-io-api.com(/api)?/*.') class ManagerTestCase(unittest.TestCase):