Merge branch 'release/v0.2.4'

TODO.rst

@@ -4,7 +4,36 @@ Colour - Datasets - TODO
 TODO
 ----
 
+-   colour_datasets/__init__.py
 
+    -   Line 78 : # TODO: Remove legacy printing support when deemed appropriate.
+
+
+-   colour_datasets/records/zenodo.py
+
+    -   Line 450 : # TODO: Remove the following space escaping: The new Zenodo API is not quoting filenames properly thus we are temporarily escaping spaces for now. https://github.com/colour-science/colour-datasets/issues/ 36issuecomment-1773464695
+
+
+-   colour_datasets/utilities/common.py
+
+    -   Line 42 : # TODO: Use *colour* definition.
+
+
+-   colour_datasets/loaders/kuopio.py
+
+    -   Line 310 : # TODO: Implement support for *Natural Colors*: https://sandbox.zenodo.org/record/315640 http://www.uef.fi/web/spectral/natural-colors
+
+
+-   colour_datasets/loaders/xrite2016.py
+
+    -   Line 109 : # TODO: Implement support for "CGATS" file format in "Colour": https://github.com/colour-science/colour/issues/354
+
+
+-   colour_datasets/loaders/dyer2017.py
+
+    -   Line 141 : # TODO: Re-instate "manufacturer", "model", "illuminant" and "type" attributes according to outcome of https://github.com/ampas/rawtoaces/issues/114. Those attributes are currently stored in "self._kwargs".
+    -   Line 928 : # TODO: Re-instate "manufacturer", "model", "illuminant" and "type" attributes according to outcome of https://github.com/ampas/rawtoaces/issues/114.
+    -   Line 1430 : # TODO: Re-instate "manufacturer", "model", "illuminant" and "type" attributes according to outcome of https://github.com/ampas/rawtoaces/issues/114.
 
 About
 -----

colour_datasets/__init__.py

@@ -51,7 +51,7 @@
 
 __major_version__ = "0"
 __minor_version__ = "2"
-__change_version__ = "3"
+__change_version__ = "4"
 __version__ = ".".join(
     (__major_version__, __minor_version__, __change_version__)
 )

colour_datasets/loaders/asano2015.py

@@ -342,3 +342,9 @@ def build_Asano2015(load: bool = True) -> DatasetLoader_Asano2015:
             _DATASET_LOADER_ASANO2015.load()
 
     return _DATASET_LOADER_ASANO2015
+
+
+if __name__ == "__main__":
+    import colour_datasets
+
+    colour_datasets.load("3252742")

colour_datasets/records/tests/test_zenodo.py

@@ -159,10 +159,10 @@ def test__str__(self):
 -----
 
 - camlist&equipment.txt : https://zenodo.org/api/records/3245883/files/\
-camlist&equipment.txt
+camlist&equipment.txt/content
 - camspec_database.txt : https://zenodo.org/api/records/3245883/files/\
-camspec_database.txt
-- urls.txt : https://zenodo.org/api/records/3245883/files/urls.txt"""
+camspec_database.txt/content
+- urls.txt : https://zenodo.org/api/records/3245883/files/urls.txt/content"""
             )[1:],
         )
 

colour_datasets/records/zenodo.py

@@ -13,6 +13,7 @@
 
 import json
 import os
+import re
 import shutil
 import stat
 import tempfile
@@ -204,8 +205,8 @@ def strip_html(text: str) -> str:
 
         files = "\n".join(
             [
-                f"- {file_data['filename']} : {file_data['links']['self']}"
-                for file_data in sorted(files, key=lambda x: x["filename"])
+                f'- {file_data["key"]} : {file_data["links"]["self"]}'
+                for file_data in sorted(files, key=lambda x: x["key"])
             ]
         )
 
@@ -388,31 +389,29 @@ def pull(self, use_urls_txt_file: bool = True, retries: int = 3):
         # given by the content of :attr:`URLS_TXT_FILE` attribute file.
         urls_txt = None
         for file_data in self.data["files"]:
-            if file_data["filename"] == self._configuration.urls_txt_file:
+            if file_data["key"] == self._configuration.urls_txt_file:
                 urls_txt = file_data
                 break
 
-        def urls_download(urls: Dict, is_content_url=False):
+        def urls_download(urls: Dict) -> None:
             """Download given urls."""
 
             for url, md5 in urls.items():
+                filename = re.sub("/content$", "", url)
                 filename = os.path.join(
                     downloads_directory,
                     urllib.parse.unquote(  # pyright: ignore
-                        url.split("/")[-1]
+                        filename.split("/")[-1]
                     ),
                 )
-                url = (  # noqa: PLW2901
-                    f"{url}/content" if is_content_url else url
-                )
                 url_download(url, filename, md5.split(":")[-1], retries)
 
         try:
             if use_urls_txt_file and urls_txt:
                 urls = {}
                 urls_txt_file = tempfile.NamedTemporaryFile(delete=False).name
                 url_download(
-                    urls_txt["links"]["download"],
+                    urls_txt["links"]["self"],
                     urls_txt_file,
                     urls_txt["checksum"].split(":")[-1],
                     retries,
@@ -445,7 +444,7 @@ def urls_download(urls: Dict, is_content_url=False):
 
             urls = {}
             for file_data in self.data["files"]:
-                if file_data["filename"] == self._configuration.urls_txt_file:
+                if file_data["key"] == self._configuration.urls_txt_file:
                     continue
 
                 # TODO: Remove the following space escaping: The new Zenodo API
@@ -457,7 +456,7 @@ def urls_download(urls: Dict, is_content_url=False):
 
                 urls[url] = file_data["checksum"].split(":")[-1]
 
-            urls_download(urls, is_content_url=True)
+            urls_download(urls)
 
         deflate_directory = os.path.join(
             self.repository, self._configuration.deflate_directory

colour_datasets/utilities/common.py

@@ -39,6 +39,7 @@
 ]
 
 
+# TODO: Use *colour* definition.
 class suppress_stdout:
     """A context manager and decorator temporarily suppressing standard output."""
 

docs/requirements.txt

@@ -1,28 +1,28 @@
 accessible-pygments==0.0.4 ; python_version >= "3.9" and python_version < "3.12"
 alabaster==0.7.13 ; python_version >= "3.9" and python_version < "3.12"
-babel==2.13.0 ; python_version >= "3.9" and python_version < "3.12"
+babel==2.13.1 ; python_version >= "3.9" and python_version < "3.12"
 beautifulsoup4==4.12.2 ; python_version >= "3.9" and python_version < "3.12"
 biblib-simple==0.1.2 ; python_version >= "3.9" and python_version < "3.12"
-cachetools==5.3.1 ; python_version >= "3.9" and python_version < "3.12"
+cachetools==5.3.2 ; python_version >= "3.9" and python_version < "3.12"
 certifi==2023.7.22 ; python_version >= "3.9" and python_version < "3.12"
-charset-normalizer==3.3.0 ; python_version >= "3.9" and python_version < "3.12"
+charset-normalizer==3.3.2 ; python_version >= "3.9" and python_version < "3.12"
 colorama==0.4.6 ; python_version >= "3.9" and python_version < "3.12" and (platform_system == "Windows" or sys_platform == "win32")
 colour-science==0.4.3 ; python_version >= "3.9" and python_version < "3.12"
 docutils==0.20.1 ; python_version >= "3.9" and python_version < "3.12"
 idna==3.4 ; python_version >= "3.9" and python_version < "3.12"
-imageio==2.31.5 ; python_version >= "3.9" and python_version < "3.12"
+imageio==2.32.0 ; python_version >= "3.9" and python_version < "3.12"
 imagesize==1.4.1 ; python_version >= "3.9" and python_version < "3.12"
 importlib-metadata==6.8.0 ; python_version >= "3.9" and python_version < "3.10"
 jinja2==3.1.2 ; python_version >= "3.9" and python_version < "3.12"
 latexcodec==2.0.1 ; python_version >= "3.9" and python_version < "3.12"
 markupsafe==2.1.3 ; python_version >= "3.9" and python_version < "3.12"
-numpy==1.26.1 ; python_version >= "3.9" and python_version < "3.12"
+numpy==1.26.2 ; python_version >= "3.9" and python_version < "3.12"
 opencv-python==4.8.1.78 ; python_version >= "3.9" and python_version < "3.12"
 packaging==23.2 ; python_version >= "3.9" and python_version < "3.12"
-pillow==10.1.0 ; python_version >= "3.9" and python_version < "3.12"
+pillow==10.0.1 ; python_version >= "3.9" and python_version < "3.12"
 pybtex-docutils==1.0.3 ; python_version >= "3.9" and python_version < "3.12"
 pybtex==0.24.0 ; python_version >= "3.9" and python_version < "3.12"
-pydata-sphinx-theme==0.14.1 ; python_version >= "3.9" and python_version < "3.12"
+pydata-sphinx-theme==0.14.3 ; python_version >= "3.9" and python_version < "3.12"
 pygments==2.16.1 ; python_version >= "3.9" and python_version < "3.12"
 pyyaml==6.0.1 ; python_version >= "3.9" and python_version < "3.12"
 requests==2.31.0 ; python_version >= "3.9" and python_version < "3.12"
@@ -41,6 +41,6 @@ sphinxcontrib-qthelp==1.0.6 ; python_version >= "3.9" and python_version < "3.12
 sphinxcontrib-serializinghtml==1.1.9 ; python_version >= "3.9" and python_version < "3.12"
 tqdm==4.66.1 ; python_version >= "3.9" and python_version < "3.12"
 typing-extensions==4.8.0 ; python_version >= "3.9" and python_version < "3.12"
-urllib3==2.0.7 ; python_version >= "3.9" and python_version < "3.12"
+urllib3==2.1.0 ; python_version >= "3.9" and python_version < "3.12"
 xlrd==1.2.0 ; python_version >= "3.9" and python_version < "3.12"
 zipp==3.17.0 ; python_version >= "3.9" and python_version < "3.10"

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "colour-datasets"
-version = "0.2.3"
+version = "0.2.4"
 description = "Colour science datasets for use with Colour"
 license = "BSD-3-Clause"
 authors = [ "Colour Developers <[email protected]>" ]
@@ -62,7 +62,7 @@ coveralls = "*"
 flynt = "*"
 invoke = "*"
 jupyter = "*"
-pre-commit = "*"
+pre-commit = ">= 3.5"
 pyright = "*"
 pytest = "*"
 pytest-cov = "*"