Skip to content
Snippets Groups Projects
Commit afdec1c9 authored by lukas leufen's avatar lukas leufen
Browse files

Merge branch 'lukas_issue441_tech_proj-version' into 'release_v2.3.0'

Resolve "tech: update proj version for tests from scratch"

See merge request !501
parents de657fa9 cb5649e9
Branches
No related tags found
3 merge requests!502Master,!501Resolve "tech: update proj version for tests from scratch",!499Resolve "release v2.3.0"
Pipeline #121022 passed
...@@ -46,10 +46,10 @@ tests (from scratch): ...@@ -46,10 +46,10 @@ tests (from scratch):
- pip install --upgrade pip - pip install --upgrade pip
- zypper --no-gpg-checks addrepo https://download.opensuse.org/repositories/Application:Geo/15.4/Application:Geo.repo - zypper --no-gpg-checks addrepo https://download.opensuse.org/repositories/Application:Geo/15.4/Application:Geo.repo
- zypper --no-gpg-checks refresh - zypper --no-gpg-checks refresh
- zypper --no-gpg-checks --non-interactive install proj=8.2.1 - zypper --no-gpg-checks --non-interactive install proj=9.1.0
- zypper --no-gpg-checks --non-interactive install geos=3.11.0 - zypper --no-gpg-checks --non-interactive install geos=3.11.1
- zypper --no-gpg-checks --non-interactive install geos-devel=3.9.1 - zypper --no-gpg-checks --non-interactive install geos-devel=3.9.1
- zypper --no-gpg-checks --non-interactive install libproj22=8.2.1 # - zypper --no-gpg-checks --non-interactive install libproj22=8.2.1
- zypper --no-gpg-checks --non-interactive install binutils libproj-devel gdal-devel - zypper --no-gpg-checks --non-interactive install binutils libproj-devel gdal-devel
- pip install -r requirements.txt - pip install -r requirements.txt
- chmod +x ./CI/run_pytest.sh - chmod +x ./CI/run_pytest.sh
......
...@@ -53,10 +53,10 @@ FROM base AS mlair ...@@ -53,10 +53,10 @@ FROM base AS mlair
# install geo packages # install geo packages
RUN zypper --no-gpg-checks addrepo https://download.opensuse.org/repositories/Application:Geo/15.4/Application:Geo.repo RUN zypper --no-gpg-checks addrepo https://download.opensuse.org/repositories/Application:Geo/15.4/Application:Geo.repo
RUN zypper --no-gpg-checks refresh RUN zypper --no-gpg-checks refresh
RUN zypper --no-gpg-checks --non-interactive install proj=8.2.1 RUN zypper --no-gpg-checks --non-interactive install proj=9.1.0
RUN zypper --no-gpg-checks --non-interactive install geos=3.10.3 RUN zypper --no-gpg-checks --non-interactive install geos=3.11.1
RUN zypper --no-gpg-checks --non-interactive install geos-devel=3.9.1 RUN zypper --no-gpg-checks --non-interactive install geos-devel=3.9.1
RUN zypper --no-gpg-checks --non-interactive install libproj22=8.2.1 # RUN zypper --no-gpg-checks --non-interactive install libproj22=8.2.1
RUN zypper --no-gpg-checks --non-interactive install binutils libproj-devel gdal-devel RUN zypper --no-gpg-checks --non-interactive install binutils libproj-devel gdal-devel
# install requirements # install requirements
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment