diff --git a/.travis.yml b/.travis.yml index a84c7c7..eb240f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,10 +13,10 @@ 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" @@ -24,14 +24,14 @@ matrix: env: DJANGO="django>=2.1.0,<2.2.0" - python: 3.4 env: DJANGO="django>=2.1.0,<2.2.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 ac020c4..d41de67 100644 --- a/setup.py +++ b/setup.py @@ -7,9 +7,9 @@ README = readme.read() if sys.version_info < (3, 0, 0): - django = 'django>=1.5,<2.0' + django = 'django>=1.8.10,<2.0' else: - django = 'django>=1.5,<2.2' + django = 'django>=1.8.10,<2.2' requirements = [ django, @@ -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..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'stream-io-api.com/api/*.') +api_url = re.compile(r'(us-east-api.)?stream-io-api.com(/api)?/*.') 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):