Skip to content

Commit 1e339ac

Browse files
author
seskildsen
committed
Merge branch 'master' into x-forward-host
2 parents ddcf63f + f9fc11d commit 1e339ac

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,6 @@ jobs:
3030

3131
- run: curl -s localhost/v1.0/trans/EPSG:4258/DK:S34S/55.0,12.0 > S34S.out
3232

33+
- run: echo >> S34S.out # Add's a \n at the end of the file. This satifies the diff further down.
3334
- run: cat S34S.out
3435
- run: diff test_s34s.out S34S.out

Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM condaforge/miniforge3
22

33
# We store PROJ ressources in $WEBPROJ_LIB
4-
ENV WEBPROJ_LIB /proj
4+
ENV WEBPROJ_LIB=/proj
55
RUN mkdir $WEBPROJ_LIB
66

77
# Copy necessary files. Tests and README are needed by setup.py
@@ -19,7 +19,6 @@ RUN apt-get update -y && apt-get upgrade -y
1919

2020
# Set up virtual environment
2121
RUN conda env create -f environment.yaml
22-
RUN conda run -n webproj python -m pip install --no-deps .
2322

2423
# Sync PROJ-data files
2524
RUN conda run -n webproj pyproj sync --source-id dk_sdfe --target-dir $WEBPROJ_LIB

test_s34s.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"v1":106020.66701403809,"v2":64281.27481858295,"v3":null,"v4":null}
1+
{"v1":106020.6670140382,"v2":64281.27481858295,"v3":null,"v4":null}

0 commit comments

Comments
 (0)