diff --git a/.all-contributorsrc b/.all-contributorsrc index 4794a811..9dff2cd4 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -65,7 +65,8 @@ "profile": "https://github.com/ericpre", "contributions": [ "code", - "maintenance" + "maintenance", + "bug" ] }, { diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1b05e2b9..7614891b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -63,6 +63,8 @@ Fixed - Conversion from EDAX TSL projection center (PC) convention for (PCy, PCz) for rectangular detectors is corrected. (`#652 `_) +- Downloading files in the ``data`` module to the local cache on Windows. + (`#655 `_) 0.8.7 (2023-07-24) ================== diff --git a/README.md b/README.md index abfa1aff..58102741 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ Thanks go to these wonderful people ([emoji key](https://allcontributors.org/doc AndreasBugten
AndreasBugten

πŸ“– Carter Francis
Carter Francis

πŸ“– - Eric Prestat
Eric Prestat

πŸ’» 🚧 + Eric Prestat
Eric Prestat

πŸ’» 🚧 πŸ› HΓ₯kon Wiik Γ…nes
HΓ₯kon Wiik Γ…nes

Lars Lervik
Lars Lervik

πŸ› πŸ’» πŸ“– πŸ’¬ πŸ‘€ ⚠️ Magnus Nord
Magnus Nord

πŸ“– diff --git a/kikuchipy/data/_data.py b/kikuchipy/data/_data.py index ab11197d..d19f18c6 100644 --- a/kikuchipy/data/_data.py +++ b/kikuchipy/data/_data.py @@ -769,12 +769,12 @@ def fetch_file_path_from_collection( self, downloader: pooch.HTTPDownloader ) -> file_path: # pragma: no cover file_paths = marshall.fetch( - os.path.join("data", self.collection_name), + "data/" + self.collection_name, downloader=downloader, processor=pooch.Unzip(extract_dir=self.file_directory), ) - os.remove(os.path.join(marshall.path, "data", self.collection_name)) + os.remove(Path(marshall.path) / "data" / self.collection_name) # Ensure the file is in the collection desired_name = self.file_relpath.name