Skip to content

Commit 0b05957

Browse files
authored
Merge 0579cad into 7843f6f
2 parents 7843f6f + 0579cad commit 0b05957

20 files changed

+451
-454
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ jobs:
1818
- python-version: 3.7
1919
env:
2020
TOXENV: docs
21-
- python-version: 3.8
21+
- python-version: 3.9
2222
env:
2323
TOXENV: flake8
24-
- python-version: 3.8
24+
- python-version: 3.9
2525
env:
2626
TOXENV: pylint
27-
- python-version: 3.8
27+
- python-version: 3.9
2828
env:
2929
TOXENV: security
3030

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v2
1414

15-
- name: Set up Python 3.8
15+
- name: Set up Python 3.9
1616
uses: actions/setup-python@v2
1717
with:
18-
python-version: 3.8
18+
python-version: 3.9
1919

2020
- name: Check Tag
2121
id: check-release-tag

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-20.04
1515
strategy:
1616
matrix:
17-
python-version: [2.7, 3.5, 3.6, 3.7, 3.8, pypy3]
17+
python-version: [3.6, 3.7, 3.8, 3.9, pypy3]
1818

1919
steps:
2020
- uses: actions/checkout@v2

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ This is a Python library of web-related functions, such as:
2727
Requirements
2828
============
2929

30-
Python 2.7 or Python 3.5+
30+
Python 3.6+
3131

3232
Install
3333
=======

docs/conf.py

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# -*- coding: utf-8 -*-
2-
#
31
# w3lib documentation build configuration file, created by
42
# sphinx-quickstart on Sun Jan 26 22:19:38 2014.
53
#
@@ -47,8 +45,8 @@
4745
master_doc = 'index'
4846

4947
# General information about the project.
50-
project = u'w3lib'
51-
copyright = u'2014, w3lib developers'
48+
project = 'w3lib'
49+
copyright = '2014, w3lib developers'
5250

5351
# The version info for the project you're documenting, acts as replacement for
5452
# |version| and |release|, also used in various other places throughout the
@@ -190,8 +188,8 @@
190188
# Grouping the document tree into LaTeX files. List of tuples
191189
# (source start file, target name, title, author, documentclass [howto/manual]).
192190
latex_documents = [
193-
('index', 'w3lib.tex', u'w3lib Documentation',
194-
u'w3lib developers', 'manual'),
191+
('index', 'w3lib.tex', 'w3lib Documentation',
192+
'w3lib developers', 'manual'),
195193
]
196194

197195
# The name of an image file (relative to this directory) to place at the top of
@@ -220,8 +218,8 @@
220218
# One entry per manual page. List of tuples
221219
# (source start file, name, description, authors, manual section).
222220
man_pages = [
223-
('index', 'w3lib', u'w3lib Documentation',
224-
[u'w3lib developers'], 1)
221+
('index', 'w3lib', 'w3lib Documentation',
222+
['w3lib developers'], 1)
225223
]
226224

227225
# If true, show URL addresses after external links.
@@ -234,8 +232,8 @@
234232
# (source start file, target name, title, author,
235233
# dir menu entry, description, category)
236234
texinfo_documents = [
237-
('index', 'w3lib', u'w3lib Documentation',
238-
u'w3lib developers', 'w3lib', 'One line description of project.',
235+
('index', 'w3lib', 'w3lib Documentation',
236+
'w3lib developers', 'w3lib', 'One line description of project.',
239237
'Miscellaneous'),
240238
]
241239

docs/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Modules
2828
Requirements
2929
============
3030

31-
Python 2.7 or Python 3.3+
31+
Python 3.6+
3232

3333
Install
3434
=======

pytest.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
[pytest]
22
doctest_optionflags = ALLOW_UNICODE ALLOW_BYTES
33
flake8-ignore =
4+
W503 # https://www.flake8rules.com/rules/W503.html
5+
46
docs/conf.py E121 E122 E265 E401 E501
57
tests/test_encoding.py E128 E221 E241 E302 E401 E501 E731
68
tests/test_form.py E265 E501

setup.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,13 @@
1818
'License :: OSI Approved :: BSD License',
1919
'Operating System :: OS Independent',
2020
'Programming Language :: Python',
21-
'Programming Language :: Python :: 2',
22-
'Programming Language :: Python :: 2.7',
2321
'Programming Language :: Python :: 3',
24-
'Programming Language :: Python :: 3.5',
2522
'Programming Language :: Python :: 3.6',
2623
'Programming Language :: Python :: 3.7',
2724
'Programming Language :: Python :: 3.8',
25+
'Programming Language :: Python :: 3.9',
2826
'Programming Language :: Python :: Implementation :: CPython',
2927
'Programming Language :: Python :: Implementation :: PyPy',
3028
'Topic :: Internet :: WWW/HTTP',
3129
],
32-
install_requires=['six >= 1.4.1'],
3330
)

stdeb.cfg

Lines changed: 0 additions & 2 deletions
This file was deleted.

tests/py3-ignores.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)