← Back to team overview

launchpad-reviewers team mailing list archive

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

 

Colin Watson has proposed merging ~cjwatson/launchpad:bleach-3.3.1 into launchpad:master.

Commit message:
Upgrade to bleach 3.3.1

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/428053

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
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:bleach-3.3.1 into launchpad:master.
diff --git a/pyproject.toml b/pyproject.toml
index b9e4772..351470d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,6 +22,10 @@ module = "artifactory"
 ignore_missing_imports = true
 
 [[tool.mypy.overrides]]
+module = "bleach_allowlist"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
 module = "breezy.*"
 ignore_missing_imports = true
 
diff --git a/requirements/launchpad.txt b/requirements/launchpad.txt
index 3cb2ae4..2bb8090 100644
--- a/requirements/launchpad.txt
+++ b/requirements/launchpad.txt
@@ -19,7 +19,7 @@ backports.functools-lru-cache==1.5
 bcrypt==3.1.7
 beautifulsoup4==4.7.1
 billiard==3.6.4.0
-bleach==3.1.0
+bleach==3.3.1
 bleach-allowlist==1.0.3
 breezy==3.2.0
 bson==0.5.9
diff --git a/requirements/types.txt b/requirements/types.txt
index d9a338e..79b6d5e 100644
--- a/requirements/types.txt
+++ b/requirements/types.txt
@@ -1,7 +1,8 @@
+lxml-stubs==0.4.0
+types-Markdown==0.1.0
+types-beautifulsoup4==4.9.0
+types-bleach==3.3.1
 types-pytz==0.1.0
+types-requests==0.1.13
 types-simplejson==0.1.0
 types-six==0.1.9
-types-beautifulsoup4==4.9.0
-types-requests==0.1.13
-lxml-stubs==0.4.0
-types-Markdown==0.1.0
diff --git a/tox.ini b/tox.ini
index 74f44ed..de5aa53 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,4 +27,4 @@ deps =
     -r requirements/types.txt
 commands =
     mypy --follow-imports=silent \
-    {posargs:lib/lp/answers}
+    {posargs:lib/lp/answers lib/lp/app}