Skip to content

Commit

Permalink
rearrange installations
Browse files Browse the repository at this point in the history
  • Loading branch information
ilia-nikiforov-umn committed Mar 31, 2024
1 parent 15881f8 commit 72a4a8a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
4 changes: 0 additions & 4 deletions docker/config/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,6 @@ WORKDIR /home/openkim/
# Change to editable installations of things we're likely to edit during the hackathon. Retained Git for this as well as general use
RUN pip install kim-property==2.6.1

RUN git clone -q --single-branch -b tests https://github.com/openkim/kim-python-utils \
&& cd kim-python-utils \
&& pip install -e .

RUN git clone -q https://github.com/openkim-hackathons/kim-test-utils \
&& cd kim-test-utils \
&& pip install -e .
Expand Down
3 changes: 3 additions & 0 deletions docker/git/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ RUN apt-get install --no-install-recommends -qqy git
RUN git clone -q https://github.com/openkim/numdifftools -b master ${PACKAGE_DIR}/numdifftools \
&& cd ${PACKAGE_DIR}/numdifftools \
&& git checkout a53debb144ed02c5c6eb74d5c18d53058259f27c
RUN git clone -q https://github.com/openkim/kim-python-utils -b tests ${PACKAGE_DIR}/kim-python-utils \
&& cd ${PACKAGE_DIR}/kim-python-utils \
&& git checkout 8da809aef78a553d59e795ffd0b8d92db3ce9297
RUN git clone -q https://github.com/openkim/crystal-genome-util -b main ${PACKAGE_DIR}/crystal-genome-util \
&& cd ${PACKAGE_DIR}/crystal-genome-util \
&& git checkout e18a2d62fc3e391acbf9c98a28efaebca914b007
Expand Down
10 changes: 8 additions & 2 deletions docker/install/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,15 @@ RUN cd ${PACKAGE_DIR}/ase/ \
&& ${PIP} install .

#########################################
## crystal-genome-util;
## kim-python-utils
#########################################
# uninstall kim-property so we can have an editable user install later
RUN cd ${PACKAGE_DIR}/kim-python-utils \
&& ${PIP} install .

#########################################
## crystal-genome-util
#########################################
# uninstall kim-property so we can have a user install later, for adding properties
RUN cd ${PACKAGE_DIR}/crystal-genome-util \
&& ${PIP} install . \
&& ${PIP} uninstall -y kim-property
Expand Down

0 comments on commit 72a4a8a

Please sign in to comment.