Skip to content

Commit cd1f777

Browse files
authored
Update to Dockerfile and Makefile to reflect recent install method changes (#119)
* Changes to Dockerfile and Makefile to reflect most recent changes to install method * Setting version of matplotlib in Dockerfile to be 3.10.0 * Installing using test hook in Dockerfile
1 parent 2abfc05 commit cd1f777

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ RUN pip3 install --upgrade pip setuptools wheel
2121
COPY . /pace
2222

2323
RUN cd /pace && \
24-
pip3 install -r /pace/requirements_dev.txt -c /pace/constraints.txt
24+
pip3 install .[test]
2525

2626
RUN cd / && \
2727
git clone https://github.com/ai2cm/fv3net
2828

2929
ENV CFLAGS="-I/usr/include -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"
3030

3131
RUN python3 -m pip install \
32-
matplotlib==3.5.2 \
32+
matplotlib==3.10.0 \
3333
ipyparallel==8.4.1 \
3434
jupyterlab==3.4.4 \
3535
shapely==1.8.5 \

Makefile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,6 @@ savepoint_tests_mpi: build
124124
dependencies.svg: dependencies.dot
125125
dot -Tsvg $< -o $@
126126

127-
.PHONY: constraints.txt
128-
constraints.txt: driver/setup.py ndsl/setup.py pyFV3/setup.py pySHiELD/setup.py requirements_docs.txt requirements_lint.txt external/gt4py/setup.cfg requirements_dev.txt
129-
pip-compile $^ --output-file constraints.txt
130-
sed -i.bak '/\@ git+https/d' constraints.txt
131-
rm -f constraints.txt.bak
132-
133127
physics_savepoint_tests: build
134128
TARGET=physics $(MAKE) get_test_data
135129
$(CONTAINER_CMD) $(CONTAINER_FLAGS) bash -c "$(SAVEPOINT_SETUP) && cd $(PACE_PATH) && pytest --data_path=$(EXPERIMENT_DATA_RUN)/physics/ $(TEST_ARGS) $(PHYSICS_THRESH_ARGS) $(PACE_PATH)/physics/tests/savepoint"

0 commit comments

Comments
 (0)