Skip to content

Commit fcc363d

Browse files
authored
Merge pull request #134 from dataforgoodfr/132_rescue_db_local_dep
[DEPS][DEV] Modified dispatcher and priorizer for accessing rescue-ap…
2 parents e44845e + a604f27 commit fcc363d

File tree

6 files changed

+175
-49
lines changed

6 files changed

+175
-49
lines changed

dispatcher/docker-compose.dev.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ services:
22
dispatcher-rescue-api:
33
volumes:
44
- .:/app
5-
command: uv run fastapi dev api/dispatcher_service.py --host 0.0.0.0 --port 8081
5+
- ../../offseason-shelter-for-science-rescue_db:/lib/rescue_db
6+
command: uv run --group dev --no-default-groups --frozen fastapi dev api/dispatcher_service.py --host 0.0.0.0 --port 8081
67
networks:
78
- rescue_db
89

dispatcher/pyproject.toml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,24 @@ dependencies = [
1212
"uvicorn==0.35.0",
1313
"psycopg2-binary>=2.9.9",
1414
"sqlalchemy>=2.0.0",
15-
"rescue-api",
1615
]
1716

17+
[dependency-groups]
18+
dev = ["rescue-api"]
19+
prod = ["rescue-api"]
20+
1821
[tool.uv.sources]
19-
rescue-api = { git = "https://github.com/dataforgoodfr/offseason-shelter-for-science-rescue_db.git", rev = "v0.0.3" }
22+
rescue-api = [
23+
{ git = "https://github.com/dataforgoodfr/offseason-shelter-for-science-rescue_db.git", rev = "v0.0.3", group = "prod" },
24+
{ path = "/lib/rescue_db/", editable = true, group = "dev" },
25+
]
26+
27+
[tool.uv]
28+
default-groups = ["prod"]
29+
30+
conflicts = [
31+
[
32+
{ group = "dev" },
33+
{ group = "prod" },
34+
]
35+
]

dispatcher/uv.lock

Lines changed: 69 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

priorizer/docker-compose.dev.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ services:
22
priorizer-api:
33
volumes:
44
- .:/app
5-
command: uv run fastapi dev main.py --host 0.0.0.0 --port 8082
5+
- ../../offseason-shelter-for-science-rescue_db:/lib/rescue_db
6+
command: uv run --group dev --no-default-groups --frozen fastapi dev main.py --host 0.0.0.0 --port 8082
67
networks:
78
- rescue_db
89

priorizer/pyproject.toml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,24 @@ dependencies = [
1616
"uvicorn==0.35.0",
1717
"psycopg2-binary>=2.9.9",
1818
"sqlalchemy>=2.0.0",
19-
"rescue-api",
2019
]
2120

21+
[dependency-groups]
22+
dev = ["rescue-api"]
23+
prod = ["rescue-api"]
24+
2225
[tool.uv.sources]
23-
rescue-api = { git = "https://github.com/dataforgoodfr/offseason-shelter-for-science-rescue_db.git", rev = "v0.0.3" }
26+
rescue-api = [
27+
{ git = "https://github.com/dataforgoodfr/offseason-shelter-for-science-rescue_db.git", rev = "v0.0.3", group = "prod" },
28+
{ path = "/lib/rescue_db/", editable = true, group = "dev" },
29+
]
30+
31+
[tool.uv]
32+
default-groups = ["prod"]
33+
34+
conflicts = [
35+
[
36+
{ group = "dev" },
37+
{ group = "prod" },
38+
]
39+
]

0 commit comments

Comments
 (0)