File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 44
55jobs :
66 server_tests :
7- runs-on : ubuntu-22 .04
7+ runs-on : ubuntu-24 .04
88
99 services :
1010 postgres :
3030 run : |
3131 cd server
3232 sudo apt-get -y install libsqlite3-mod-spatialite
33- pip3 install pipenv==2024 .0.1
34- pipenv install --dev --verbose
33+ pip install pipenv==2026 .0.3
34+ pipenv install --dev --verbose --python 3.12
3535
3636 - name : Run tests
3737 run : |
Original file line number Diff line number Diff line change 1- FROM ubuntu:jammy-20240627.1
1+ FROM ubuntu:noble-20251013
22MAINTAINER Martin Varga "martin.varga@lutraconsulting.co.uk"
33
44# this is to do choice of timezone upfront, because when "tzdata" package gets installed,
@@ -19,10 +19,6 @@ RUN apt-get update -y && \
1919 gcc build-essential binutils cmake extra-cmake-modules libsqlite3-mod-spatialite libmagic1 && \
2020 rm -rf /var/lib/apt/lists/*
2121
22-
23- # needed for geodiff
24- RUN pip3 install --upgrade pip==24.0
25-
2622# create mergin user to run container with
2723RUN groupadd -r mergin -g 901
2824RUN groupadd -r mergin-family -g 999
@@ -32,12 +28,16 @@ RUN useradd -u 901 -r --home-dir /app --create-home -g mergin -G mergin-family -
3228COPY . /app
3329WORKDIR /app
3430
35- RUN pip3 install pipenv==2024.0.1
31+ # keep installing to system packages
32+ ENV PIP_BREAK_SYSTEM_PACKAGES=1
33+ ENV PIP_IGNORE_INSTALLED=1
34+
35+ RUN pip install pipenv==2026.0.3
3636# for locale check this http://click.pocoo.org/5/python3/
3737ENV LC_ALL=C.UTF-8
3838ENV LANG=C.UTF-8
3939
40- RUN pipenv install --system --deploy --verbose
40+ RUN pipenv install --system --deploy --verbose --python 3.12
4141
4242USER mergin
4343
Original file line number Diff line number Diff line change @@ -57,4 +57,4 @@ pre-commit = "==4.1.0"
5757atomicwrites = " ==1.4.0"
5858
5959[requires ]
60- python_version = " 3.10 "
60+ python_version = " 3.12 "
You can’t perform that action at this time.
0 commit comments