diff --git a/.travis.yml b/.travis.yml index 41e346f..ff690fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,8 +23,6 @@ matrix: env: TOXENV=py37 - python: 3.8 env: TOXENV=py38 - - python: 2.7 - env: TOXENV=py27-scrapy10 before_install: - docker pull scrapinghub/splash diff --git a/scrapy_splash/utils.py b/scrapy_splash/utils.py index df3f40d..3f192f2 100644 --- a/scrapy_splash/utils.py +++ b/scrapy_splash/utils.py @@ -5,17 +5,12 @@ import six from scrapy.http import Headers -try: - import scrapy - if scrapy.version_info >= (2, ): - from scrapy.utils.python import to_unicode - else: - from scrapy.utils.python import to_native_str as to_unicode - from scrapy.utils.python import to_bytes -except ImportError: - # scrapy < 1.1 - from scrapy.utils.python import unicode_to_str as to_bytes - from scrapy.utils.python import str_to_unicode as to_unicode +import scrapy +if scrapy.version_info >= (2, ): + from scrapy.utils.python import to_unicode +else: + from scrapy.utils.python import to_native_str as to_unicode +from scrapy.utils.python import to_bytes def dict_hash(obj, start=''): diff --git a/tox.ini b/tox.ini index fd20a72..f8fe5e4 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] -envlist = py27,py34,py35,py36,py27-scrapy10 +envlist = py27,py34,py35,py36,py37,py38 [testenv] passenv = SPLASH_URL @@ -30,8 +30,10 @@ deps = {[testenv:py34]deps} basepython = python3.6 deps = {[testenv:py34]deps} -[testenv:py27-scrapy10] -deps = - -rrequirements-test.txt - scrapy < 1.1 - service_identity +[testenv:py37] +basepython = python3.7 +deps = {[testenv:py34]deps} + +[testenv:py38] +basepython = python3.8 +deps = {[testenv:py34]deps}