Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ USER vscode

RUN pip install invoke

RUN curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.1.3 python3 - \
ARG UV_VER=0.9.9
RUN curl -sSL https://astral.sh/uv/$UV_VER/install.sh | sh - \
&& echo "export PATH=\"$HOME/.local/bin:$PATH\"" >> $HOME/.bashrc

RUN bash -c "$(curl -sL https://get.containerlab.dev)"
8 changes: 3 additions & 5 deletions .devcontainer/onCreateCommand.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@

cat /proc/cpuinfo /proc/meminfo

poetry config virtualenvs.create true
poetry config virtualenvs.in-project true
poetry install --no-interaction --no-ansi

git submodule update --init

poetry run invoke demo.pull
uv sync --all-groups

uv run invoke demo.pull
2 changes: 1 addition & 1 deletion .devcontainer/postCreateCommand.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

git pull
git submodule update
poetry run invoke demo.start --wait
uv run invoke demo.start --wait
8 changes: 4 additions & 4 deletions .devcontainer/updateContentCommand.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/bin/bash

export WEB_CONCURRENCY=2
poetry run invoke demo.start
uv run invoke demo.start
sleep 120
docker logs infrahub-server-1
poetry run invoke demo.load-infra-schema
uv run invoke demo.load-infra-schema
docker logs infrahub-server-1
sleep 90
docker logs infrahub-server-1
poetry run invoke demo.load-infra-data
poetry run invoke demo.stop
uv run invoke demo.load-infra-data
uv run invoke demo.stop
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
/frontend/ @opsmill/frontend
/docs/ @opsmill/customer-success @opsmill/backend @opsmill/frontend
/docker-compose.yml @opsmill/cloud
poetry.lock @opsmill/backend
uv.lock @opsmill/backend
pyproject.toml @opsmill/backend
2 changes: 1 addition & 1 deletion .github/copilot-instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Documentation generated for Infrahub must reflect this novel approach, providing

## Developer Workflows

- **Backend**: Use Poetry for dependency management (`pyproject.toml`). Run tests with `pytest` or via `invoke` tasks.
- **Backend**: Use uv for dependency management (`pyproject.toml`). Run tests with `pytest` or via `invoke` tasks.
- **Frontend**: Use npm scripts (`npm start`, `npm test`, `npm run build`) in `frontend/app/`.
- **Docs**: Develop in `docs/`, preview with `invoke docs.build docs.serve`. Validate docs site with `invoke docs.validate`.

Expand Down
8 changes: 4 additions & 4 deletions .github/file-filters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ sdk_files: &sdk_files
testcontainers_files:
- "python_testcontainers/**"

infrahub_poetry_files: &infrahub_poetry_files
infrahub_uv_files: &infrahub_uv_files
- "**/pyproject.toml"
- "**/poetry.lock"
- "**/uv.lock"

frontend_files: &frontend_files
- "frontend/app/**"
Expand Down Expand Up @@ -68,7 +68,7 @@ backend_all:
- *backend_files
- *ci_config
- *development_files
- *infrahub_poetry_files
- *infrahub_uv_files
- *sdk_files

documentation_all:
Expand All @@ -94,4 +94,4 @@ e2e_all:
- *demo_files
- *ci_config
- *development_files
- *infrahub_poetry_files
- *infrahub_uv_files
4 changes: 2 additions & 2 deletions .github/instructions/python.instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ applyTo: '**/*.py'

The project is using Use ruff and mypy for type checking and validations.

you can format all python files by running `poetry run invoke format`
and you can validate that all files are formatted correctly by running `poetry run invoke lint`
you can format all python files by running `uv run invoke format`
and you can validate that all files are formatted correctly by running `uv run invoke lint`
2 changes: 1 addition & 1 deletion .github/instructions/tooling.instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ applyTo: '*'
- Don't use Git precommit
- Use ruff and mypy to validate and lint python files
- Use yamllint to validate yaml files
- Use poetry to manage the python project and its dependencies
- Use uv to manage the python project and its dependencies
4 changes: 3 additions & 1 deletion .github/workflows/ci-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
build:
needs: prepare-environment
env:
POETRY_VERSION: ${{ needs.prepare-environment.outputs.POETRY_VERSION }}
UV_VERSION: ${{ needs.prepare-environment.outputs.UV_VERSION }}
runs-on:
group: huge-runners
steps:
Expand Down Expand Up @@ -86,3 +86,5 @@ jobs:
platforms: ${{ inputs.platforms }}
tags: ${{ inputs.tags }}
labels: ${{ inputs.labels }}
build-args: |
UV_VER=${{ env.UV_VERSION }}
Loading
Loading