launchpad-reviewers team mailing list archive

[Colin Watson <mp+429746@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/lpcraft:craft-providers-1.4.2 into lpcraft:main.

Commit message:
Upgrade to craft-providers 1.4.2

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/lpcraft/+git/lpcraft/+merge/429746
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/lpcraft:craft-providers-1.4.2 into lpcraft:main.

diff --git a/NEWS.rst b/NEWS.rst
index e5c3c1e..50b1c9d 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -8,6 +8,8 @@ Version history
 - Move project directory from ``/root/lpcraft/project`` to
   ``/build/lpcraft/project``, making it more practical to drop privileges.
 
+- Upgrade to craft-providers 1.4.2.
+
 0.0.30 (2022-09-05)
 ===================
 
diff --git a/lpcraft/commands/run.py b/lpcraft/commands/run.py
index 3c31054..d91bd41 100644
--- a/lpcraft/commands/run.py
+++ b/lpcraft/commands/run.py
@@ -164,15 +164,11 @@ def _copy_input_paths(
         for path in paths:
             instance.push_file(
                 source=source_path / "files" / path,
-                # Path() here works around
-                # https://github.com/canonical/craft-providers/pull/135.
-                destination=Path(target_path / "files" / path),
+                destination=target_path / "files" / path,
             )
         instance.push_file(
             source=source_path / "properties",
-            # Path() here works around
-            # https://github.com/canonical/craft-providers/pull/135.
-            destination=Path(target_path / "properties"),
+            destination=target_path / "properties",
         )
     except Exception as e:
         raise CommandError(str(e), retcode=1)
@@ -228,9 +224,7 @@ def _copy_output_paths(
         destination = output_files / relative_path
         destination.parent.mkdir(parents=True, exist_ok=True)
         try:
-            # Path() here works around
-            # https://github.com/canonical/craft-providers/pull/83.
-            instance.pull_file(source=Path(path), destination=destination)
+            instance.pull_file(source=path, destination=destination)
         except Exception as e:
             raise CommandError(str(e), retcode=1)
 
diff --git a/requirements.txt b/requirements.txt
index 8d896f6..07b1bc5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ charset-normalizer==2.1.0
     # via requests
 craft-cli==1.2.0
     # via -r requirements.in
-craft-providers==1.3.1
+craft-providers==1.4.2
     # via -r requirements.in
 idna==3.3
     # via requests