From 425f5e96539d48551373ca492cd4185b709319d6 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Sat, 3 Dec 2022 14:54:55 +0100 Subject: [PATCH 1/2] DEV: update valgrind Dockerfile --- .dockerignore | 4 +++- docker/Dockerfile.valgrind | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.dockerignore b/.dockerignore index 533c866ae..d0ad62a6b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -5,8 +5,10 @@ !/*.py !/*LICENSE* !/setup.cfg -!/pygeos/** +!/pyproject.toml +!/shapely/** !/src/** +!/tests/** # Ignore unnecessary files inside allowed directories # This should go after the allowed directories diff --git a/docker/Dockerfile.valgrind b/docker/Dockerfile.valgrind index 17575e7d4..fc4374e39 100644 --- a/docker/Dockerfile.valgrind +++ b/docker/Dockerfile.valgrind @@ -1,7 +1,7 @@ -# This docker is used for memory leak testing of pygeos. To use it, first build: -# docker build . -f ./docker/Dockerfile.valgrind -t pygeos/valgrind +# This docker is used for memory leak testing of shapely. To use it, first build: +# docker build . -f ./docker/Dockerfile.valgrind -t shapely/valgrind # Then run the pytest suite with valgrind enabled: -# docker run --rm pygeos/valgrind:latest valgrind --show-leak-kinds=definite --log-file=/tmp/valgrind-output python -m pytest -vv --valgrind --valgrind-log=/tmp/valgrind-output > valgrind.log +# docker run --rm shapely/valgrind:latest valgrind --show-leak-kinds=definite --log-file=/tmp/valgrind-output python -m pytest -vv --valgrind --valgrind-log=/tmp/valgrind-output > valgrind.log FROM python:3.9-slim-buster @@ -29,5 +29,5 @@ RUN export GEOS_VERSION=3.10.3 && \ COPY . /code -# Build pygeos +# Build shapely RUN python setup.py build_ext --inplace && python setup.py install From 34d71eb35503c6b8d4c258e488de8661e04c5fa0 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Tue, 6 Dec 2022 21:03:43 +0100 Subject: [PATCH 2/2] also update arm64 dockerfile --- docker/Dockerfile.arm64 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile.arm64 b/docker/Dockerfile.arm64 index fb81e6ee9..23273a7c2 100644 --- a/docker/Dockerfile.arm64 +++ b/docker/Dockerfile.arm64 @@ -1,8 +1,8 @@ -# This docker container is used for testing pygeos in ARM64 emulation mode. +# This docker container is used for testing shapely in ARM64 emulation mode. # To build it: -# docker build . -f ./docker/Dockerfile.arm64 -t pygeos/arm64 -# Then run the pygeos test suite: -# docker run --rm pygeos/arm64:latest python3 -m pytest -vv +# docker build . -f ./docker/Dockerfile.arm64 -t shapely/arm64 +# Then run the shapely test suite: +# docker run --rm shapely/arm64:latest python3 -m pytest -vv FROM --platform=linux/arm64/v8 arm64v8/ubuntu:20.04