← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/lpcraft:bump-craft-cli into lpcraft:main

 

Colin Watson has proposed merging ~cjwatson/lpcraft:bump-craft-cli into lpcraft:main.

Commit message:
Bump craft-cli to c172fa00f6

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

This allows removing some `mypy` overrides (although we still need some other milder ones for now).
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/lpcraft:bump-craft-cli into lpcraft:main.
diff --git a/.mypy.ini b/.mypy.ini
index da98765..3b71bdb 100644
--- a/.mypy.ini
+++ b/.mypy.ini
@@ -2,17 +2,18 @@
 plugins = pydantic.mypy
 python_version = 3.8
 
-[mypy-lpcraft.errors]
-# Temporary until https://github.com/canonical/craft-cli/pull/35 lands.
-disallow_subclassing_any = false
-
 [mypy-*.tests.*]
 disallow_subclassing_any = false
 disallow_untyped_calls = false
 disallow_untyped_defs = false
 
-[mypy-craft_cli.*,fixtures.*,systemfixtures.*,testtools.*]
+[mypy-fixtures.*,systemfixtures.*,testtools.*]
 ignore_missing_imports = true
 
+[mypy-craft_cli.*]
+# Temporary until https://github.com/canonical/craft-cli/pull/38 lands.
+implicit_reexport = true
+
 [mypy-craft_providers.*]
+# Temporary until the next release after 1.0.3.
 implicit_reexport = true
diff --git a/requirements.in b/requirements.in
index 44d1335..69dca66 100644
--- a/requirements.in
+++ b/requirements.in
@@ -1,4 +1,4 @@
 craft-providers
 pydantic
 PyYAML
-git+git://github.com/canonical/craft-cli.git@4af19f9c0da733321dc754be1180aea28f3feeb1
+git+git://github.com/canonical/craft-cli.git@c172fa00f61dff8e510116d1c23258e79f710e38
diff --git a/requirements.txt b/requirements.txt
index 1a5a064..21ecf3d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ certifi==2021.10.8
     # via requests
 charset-normalizer==2.0.7
     # via requests
-craft-cli @ git+git://github.com/canonical/craft-cli.git@4af19f9c0da733321dc754be1180aea28f3feeb1
+craft-cli @ git+git://github.com/canonical/craft-cli.git@c172fa00f61dff8e510116d1c23258e79f710e38
     # via -r requirements.in
 craft-providers==1.0.3
     # via -r requirements.in