Skip to content

Commit 44836ce

Browse files
committed
Migrate to uv
1 parent db85912 commit 44836ce

File tree

6 files changed

+993
-27
lines changed

6 files changed

+993
-27
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.venv

Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
FROM sourcepole/qwc-uwsgi-base:alpine-v2023.10.26
1+
FROM sourcepole/qwc-uwsgi-base:alpine-v2025.01.24
22

3-
ADD requirements.txt /srv/qwc_service/requirements.txt
3+
WORKDIR /srv/qwc_service
4+
ADD pyproject.toml uv.lock ./
45

56
# git: Required for pip with git repos
67
# postgresql-dev g++ python3-dev: Required for psycopg2
78
RUN \
89
apk add --no-cache --update --virtual runtime-deps postgresql-libs && \
910
apk add --no-cache --update --virtual build-deps git wget unzip postgresql-dev g++ python3-dev && \
10-
pip3 install --no-cache-dir -r /srv/qwc_service/requirements.txt && \
11+
uv sync --frozen && \
1112
apk del build-deps
1213

1314
ADD src /srv/qwc_service/

README.md

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -317,22 +317,10 @@ For more information please visit: https://github.com/qwc-services/qwc-docker
317317
Development
318318
-----------
319319

320-
Create a virtual environment:
320+
Install dependencies and run service:
321321

322-
virtualenv --python=/usr/bin/python3 --system-site-packages .venv
322+
uv run src/server.py
323323

324-
Without system packages:
324+
With config path:
325325

326-
python3 -m venv .venv
327-
328-
Activate virtual environment:
329-
330-
source .venv/bin/activate
331-
332-
Install requirements:
333-
334-
pip install -r requirements.txt
335-
336-
Start local service:
337-
338-
CONFIG_PATH=/PATH/TO/CONFIGS/ python src/server.py
326+
CONFIG_PATH=/PATH/TO/CONFIGS/ uv run src/server.py

pyproject.toml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
[project]
2+
name = "qwc-map-viewer"
3+
version = "v2025.01.07"
4+
description = "QWC Map Viewer"
5+
readme = "README.md"
6+
requires-python = ">=3.10"
7+
dependencies = [
8+
"Flask~=3.0.0",
9+
"Werkzeug~=3.0.6",
10+
"Flask-JWT-Extended~=4.6.0",
11+
"flask-restx~=1.3.0",
12+
"requests~=2.32.0",
13+
"psycopg2~=2.9.9",
14+
"SQLAlchemy~=2.0.29",
15+
"qwc-services-core~=1.3.34"
16+
]
17+
18+
[dependency-groups]
19+
dev = [
20+
"python-dotenv>=1.0.1",
21+
]

0 commit comments

Comments
 (0)