Skip to content

Commit 6495a0c

Browse files
committed
Use uv instead of pip, bump core from 4.0.4 to 4.4.0rc3
1 parent e39f2a2 commit 6495a0c

File tree

6 files changed

+69
-27
lines changed

6 files changed

+69
-27
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Check uv.lock
2+
3+
on:
4+
pull_request:
5+
branches: [ master ]
6+
paths:
7+
- 'pyproject.toml'
8+
- 'uv.lock'
9+
10+
jobs:
11+
check-uv-lock:
12+
runs-on: ubuntu-latest
13+
container: ghcr.io/astral-sh/uv:python3.13-bookworm-slim
14+
steps:
15+
- uses: actions/checkout@v4
16+
17+
- name: Check uv.lock
18+
run: |
19+
uv lock --check

docker-compose.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ services:
179179
- ./graphql_federation.py:/home/orchestrator/graphql_federation.py
180180
- ./utils:/home/orchestrator/utils
181181
- ./services:/home/orchestrator/services
182-
- ./requirements.txt:/home/orchestrator/requirements.txt
182+
- ./pyproject.toml:/home/orchestrator/pyproject.toml
183+
- ./uv.lock:/home/orchestrator/uv.lock
183184
- ./alembic.ini:/home/orchestrator/alembic.ini
184185
- ./translations:/home/orchestrator/translations
185186
- ./templates:/home/orchestrator/templates

docker/orchestrator/entrypoint.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44
PATH=$PATH:~/.local/bin
55

66
# Install extra requirements for orchestrator
7-
pip install -r requirements.txt
7+
pip install uv
8+
uv sync
9+
source .venv/bin/activate
810

911
if [ -f ${CORE_OVERRIDE}/pyproject.toml ]; then
1012
echo "⏭️ Use editable install of orchestrator-core with dev and test dependencies"
11-
pip install -e $CORE_OVERRIDE[dev,test]
13+
uv pip install -e $CORE_OVERRIDE[dev,test]
1214

1315
# Run any missing migrations on the database
1416
python main.py db upgrade heads
@@ -18,6 +20,6 @@ else
1820
# Run any missing migrations on the database
1921
python main.py db upgrade heads
2022

21-
echo "⏭️ Use pip installed orchestrator-core $(pip freeze | grep orchestrator-core)"
23+
echo "⏭️ Use orchestrator-core as specified in pyproject.toml $(uv pip freeze | grep orchestrator-core)"
2224
uvicorn --host 0.0.0.0 --port 8080 $UVICORN_ARGS main:app --reload --proxy-headers
2325
fi

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.1.0"
44
requires-python = ">=3.12"
55
dependencies = [
66
"deepdiff==8.0.1",
7-
"orchestrator-core==4.0.4",
7+
"orchestrator-core==4.4.0rc3",
88
"pynetbox==7.4.1",
99
"rich==13.9.4",
1010
]

requirements.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.

uv.lock

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

0 commit comments

Comments
 (0)