ci: Migrate to uv#6546
Merged
Merged
Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
github-actions
Bot
added
api
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #6546 +/- ##
==========================================
+ Coverage 98.44% 98.46% +0.01%
==========================================
Files 1399 1398 -1
Lines 52669 52647 -22
==========================================
- Hits 51849 51837 -12
+ Misses 820 810 -10 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
github-actions
Bot
added
ci-cd
- Convert api/pyproject.toml from poetry to PEP 621 + setuptools so the api becomes pip-installable (was package-mode = false). - Replace api/poetry.lock with api/uv.lock; pin every package to the exact version main was on (no silent upgrades). - Express each optional poetry group as a PEP 621 optional-dependencies extra (auth-controller, saml, ldap, workflows, licensing, release-pipelines) plus the existing dev extra.
khvn26
force-pushed
the
ci/packaging-for-dev
branch
from
b4057ee to
e5c67b4
Compare
github-actions
Bot
added
ci-cd
Rewrite all api/Makefile targets that called poetry to use uv (install-uv, uv sync, uv run). Switch the python-typecheck pre-commit hook entry from 'poetry -C api run' to 'uv run' (executed inside api/), and replace the poetry-check hook with astral-sh/uv-pre-commit's uv-lock check. beep boop
Replace poetry installation and setup-python's cache:poetry option in the api workflows with astral-sh/setup-uv@v6 (cache keyed on api/uv.lock), and swap poetry-style --with group args for uv --extra extras when calling make install-packages. beep boop
Replace poetry-based install in build-python and build-python-private stages with uv sync. Translate --with X poetry group args to uv --extra flags and add UV_PROJECT_ENVIRONMENT, UV_PYTHON, UV_LINK_MODE config so the resulting venv lands at /build/.venv (the same layout the runtime stages copy from). beep boop
github-actions
Bot
added
ci-cd
…ts/fixtures.py
The api conftest.py is shipped as a top-level `py-module` in the installed
wheel. Downstream consumers that install the api into their venv could not
re-use its fixtures via `from conftest import *` because their own root
`conftest.py` collides with the api's top-level `conftest` module.
Move every `@pytest.fixture` (and the helper constants they reference)
out of `api/conftest.py` into a regular module at `api/tests/fixtures.py`,
and have `api/conftest.py` re-export them with `from tests.fixtures import *`.
Pytest hooks (`pytest_addoption`, `pytest_configure`) stay in `api/conftest.py`
because pytest only invokes hooks from conftest / registered plugin modules.
Downstream consumers can now write:
# consumer's conftest.py
from tests.fixtures import * # noqa: F401, F403
without any importlib shenanigans.
github-actions
Bot
added
ci-cd
- Ship api/tests/plugin.py as a pytest11 entry point so the api's --ci option and fixture set are auto-discovered by any venv with flagsmith-api[dev] installed. - Drop py-modules = ["conftest", "manage"]; api/conftest.py is gone (its hooks moved into the plugin). - Fixtures stay in api/tests/fixtures.py and get lazily registered in pytest_configure (after pytest-django has set up Django).
github-actions
Bot
added
ci-cd
Drop the pytest11 entry point in favour of consumer-declared pytest_plugins = ["tests.conftest"]. Entry-point plugins are imported before pytest-django's tryfirst Django setup, which forced lazy fixture registration; declaring pytest_plugins in a consumer's rootdir conftest loads the plugin after pytest-django has run, so api/tests/conftest.py can keep its top-level Django imports. Collapses api/tests/plugin.py + api/tests/fixtures.py back into api/tests/conftest.py — one home for hooks and fixtures. Refs pytest-dev/pytest#935
github-actions
Bot
added
ci-cd
The pyfakefs `fs` fixture computes its mount root via os.path.dirname(os.path.abspath(__file__)). When this fixture lived in api/conftest.py the root resolved to api/; after moving into api/tests/conftest.py the root regressed to api/tests/, which dropped api/app/templates/, api/users/templates/, etc. from the fake filesystem and caused TemplateDoesNotExist failures on pyfakefs-using tests.
![claude[bot]](https://avatars.githubusercontent.com/in/1236702?s=60&v=4){kind=small}
There was a problem hiding this comment.
Claude Code Review
This repository is configured for manual code reviews. Comment @claude review to trigger a review and subscribe this PR to future pushes, or @claude review once for a one-time review.
Tip: disable this comment in your organization's Code Review settings.
github-actions
Bot
added
ci-cd
Contributor
Docker builds report
|
Contributor
Playwright Test Results (oss - depot-ubuntu-latest-16)
Details
Playwright Test Results (oss - depot-ubuntu-latest-arm-16)
Details
Playwright Test Results (private-cloud - depot-ubuntu-latest-16)
Details
Playwright Test Results (private-cloud - depot-ubuntu-latest-arm-16)
Details
Playwright Test Results (oss - depot-ubuntu-latest-16)
Details
Playwright Test Results (private-cloud - depot-ubuntu-latest-16)
Details
Playwright Test Results (oss - depot-ubuntu-latest-arm-16)
Details
Playwright Test Results (private-cloud - depot-ubuntu-latest-arm-16)
Details
Playwright Test Results (oss - depot-ubuntu-latest-16)
Details
Playwright Test Results (oss - depot-ubuntu-latest-arm-16)
Details
Playwright Test Results (private-cloud - depot-ubuntu-latest-16)
Details
Playwright Test Results (oss - depot-ubuntu-latest-16)
Details
Playwright Test Results (private-cloud - depot-ubuntu-latest-16)
Details
Playwright Test Results (private-cloud - depot-ubuntu-latest-arm-16)
Details
Playwright Test Results (oss - depot-ubuntu-latest-arm-16)
Details
Playwright Test Results (private-cloud - depot-ubuntu-latest-arm-16)
Details
|
Contributor
Visual Regression16 screenshots compared. See report for details. |
Let astral-sh/setup-uv install Python via python-version, and add BuildKit cache mounts on /root/.cache/uv to every Dockerfile stage that runs uv sync. beep boop
github-actions
Bot
added
ci-cd
Bring forward django 5.2.14 and requests 2.33.0 bumps from main; drop the legacy [tool.poetry] block (replaced by uv config) and re-run uv lock. beep boop
gagantrivedi
requested changes
May 12, 2026
Pin uv at one place — api/pyproject.toml's [tool.uv].required-version — and let setup-uv read it via version-file. Wrap setup-uv in a composite action so the version-file + cache config aren't repeated across the five api workflows. The Makefile reads the same field via tomllib. beep boop
uv exposes --directory to switch into the project dir, so we don't need bash -c plus cd to run mypy from api/. beep boop
Bring urllib3 2.7.0 across from main and re-run uv lock. beep boop
github-actions
Bot
added
ci-cd
github-actions
Bot
added
ci-cd
gagantrivedi
approved these changes
May 12, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why move to uv now
api/is a Poetry project withpackage-mode = false, so it isn't pip-installable. Downstream private packages (flagsmith-private,flagsmith-saml,flagsmith-workflows, ...) consume the api by cloning the repo and symlinking tests into it, each carrying its own copy of the api dependency graph.Migrating to uv + PEP 621 + setuptools makes the api a real, pip-installable package. Downstreams can list it as a
[tool.uv.sources]git dep and import normally.Testing gain
With the api installable, fixtures in
api/tests/conftest.pyare reachable from any consumer's venv. Consumers opt in withpytest_plugins = ["tests.conftest"]in their rootdir conftest and inherit every api fixture (project,feature,environment, ...) — no symlinks, no clones, no path tricks.Why the conftest refactor
api/conftest.pypreviously held hooks + fixtures. Two non-options for sharing it:conftestpy-module pollutes every downstream venv (collides with any project that has its own rootconftest.py).pytest11plugin doesn't work either: entry-point modules are imported before pytest-django'stryfirstDjango setup, so module-level Django imports explode withAppRegistryNotReady(see pytest #935).The fix: collapse hooks + fixtures into
api/tests/conftest.pyand have consumers opt in viapytest_plugins.pytest_pluginsresolves after pytest-django's Django setup, so module-level Django imports are safe.Locked versions
Every dep version in
uv.lockis byte-identical topoetry.lockonmain. No silent upgrades.Test plan
codecov/patchgreenflagsmith-privateconsumes the new package and inherits fixtures viapytest_plugins