Merge branch 'main' into main

Signed-off-by: Merel Theisen <[email protected]>
tgoelles · May 21, 2024 · d962aba · d962aba
2 parents 87bb070 + 4f41b5b
commit d962aba
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/kedro-datasets/.readthedocs.yaml b/kedro-datasets/.readthedocs.yaml
@@ -12,7 +12,7 @@ build:
   jobs:
     pre_install:
       - python -m pip install "uv==0.1.13"
-      - UV_HTTP_TIMEOUT=1000 uv pip install --system --upgrade sphinx readthedocs-sphinx-ext "kedro-datasets[docs,test] @ ./kedro-datasets"
+      - UV_HTTP_TIMEOUT=1000 uv pip install --system --upgrade sphinx readthedocs-sphinx-ext "kedro-datasets[docs,test,experimental] @ ./kedro-datasets"
       - uv pip freeze
     pre_build:
       - python -m sphinx -WETan -j auto -D language=en -b linkcheck -d kedro-datasets/_build/doctrees kedro-datasets/docs/source kedro-datasets/_build/linkcheck

diff --git a/kedro-datasets/docs/source/api/kedro_datasets_experimental.rst b/kedro-datasets/docs/source/api/kedro_datasets_experimental.rst
@@ -1,5 +1,5 @@
 kedro_datasets_experimental
-==============
+===========================
 
 .. rubric:: Description
 
@@ -11,4 +11,4 @@ kedro_datasets_experimental
    :toctree:
    :template: autosummary/class.rst
 
-   kedro_datasets_experimental.xarray.GeoTiffDataset
+   kedro_datasets_experimental.xarray.GeoTiffDataset
diff --git a/kedro-datasets/docs/source/index.md b/kedro-datasets/docs/source/index.md
@@ -14,6 +14,7 @@ Browse the complete list of datasets:
    :recursive:
 
    kedro_datasets
+   kedro_datasets_experimental
 ```
 
 # Indices and tables

diff --git a/kedro-datasets/pyproject.toml b/kedro-datasets/pyproject.toml
@@ -207,7 +207,6 @@ test = [
     "matplotlib>=3.0.3, <3.4; python_version < '3.10'",  # 3.4.0 breaks holoviews
     "matplotlib>=3.5, <3.6; python_version >= '3.10'",
     "memory_profiler>=0.50.0, <1.0",
-    "mypy~=1.0",
     "moto==5.0.0",
     "mypy~=1.0",
     "networkx~=2.4",
@@ -261,10 +260,12 @@ test = [
     "types-tabulate",
 ]
 
+# Experimental dataset requirements
+experimental = ["rioxarray>=0.15.0"]
+
 # All requirements
 all = ["kedro-datasets[test,docs]"]
 
-
 [project.urls]
 Source = "https://github.com/kedro-org/kedro-plugins/tree/main/kedro-datasets"
 Documentation = "https://docs.kedro.org"

diff --git a/kedro-docker/features/environment.py b/kedro-docker/features/environment.py
@@ -42,7 +42,7 @@ def before_all(context):
             # Temporarily pin pip to fix https://github.com/jazzband/pip-tools/issues/1503
             # This can be removed when Kedro 0.17.6 is released, because pip-tools is upgraded
             # for that version.
-            "pip>=21.2,<23.2",
+            "pip>=21.2",
             "setuptools>=38.0",
             "wheel",
             ".",

diff --git a/kedro-docker/kedro_docker/template/Dockerfile.simple b/kedro-docker/kedro_docker/template/Dockerfile.simple
@@ -3,7 +3,7 @@ FROM $BASE_IMAGE as runtime-environment
 
 # install project requirements
 COPY requirements.txt /tmp/requirements.txt
-RUN python -m pip install -U "pip>=21.2,<23.2"
+RUN python -m pip install -U "pip>=21.2"
 RUN pip install --no-cache-dir -r /tmp/requirements.txt && rm -f /tmp/requirements.txt
 
 # add kedro user

diff --git a/kedro-docker/kedro_docker/template/Dockerfile.spark b/kedro-docker/kedro_docker/template/Dockerfile.spark
@@ -7,7 +7,7 @@ apt-get install -y procps default-jre-headless && rm -rf /var/lib/apt/lists/*
 
 # install project requirements
 COPY requirements.txt /tmp/requirements.txt
-RUN python -m pip install -U "pip>=21.2,<23.2"
+RUN python -m pip install -U "pip>=21.2"
 RUN pip install --no-cache-dir -r /tmp/requirements.txt && rm -f /tmp/requirements.txt
 
 # add kedro user