Merge pull request #204 from cyclus/noble-numbat

cyclus · Oct 21, 2024 · 0a66166 · 0a66166
2 parents e3e2081 + 929641b
commit 0a66166
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -26,6 +26,7 @@ jobs:
         ubuntu_versions : [
           20.04,
           22.04,
+          24.04,
         ]
         pkg_mgr : [
           apt,

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -7,6 +7,8 @@ Since last release
 
 **Added:**
 
+* Added Ubuntu 24.04 to CI workflows (#204)
+
 **Changed:**
 
 * Rely on `python3` in environment instead of `python` (#196)

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -2,11 +2,18 @@ ARG pkg_mgr=apt
 ARG ubuntu_version=22.04
 ARG cycamore_tag=latest
 
-FROM ghcr.io/cyclus/cycamore_${ubuntu_version}_${pkg_mgr}/cycamore:${cycamore_tag} AS cymetric
+FROM ghcr.io/cyclus/cycamore_${ubuntu_version}_${pkg_mgr}/cycamore:${cycamore_tag} AS cycamore-base
 
+FROM cycamore-base AS apt-deps
+RUN apt install -y python3-matplotlib
+
+FROM cycamore-base AS conda-deps
+RUN mamba install -y matplotlib
+
+FROM ${pkg_mgr}-deps AS cymetric
 COPY . /cymetric
 WORKDIR /cymetric
-RUN python3 -m pip install --target $(python3 -m site --user-site) .
+RUN python3 -m pip install --target $(python3 -m site --user-site) --no-deps .
 
 FROM cymetric AS cymetric-pytest
 RUN cd tests && python3 -m pytest
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,7 @@ jobs: @@
             ubuntu_versions : [
 .04,
 .04,
+.04,
             ]
             pkg_mgr : [
               apt,
@@ Expand Down @@