Merge main into dev (reconcile v1.3.1 and v1.3.2)

.github/workflows/run_dev_tests.yml

@@ -24,3 +24,23 @@ jobs:
       run: flake8 . && interrogate --verbose .
     - name: Run tests and coverage
       run: coverage run -m unittest discover && coverage report
+  docker_build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+    - name: Build docker image
+      uses: docker/build-push-action@v3
+      with:
+        context: .
+        push: false
+        load: true
+        tags: aind-metadata-mapper:pr-test
+    - name: Smoke test docker image
+      run: |
+        docker run --rm aind-metadata-mapper:pr-test cat /etc/os-release
+        docker run --rm aind-metadata-mapper:pr-test git --version
+        docker run --rm aind-metadata-mapper:pr-test python -c \
+          "import aind_metadata_mapper; print(aind_metadata_mapper.__version__)"
+        docker run --rm aind-metadata-mapper:pr-test aind-instrument --help

.github/workflows/run_main_tests.yml

@@ -31,6 +31,26 @@ jobs:
       run: |
         echo "=== Running unit tests with coverage ==="
         coverage run -m unittest discover && coverage report
+  docker_build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+    - name: Build docker image
+      uses: docker/build-push-action@v3
+      with:
+        context: .
+        push: false
+        load: true
+        tags: aind-metadata-mapper:pr-test
+    - name: Smoke test docker image
+      run: |
+        docker run --rm aind-metadata-mapper:pr-test cat /etc/os-release
+        docker run --rm aind-metadata-mapper:pr-test git --version
+        docker run --rm aind-metadata-mapper:pr-test python -c \
+          "import aind_metadata_mapper; print(aind_metadata_mapper.__version__)"
+        docker run --rm aind-metadata-mapper:pr-test aind-instrument --help
   verify_version:
     runs-on: ubuntu-latest
     steps:

Dockerfile

@@ -1,10 +1,12 @@
-FROM python:3.10-bullseye
+FROM python:3.10-bookworm
 WORKDIR /app
 ADD src ./src
 ADD pyproject.toml .
 ADD setup.py .
 
 # Add git in case we need to install from branches
-RUN apt-get update && apt-get install -y git
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends git \
+    && rm -rf /var/lib/apt/lists/*
 RUN pip install --upgrade pip
 RUN pip install . --no-cache-dir

pyproject.toml

@@ -21,7 +21,7 @@ dependencies = [
     "pyyaml",
     "pydantic-settings>=2.8.0",
     "jsonschema",
-    "aind-data-schema>=2.7.1,<3",
+    "aind-data-schema>=2.9.0,<3",
     "aind-metadata-extractor==0.3.11",
 ]
 

src/aind_metadata_mapper/__init__.py

@@ -1,3 +1,3 @@
 """Init package"""
 
-__version__ = "1.3.0"
+__version__ = "1.3.2"