Skip to content

Commit cfb4243

Browse files
broijabroija
authored
Merge pull request #149 from dataforgoodfr/147_test_fixes_for_demo
[FIX] Fixed dev uv configs blocking prod start (#147_test_fixes_for_d…
2 parents f886925 + 5809216 commit cfb4243

File tree

11 files changed

+4395
-1528
lines changed

11 files changed

+4395
-1528
lines changed

‎dispatcher/.env.dev‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
RESCUE_API_POSTGRES_DB=us_climate_data
22
RESCUE_API_POSTGRES_USER=postgres
33
RESCUE_API_POSTGRES_PASSWORD=my_password
4+
# RESCUE_API_POSTGRES_HOST=localhost
5+
# RESCUE_API_POSTGRES_PORT=5432

‎dispatcher/dev/pyproject.toml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
[project]
2+
name = "dispatcher-api"
3+
version = "0.1.0"
4+
description = "Assign a list of db to rescue to rescuer"
5+
readme = "README.md"
6+
requires-python = ">=3.9"
7+
8+
dependencies = [
9+
"fastapi[standard]>=0.116.1",
10+
"pydantic>=2.11.7",
11+
"pydantic_core>=2.33.2",
12+
"uvicorn==0.35.0",
13+
"psycopg2-binary>=2.9.9",
14+
"sqlalchemy>=2.0.0",
15+
"httpx>=0.25.0",
16+
]
17+
18+
[dependency-groups]
19+
dev = ["rescue-api"]
20+
prod = ["rescue-api"]
21+
22+
[tool.uv.sources]
23+
rescue-api = [
24+
{ git = "https://github.com/dataforgoodfr/offseason-shelter-for-science-rescue_db.git", rev = "v0.0.3", group = "prod" },
25+
{ path = "/lib/rescue_db/", editable = true, group = "dev" },
26+
]
27+
28+
[tool.uv]
29+
default-groups = ["prod"]
30+
31+
conflicts = [
32+
[
33+
{ group = "dev" },
34+
{ group = "prod" },
35+
]
36+
]

‎dispatcher/dev/uv.lock‎

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

‎dispatcher/docker-compose.dev.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
volumes:
44
- .:/app
55
- ../../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
6+
command: uv run --project dev/pyproject.toml --group dev --no-default-groups --frozen fastapi dev api/dispatcher_service.py --host 0.0.0.0 --port 8081
77
networks:
88
- rescue_db
99

‎dispatcher/pyproject.toml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,15 @@ dependencies = [
1616
]
1717

1818
[dependency-groups]
19-
dev = ["rescue-api"]
2019
prod = ["rescue-api"]
2120

2221
[tool.uv.sources]
2322
rescue-api = [
2423
{ git = "https://github.com/dataforgoodfr/offseason-shelter-for-science-rescue_db.git", rev = "v0.0.3", group = "prod" },
25-
{ path = "/lib/rescue_db/", editable = true, group = "dev" },
2624
]
2725

2826
[tool.uv]
2927
default-groups = ["prod"]
3028

3129
conflicts = [
32-
[
33-
{ group = "dev" },
34-
{ group = "prod" },
35-
]
3630
]

‎dispatcher/uv.lock‎

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

‎priorizer/dev/pyproject.toml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
[project]
2+
name = "dispatcher-api"
3+
version = "0.1.0"
4+
description = "Assign a list of db to rescue to rescuer"
5+
readme = "README.md"
6+
requires-python = ">=3.9"
7+
8+
dependencies = [
9+
"apscheduler>=3.11.0",
10+
"fastapi[standard]>=0.116.1",
11+
"pydantic>=2.11.7",
12+
"pydantic_core>=2.33.2",
13+
"python-dotenv>=1.1.1",
14+
"starlette>=0.47.2",
15+
"typing-extensions>=4.14.1",
16+
"uvicorn==0.35.0",
17+
"psycopg2-binary>=2.9.9",
18+
"sqlalchemy>=2.0.0",
19+
]
20+
21+
[dependency-groups]
22+
dev = ["rescue-api"]
23+
prod = ["rescue-api"]
24+
25+
[tool.uv.sources]
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+
]

‎priorizer/dev/uv.lock‎

Lines changed: 1456 additions & 0 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
volumes:
44
- .:/app
55
- ../../offseason-shelter-for-science-rescue_db:/lib/rescue_db
6-
command: uv run --group dev --no-default-groups --frozen fastapi dev api/priorizer_service.py --host 0.0.0.0 --port 8082
6+
command: uv run --project dev/pyproject.toml --group dev --no-default-groups --frozen fastapi dev api/priorizer_service.py --host 0.0.0.0 --port 8082
77
networks:
88
- rescue_db
99

‎priorizer/pyproject.toml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,15 @@ dependencies = [
1919
]
2020

2121
[dependency-groups]
22-
dev = ["rescue-api"]
2322
prod = ["rescue-api"]
2423

2524
[tool.uv.sources]
2625
rescue-api = [
2726
{ 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" },
2927
]
3028

3129
[tool.uv]
3230
default-groups = ["prod"]
3331

3432
conflicts = [
35-
[
36-
{ group = "dev" },
37-
{ group = "prod" },
38-
]
3933
]

0 commit comments

Comments
 (0)