Skip to content

Commit

Permalink
Merge pull request #1609 from cyclus/gonuke-patch-1
Browse files Browse the repository at this point in the history
Fix pythonpath
  • Loading branch information
bennibbelink committed Oct 21, 2023
2 parents 7292008 + 86b4ed1 commit bc3785e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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)
* Have separate workflows for testing, publishing dependency images, and publishing release images (#1597, #1602, #1606, #1609)
* Add Ubuntu 20.04 to the list of supported platforms (#1605)

**Changed:**
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ RUN apt install -y python3-pprintpp; exit 0
RUN apt clean -y all

RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
RUN mkdir -p `python -m site --user-site`

FROM common-base as conda-deps

Expand Down Expand Up @@ -104,10 +105,10 @@ RUN conda update -y --all && \
&& \
mamba install -y --force-reinstall libsqlite && \
conda clean -y --all
RUN mkdir -p `python -m site --user-site`
ENV CC /opt/conda/bin/x86_64-conda_cos6-linux-gnu-gcc
ENV CXX /opt/conda/bin/x86_64-conda_cos6-linux-gnu-g++
ENV CPP /opt/conda/bin/x86_64-conda_cos6-linux-gnu-cpp
ENV PYTHONPATH "/root/.local/lib/python3.10/site-packages/"

FROM ${pkg_mgr}-deps as cyclus
ARG make_cores=2
Expand All @@ -121,7 +122,6 @@ WORKDIR /cyclus

# You may add the option "--cmake-debug" to the following command
# for further CMake debugging.
RUN mkdir -p `python -m site --user-site`
RUN python install.py -j ${make_cores} --build-type=Release --core-version 999999.999999
ENV PATH /root/.local/bin:$PATH
ENV LD_LIBRARY_PATH /root/.local/lib:/root/.local/lib/cyclus
Expand Down

0 comments on commit bc3785e

Please sign in to comment.