Merge ~cjwatson/launchpad:bleach-3.3.1 into launchpad:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: f769f57b4f8ea086ad13ce6342aeaa67e723be95
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:bleach-3.3.1
Merge into: launchpad:master
Diff against target: 55 lines (+11/-6)
4 files modified
pyproject.toml (+4/-0)
requirements/launchpad.txt (+1/-1)
requirements/types.txt (+5/-4)
tox.ini (+1/-1)
Reviewer Review Type Date Requested Status
Guruprasad Approve
Review via email: mp+428053@code.launchpad.net

Commit message

Upgrade to bleach 3.3.1

Description of the change

This is the latest version that supports Python 3.5.

Since this has a matching version of `types-bleach` available, this also allows us to get `mypy` passing again for `lp.app`.

Dependencies MP: https://code.launchpad.net/~cjwatson/lp-source-dependencies/+git/lp-source-dependencies/+merge/428052

To post a comment you must log in.
Revision history for this message
Guruprasad (lgp171188) wrote :

LGTM 👍

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/pyproject.toml b/pyproject.toml
2index b9e4772..351470d 100644
3--- a/pyproject.toml
4+++ b/pyproject.toml
5@@ -22,6 +22,10 @@ module = "artifactory"
6 ignore_missing_imports = true
7
8 [[tool.mypy.overrides]]
9+module = "bleach_allowlist"
10+ignore_missing_imports = true
11+
12+[[tool.mypy.overrides]]
13 module = "breezy.*"
14 ignore_missing_imports = true
15
16diff --git a/requirements/launchpad.txt b/requirements/launchpad.txt
17index 3cb2ae4..2bb8090 100644
18--- a/requirements/launchpad.txt
19+++ b/requirements/launchpad.txt
20@@ -19,7 +19,7 @@ backports.functools-lru-cache==1.5
21 bcrypt==3.1.7
22 beautifulsoup4==4.7.1
23 billiard==3.6.4.0
24-bleach==3.1.0
25+bleach==3.3.1
26 bleach-allowlist==1.0.3
27 breezy==3.2.0
28 bson==0.5.9
29diff --git a/requirements/types.txt b/requirements/types.txt
30index d9a338e..79b6d5e 100644
31--- a/requirements/types.txt
32+++ b/requirements/types.txt
33@@ -1,7 +1,8 @@
34+lxml-stubs==0.4.0
35+types-Markdown==0.1.0
36+types-beautifulsoup4==4.9.0
37+types-bleach==3.3.1
38 types-pytz==0.1.0
39+types-requests==0.1.13
40 types-simplejson==0.1.0
41 types-six==0.1.9
42-types-beautifulsoup4==4.9.0
43-types-requests==0.1.13
44-lxml-stubs==0.4.0
45-types-Markdown==0.1.0
46diff --git a/tox.ini b/tox.ini
47index 74f44ed..de5aa53 100644
48--- a/tox.ini
49+++ b/tox.ini
50@@ -27,4 +27,4 @@ deps =
51 -r requirements/types.txt
52 commands =
53 mypy --follow-imports=silent \
54- {posargs:lib/lp/answers}
55+ {posargs:lib/lp/answers lib/lp/app}

Subscribers

People subscribed via source and target branches

to status/vote changes: