Skip to content

Commit

Permalink
Merge branch 'master' into x-forward-host
Browse files Browse the repository at this point in the history
  • Loading branch information
seskildsen committed Nov 5, 2024
2 parents ddcf63f + f9fc11d commit 1e339ac
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
1 change: 1 addition & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test_s34s.out
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"v1":106020.66701403809,"v2":64281.27481858295,"v3":null,"v4":null}
{"v1":106020.6670140382,"v2":64281.27481858295,"v3":null,"v4":null}

0 comments on commit 1e339ac

Please sign in to comment.