Skip to content

Commit

Permalink
Merge pull request #189 from scrapy/modernize
Browse files Browse the repository at this point in the history
CI fixes, drop Python 3.4
  • Loading branch information
kmike committed Apr 17, 2020
2 parents c78116e + e88a450 commit 1e84677
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -49,4 +49,4 @@ deploy:
tags: true
all_branches: true
repo: scrapy/parsel
condition: $TOXENV == py27
condition: $TOXENV == py37
2 changes: 1 addition & 1 deletion parsel/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
]
Expand Down Expand Up @@ -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',
],
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py27, py34, py35, py36, py37, pypy, pypy3
envlist = py27, py35, py36, py37, py38, pypy, pypy3

[testenv]
deps =
Expand Down

0 comments on commit 1e84677

Please sign in to comment.