diff --git a/.travis.yml b/.travis.yml index 451d27cf..b794849d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,14 +14,14 @@ matrix: env: TOXENV=py27 - python: pypy env: TOXENV=pypy - - python: 3.4 - env: TOXENV=py34 - python: 3.5 env: TOXENV=py35 - python: 3.6 env: TOXENV=py36 - python: 3.7 env: TOXENV=py37 + - python: 3.8 + env: TOXENV=py38 - python: pypy3 env: TOXENV=pypy3 - python: 3.7 @@ -49,4 +49,4 @@ deploy: tags: true all_branches: true repo: scrapy/parsel - condition: $TOXENV == py27 + condition: $TOXENV == py37 diff --git a/parsel/utils.py b/parsel/utils.py index 458bc6cc..69143625 100644 --- a/parsel/utils.py +++ b/parsel/utils.py @@ -22,7 +22,7 @@ def flatten(x): def iflatten(x): - """iflatten(sequence) -> iterator + """iflatten(sequence) -> Iterator Similar to ``.flatten()``, but returns iterator instead""" for el in x: if _is_listlike(el): diff --git a/setup.py b/setup.py index 73aac2ae..1830548a 100644 --- a/setup.py +++ b/setup.py @@ -27,8 +27,7 @@ def has_environment_marker_platform_impl_support(): install_requires = [ 'w3lib>=1.19.0', - 'lxml;python_version!="3.4"', - 'lxml<=4.3.5;python_version=="3.4"', + 'lxml', 'six>=1.5.2', 'cssselect>=0.9' ] @@ -70,10 +69,10 @@ def has_environment_marker_platform_impl_support(): 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', ], diff --git a/tox.ini b/tox.ini index daf85763..f0c4e8d5 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27, py34, py35, py36, py37, pypy, pypy3 +envlist = py27, py35, py36, py37, py38, pypy, pypy3 [testenv] deps =