diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f97ad5b3258a86811966d2cf58e0fe905c4b12fb..37bc17a9bce9cadfda732120f87df3d39a50d921 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,10 +46,10 @@ tests (from scratch): - 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 refresh - - zypper --no-gpg-checks --non-interactive install proj=8.2.1 - - zypper --no-gpg-checks --non-interactive install geos=3.11.0 + - zypper --no-gpg-checks --non-interactive install proj=9.1.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 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 - pip install -r requirements.txt - chmod +x ./CI/run_pytest.sh diff --git a/CI/Dockerfile b/CI/Dockerfile index f3b99b2f8b78129d3fff4d49d88be54613bf5929..6146387f179f53142e0710dfd56a1e8f466cd982 100644 --- a/CI/Dockerfile +++ b/CI/Dockerfile @@ -53,10 +53,10 @@ FROM base AS mlair # 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 refresh -RUN zypper --no-gpg-checks --non-interactive install proj=8.2.1 -RUN zypper --no-gpg-checks --non-interactive install geos=3.10.3 +RUN zypper --no-gpg-checks --non-interactive install proj=9.1.0 +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 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 # install requirements