Skip to content

Commit 1e84677

Browse files
authored
Merge pull request #189 from scrapy/modernize
CI fixes, drop Python 3.4
2 parents c78116e + e88a450 commit 1e84677

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ matrix:
1414
env: TOXENV=py27
1515
- python: pypy
1616
env: TOXENV=pypy
17-
- python: 3.4
18-
env: TOXENV=py34
1917
- python: 3.5
2018
env: TOXENV=py35
2119
- python: 3.6
2220
env: TOXENV=py36
2321
- python: 3.7
2422
env: TOXENV=py37
23+
- python: 3.8
24+
env: TOXENV=py38
2525
- python: pypy3
2626
env: TOXENV=pypy3
2727
- python: 3.7
@@ -49,4 +49,4 @@ deploy:
4949
tags: true
5050
all_branches: true
5151
repo: scrapy/parsel
52-
condition: $TOXENV == py27
52+
condition: $TOXENV == py37

parsel/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def flatten(x):
2222

2323

2424
def iflatten(x):
25-
"""iflatten(sequence) -> iterator
25+
"""iflatten(sequence) -> Iterator
2626
Similar to ``.flatten()``, but returns iterator instead"""
2727
for el in x:
2828
if _is_listlike(el):

setup.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ def has_environment_marker_platform_impl_support():
2727

2828
install_requires = [
2929
'w3lib>=1.19.0',
30-
'lxml;python_version!="3.4"',
31-
'lxml<=4.3.5;python_version=="3.4"',
30+
'lxml',
3231
'six>=1.5.2',
3332
'cssselect>=0.9'
3433
]
@@ -70,10 +69,10 @@ def has_environment_marker_platform_impl_support():
7069
'Programming Language :: Python :: 2',
7170
'Programming Language :: Python :: 2.7',
7271
'Programming Language :: Python :: 3',
73-
'Programming Language :: Python :: 3.4',
7472
'Programming Language :: Python :: 3.5',
7573
'Programming Language :: Python :: 3.6',
7674
'Programming Language :: Python :: 3.7',
75+
'Programming Language :: Python :: 3.8',
7776
'Programming Language :: Python :: Implementation :: CPython',
7877
'Programming Language :: Python :: Implementation :: PyPy',
7978
],

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py27, py34, py35, py36, py37, pypy, pypy3
2+
envlist = py27, py35, py36, py37, py38, pypy, pypy3
33

44
[testenv]
55
deps =

0 commit comments

Comments
 (0)