Fix issues removing files on windows

src/outpack/filestore.py

@@ -56,7 +56,26 @@ def ls(self):
         return ret
 
     def destroy(self) -> None:
-        shutil.rmtree(self._path)
+        def onerror(func, path, _exc_info):
+            """
+            Error handler for ``shutil.rmtree``.
+
+            If the error is due to an access error (read only file)
+            it attempts to add write permission and then retries.
+
+            If the error is for another reason it re-raises the error.
+            We manually remove write permission in ``put`` above so this
+            is expected
+
+            Usage : ``shutil.rmtree(path, onerror=onerror)``
+            """
+            if not os.access(path, os.W_OK):
+                os.chmod(path, stat.S_IWUSR)
+                func(path)
+            else:
+                raise
+
+        shutil.rmtree(self._path, onerror=onerror)
 
     def tmp(self) -> str:
         path = self._path / "tmp"

tests/test_filestore.py

@@ -72,7 +72,7 @@ def test_get_files_fails_if_overwrite_false(tmp_path):
 
     with pytest.raises(Exception) as e:
         store.get(h, dest, False)
-    assert e.match(f"Failed to copy '.+' to '{dest}', file already exists")
+    assert e.match(rf"Failed to copy '.+' to '{dest}', file already exists")
 
 
 def test_if_hash_not_found(tmp_path):

tests/test_location_pull.py

@@ -23,6 +23,7 @@
 )
 from outpack.packet import Packet
 from outpack.util import read_string
+
 from .helpers import (
     create_metadata_depends,
     create_random_packet,
@@ -275,16 +276,16 @@ def test_can_resolve_dependencies_where_there_are_none():
 
 def test_can_find_dependencies():
     metadata = {
-        **create_metadata_depends("a")
-        **create_metadata_depends("b")
-        **create_metadata_depends("c")
-        **create_metadata_depends("d", ["a", "b"])
-        **create_metadata_depends("e", ["b", "c"])
-        **create_metadata_depends("f", ["a", "c"])
-        **create_metadata_depends("g", ["a", "f", "c"])
-        **create_metadata_depends("h", ["a", "b", "c"])
-        **create_metadata_depends("i", ["f"])
-        **create_metadata_depends("j", ["i", "e", "a"])
+        **create_metadata_depends("a"),
+        **create_metadata_depends("b"),
+        **create_metadata_depends("c"),
+        **create_metadata_depends("d", ["a", "b"]),
+        **create_metadata_depends("e", ["b", "c"]),
+        **create_metadata_depends("f", ["a", "c"]),
+        **create_metadata_depends("g", ["a", "f", "c"]),
+        **create_metadata_depends("h", ["a", "b", "c"]),
+        **create_metadata_depends("i", ["f"]),
+        **create_metadata_depends("j", ["i", "e", "a"]),
     }
 
     assert _find_all_dependencies(["a"], metadata) == ["a"]
@@ -311,16 +312,16 @@ def test_can_find_dependencies():
 
 def test_can_find_multiple_dependencies_at_once():
     metadata = {
-        **create_metadata_depends("a")
-        **create_metadata_depends("b")
-        **create_metadata_depends("c")
-        **create_metadata_depends("d", ["a", "b"])
-        **create_metadata_depends("e", ["b", "c"])
-        **create_metadata_depends("f", ["a", "c"])
-        **create_metadata_depends("g", ["a", "f", "c"])
-        **create_metadata_depends("h", ["a", "b", "c"])
-        **create_metadata_depends("i", ["f"])
-        **create_metadata_depends("j", ["i", "e", "a"])
+        **create_metadata_depends("a"),
+        **create_metadata_depends("b"),
+        **create_metadata_depends("c"),
+        **create_metadata_depends("d", ["a", "b"]),
+        **create_metadata_depends("e", ["b", "c"]),
+        **create_metadata_depends("f", ["a", "c"]),
+        **create_metadata_depends("g", ["a", "f", "c"]),
+        **create_metadata_depends("h", ["a", "b", "c"]),
+        **create_metadata_depends("i", ["f"]),
+        **create_metadata_depends("j", ["i", "e", "a"]),
     }
 
     assert _find_all_dependencies([], metadata) == []