Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Skip installing WEBPROJ into the Docker image #63

Merged
merged 2 commits into from
Nov 4, 2024
Merged

Skip installing WEBPROJ into the Docker image #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02ccc28
Skip installing WEBPROJ into the Docker image
kbevers Nov 4, 2024
5948301
Adjust expected test result (due to newer PROJ version)
kbevers Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/tests.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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}
Loading