From 02ccc282cccbee4100124f740ca1fc69c95559a0 Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Mon, 4 Nov 2024 14:59:01 +0100 Subject: [PATCH 1/2] Skip installing WEBPROJ into the Docker image The way it is called does not require the package to be installed in the Python environment and since it has been causing problems we just skip that step. --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7a57c96..3a7f43a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM condaforge/miniforge3 # We store PROJ ressources in $WEBPROJ_LIB -ENV WEBPROJ_LIB /proj +ENV WEBPROJ_LIB=/proj RUN mkdir $WEBPROJ_LIB # Copy necessary files. Tests and README are needed by setup.py @@ -19,7 +19,6 @@ RUN apt-get update -y && apt-get upgrade -y # Set up virtual environment RUN conda env create -f environment.yaml -RUN conda run -n webproj python -m pip install --no-deps . # Sync PROJ-data files RUN conda run -n webproj pyproj sync --source-id dk_sdfe --target-dir $WEBPROJ_LIB From 5948301ab8a08b9f4305cea8d34bff01035e5988 Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Mon, 4 Nov 2024 15:11:44 +0100 Subject: [PATCH 2/2] Adjust expected test result (due to newer PROJ version) --- .github/workflows/tests.yml | 1 + test_s34s.out | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b7ad5c0..55dea19 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -30,5 +30,6 @@ jobs: - run: curl -s localhost/v1.0/trans/EPSG:4258/DK:S34S/55.0,12.0 > S34S.out + - run: echo >> S34S.out # Add's a \n at the end of the file. This satifies the diff further down. - run: cat S34S.out - run: diff test_s34s.out S34S.out diff --git a/test_s34s.out b/test_s34s.out index ce78987..ba5bc4b 100644 --- a/test_s34s.out +++ b/test_s34s.out @@ -1 +1 @@ -{"v1":106020.66701403809,"v2":64281.27481858295,"v3":null,"v4":null} \ No newline at end of file +{"v1":106020.6670140382,"v2":64281.27481858295,"v3":null,"v4":null}