MRG: Merge pull request #732 from octue/use-new-base-images-in-dockerfiles

Use new docker base images

Author: cortadocodes

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM windpioneers/gdal-python:familiar-catshark-gdal-2.4.1-python-3.9-dev
+FROM windpioneers/gdal-python:rational-swordtail-gdal-3.10.0-python-3.13-dev
 
 # Tell zsh where you want to store history
 #     We leave you to decide, but if you put this into a folder that's been mapped

.github/workflows/python-ci.yml

@@ -23,7 +23,7 @@ jobs:
     if: "!contains(github.event.head_commit.message, 'skipci')"
     runs-on: ${{ matrix.os }}
     env:
-      USING_COVERAGE: "3.10"
+      USING_COVERAGE: "3.12"
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
@@ -36,7 +36,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.12"
 
       - name: Install Poetry
         uses: snok/[email protected]

.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
     if: "${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }}"
     runs-on: ${{ matrix.os }}
     env:
-      USING_COVERAGE: "3.10"
+      USING_COVERAGE: "3.12"
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
@@ -40,7 +40,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.12"
 
       - name: Install Poetry
         uses: snok/[email protected]

docs/contributing.md

@@ -39,7 +39,7 @@ We use continuous deployment and semantic versioning for our releases:
   ```
   git clone <your_forked_repo_address>                          # Fetches the repo to your local machine
   cd octue-sdk-python                                           # Move into the repo directory
-  pyenv virtualenv 3.9 myenv                                    # Makes a virtual environment for you to install the dev tools into. Use any python >= 3.8
+  pyenv virtualenv 3.10 myenv                                   # Makes a virtual environment for you to install the dev tools into. Use any python >= 3.10
   pyenv activate myenv                                          # Activates the virtual environment so you don't affect other installations
   pip install poetry                                            # Installs the poetry package manager
   poetry install --all-extras                                   # Installs the package editably, including developer dependencies (e.g. testing and code formatting utilities)

docs/source/creating_services.rst

@@ -80,7 +80,7 @@ Dockerfile (optional)
         Twined services run in a Docker container if they are deployed. They can also run this way locally. The SDK
         provides a default ``Dockerfile`` for these purposes that will work for most cases:
 
-        - For deploying to `Kubernetes <https://github.com/octue/octue-sdk-python/blob/main/octue/cloud/deployment/dockerfiles/Dockerfile-python311>`_
+        - For deploying to `Kubernetes <https://github.com/octue/octue-sdk-python/blob/main/octue/cloud/deployment/dockerfiles/Dockerfile-python313>`_
 
         However, you may need to write and provide your own ``Dockerfile`` if your app requires:
 

octue/cloud/deployment/dockerfiles/Dockerfile-python311

@@ -1,4 +1,4 @@
-FROM windpioneers/gdal-python:modest-heron-gdal-2.4.1-python-3.11-slim
+FROM windpioneers/gdal-python:rational-swordtail-gdal-3.10.0-python-3.11-slim
 
 # Ensure print statements and log messages appear promptly in Cloud Logging.
 ENV PYTHONUNBUFFERED=True

octue/cloud/deployment/dockerfiles/Dockerfile-python312

@@ -0,0 +1,39 @@
+FROM windpioneers/gdal-python:rational-swordtail-gdal-3.10.0-python-3.12-slim
+
+# Ensure print statements and log messages appear promptly in Cloud Logging.
+ENV PYTHONUNBUFFERED=True
+
+ENV PROJECT_ROOT=/workspace
+WORKDIR $PROJECT_ROOT
+
+RUN apt-get update -y && apt-get install -y --fix-missing build-essential && rm -rf /var/lib/apt/lists/*
+
+# Install poetry.
+ENV POETRY_HOME=/root/.poetry
+ENV PATH="$POETRY_HOME/bin:$PATH"
+RUN curl -sSL https://install.python-poetry.org | python3 - && poetry config virtualenvs.create false;
+
+# Copy in the dependencies file(s) for caching. One or more of `requirements.txt`, `setup.py`, and `pyproject.toml and
+# `poetry.lock` must be present.
+COPY pyproject.tom[l] poetry.loc[k] setup.p[y] requirements.tx[t] ./
+
+# If `pyproject.toml` is present, install the dependencies only to utilise layer caching for quick rebuilds.
+RUN if [ -f "pyproject.toml" ]; then poetry install  \
+    --no-ansi  \
+    --no-interaction  \
+    --no-cache  \
+    --no-root  \
+    --only main;  \
+    fi
+
+# Copy local code to the application root directory.
+COPY . .
+
+# Install local packages if using poetry. Otherwise, install everything if using `setup.py` or `requirements.txt`.
+RUN if [ -f "pyproject.toml" ]; then poetry install --only main;  \
+    elif [ -f "setup.py" ]; then pip install --upgrade pip && pip install -e .;  \
+    elif [ -f "requirements.txt" ]; then pip install --upgrade pip && pip install -r requirements.txt; fi
+
+ENV USE_OCTUE_LOG_HANDLER=1
+ENV COMPUTE_PROVIDER=GOOGLE_KUEUE
+CMD ["octue", "question", "ask", "local"]

octue/cloud/deployment/dockerfiles/Dockerfile-python313

@@ -0,0 +1,39 @@
+FROM windpioneers/gdal-python:rational-swordtail-gdal-3.10.0-python-3.13-slim
+
+# Ensure print statements and log messages appear promptly in Cloud Logging.
+ENV PYTHONUNBUFFERED=True
+
+ENV PROJECT_ROOT=/workspace
+WORKDIR $PROJECT_ROOT
+
+RUN apt-get update -y && apt-get install -y --fix-missing build-essential && rm -rf /var/lib/apt/lists/*
+
+# Install poetry.
+ENV POETRY_HOME=/root/.poetry
+ENV PATH="$POETRY_HOME/bin:$PATH"
+RUN curl -sSL https://install.python-poetry.org | python3 - && poetry config virtualenvs.create false;
+
+# Copy in the dependencies file(s) for caching. One or more of `requirements.txt`, `setup.py`, and `pyproject.toml and
+# `poetry.lock` must be present.
+COPY pyproject.tom[l] poetry.loc[k] setup.p[y] requirements.tx[t] ./
+
+# If `pyproject.toml` is present, install the dependencies only to utilise layer caching for quick rebuilds.
+RUN if [ -f "pyproject.toml" ]; then poetry install  \
+    --no-ansi  \
+    --no-interaction  \
+    --no-cache  \
+    --no-root  \
+    --only main;  \
+    fi
+
+# Copy local code to the application root directory.
+COPY . .
+
+# Install local packages if using poetry. Otherwise, install everything if using `setup.py` or `requirements.txt`.
+RUN if [ -f "pyproject.toml" ]; then poetry install --only main;  \
+    elif [ -f "setup.py" ]; then pip install --upgrade pip && pip install -e .;  \
+    elif [ -f "requirements.txt" ]; then pip install --upgrade pip && pip install -r requirements.txt; fi
+
+ENV USE_OCTUE_LOG_HANDLER=1
+ENV COMPUTE_PROVIDER=GOOGLE_KUEUE
+CMD ["octue", "question", "ask", "local"]

octue/cloud/storage/client.py

@@ -14,16 +14,13 @@
 from google.cloud.storage import Client
 from google.cloud.storage.constants import _DEFAULT_TIMEOUT
 from google.cloud.storage.retry import DEFAULT_RETRY
+from google_crc32c import Checksum
 
 from octue.cloud import storage
 from octue.exceptions import CloudStorageBucketNotFound
 from octue.utils.decoders import OctueJSONDecoder
 from octue.utils.encoders import OctueJSONEncoder
 
-with warnings.catch_warnings():
-    warnings.filterwarnings("ignore", category=RuntimeWarning, module="google_crc32c")
-    from google_crc32c import Checksum
-
 logger = logging.getLogger(__name__)
 
 

octue/mixins/hashable.py

@@ -1,12 +1,8 @@
 import base64
 import collections.abc
 import datetime
-import warnings
-
-with warnings.catch_warnings():
-    warnings.filterwarnings("ignore", category=RuntimeWarning, module="google_crc32c")
-    from google_crc32c import Checksum
 
+from google_crc32c import Checksum
 
 EMPTY_STRING_HASH_VALUE = "AAAAAA=="