Merge pull request cyclus#1633 from cyclus/add-pip-to-dockerfile

nuclearkatie · Dec 1, 2023 · 6b58933 · 6b58933
2 parents 795fb8a + ec0c57d
commit 6b58933
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -17,7 +17,7 @@ Since last release
   will fail unless update-alternatives has been used to point python at the 
   correct python3 version (#1558)
 * build and test are now fown on githubAction in place or CircleCI (#1569)
-* Have separate workflows for testing, publishing dependency images, and publishing release images (#1597, #1602, #1606, #1609, #1629)
+* Have separate workflows for testing, publishing dependency images, and publishing release images (#1597, #1602, #1606, #1609, #1629, #1633)
 * Add Ubuntu 20.04 to the list of supported platforms (#1605, #1608)
 * Add random number generator (Mersenne Twister 19937, from boost) and the ability to set the seed in the simulation control block (#1599)
 * Added code coverage reporting to GitHub workflows (#1616)

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -37,6 +37,7 @@ RUN apt install -y \
         python3-tables \
         python3-pandas \
         python3-jinja2 \
+        python3-pip \
         cython3 \
         libwebsockets-dev 
 
@@ -102,6 +103,7 @@ RUN conda update -y --all && \
                "cython<3" \
                websockets \
                pprintpp \
+               pip \
                && \
     mamba install -y --force-reinstall libsqlite && \
     conda clean -y --all