Skip to content

feat: consolidated pip-compile -> uv migration (all 5 stacked PRs, rebased onto master) - #38915

Open
irfanuddinahmad wants to merge 20 commits into
masterfrom
irfanuddinahmad/uv-migration-consolidated
Open

feat: consolidated pip-compile -> uv migration (all 5 stacked PRs, rebased onto master)#38915
irfanuddinahmad wants to merge 20 commits into
masterfrom
irfanuddinahmad/uv-migration-consolidated

Conversation

@irfanuddinahmad

@irfanuddinahmad irfanuddinahmad commented Jul 21, 2026

Copy link
Copy Markdown
Contributor

Summary

Migrates edx-platform from pip-compile/pip-tools to pyproject.toml + uv, tracked in openedx/public-engineering#543.

File-by-file summary

Root packaging & build config

  • pyproject.toml: core of the migration. Added the full [project.dependencies] list (previously just ["setuptools"]), a new [dependency-groups] tree (bundled, testing, docs, assets, development, semgrep, ci, default), [tool.uv].default-groups/constraint-dependencies (machine-managed by edx_lint write_uv_constraints), [tool.edx_lint].uv_constraints (the hand-maintained version pins, each with a dated comment and issue link, carried over from the old constraints.txt), and a new [tool.coverage.*] tree.
  • .coveragerc (deleted): content moved verbatim into [tool.coverage.*] in pyproject.toml.
  • Makefile: pre-requirements/pip-sync targets replaced with uv sync --group ... targets; compile-requirements rewritten to run uv lock for the root project and loop over the 4 uv-managed sub-projects, then re-export compatibility .txt files at the old paths for external tools (e.g. Tutor's Dockerfile) that still pip install -r requirements/edx/base.txt directly.
  • tox.ini: switched to runner = uv-venv-lock-runner + dependency_groups = testing; dropped quality from envlist (quality now runs via a dedicated CI workflow/Makefile target, not tox) and the now-redundant usedevelop/commands_pre = make test-requirements.
  • README.rst: install instructions updated from pip install -r requirements/edx/*.txt to uv sync --group ....

CI workflows

All follow the same mechanical pattern: drop the manual pip cache steps in favor of astral-sh/setup-uv's built-in cache (enable-cache: true), replace pip install/pip check/pip freeze with uv pip equivalents, and add echo "$PWD/.venv/bin" >> "$GITHUB_PATH" so subsequent bare commands (pylint, tox, etc.) resolve inside the uv-managed venv.

  • check-consistent-dependencies.yml: trigger-detection regex extended to also watch pyproject.toml/uv.lock/sub-project files, not just requirements/.
  • check_python_dependencies.yml: disabled (if: false), with a comment explaining find_python_dependencies (edx-repo-tools) can't scan pyproject.toml/uv.lock yet; linked to the upstream tracking issue/fix PR.
  • ci-static-analysis.yml, js-tests.yml, lint-imports.yml, migrations-check.yml, pylint-checks.yml, quality-checks.yml, semgrep.yml, unit-tests.yml: mechanical pip->uv swap as described above.
  • compile-python-requirements.yml, upgrade-one-python-dependency.yml: updated to operate on pyproject.toml/uv.lock instead of .in/.txt/constraints.txt. The dependency-downgrade script now edits [tool.edx_lint].uv_constraints via a proper tomlkit TOML round-trip instead of sed-patching a text file.
  • static-assets-check.yml: same pip->uv swap, plus scoped the Python-deps-install step to uv sync --no-default-groups --group bundled --group assets --frozen (rather than pulling in the full default group of dev/test/docs/ci tooling that this job doesn't need).
  • units-test-scripts-structures-pruning.yml, units-test-scripts-user-retirement.yml: intentionally untouched -- they still pip install -r scripts/.../requirements/testing.txt, and those compatibility files continue to be regenerated (via uv export) at the same paths, so these two workflows keep working unmodified.

Documentation

  • requirements/README.rst: rewritten to describe the new pyproject.toml/dependency-groups model instead of the old .in/.txt workflow.
  • requirements/edx-sandbox/README.rst: same treatment for the sandbox sub-project.
  • docs/concepts/testing/testing.rst, docs/references/static-assets.rst: install instructions updated to the uv sync equivalents, scoped to the specific dependency-groups each workflow step actually needs.

Dependency files (requirements/, uv.lock, scripts/*)

  • requirements/edx/*.in (all deleted): superseded by [project.dependencies]/[dependency-groups] in pyproject.toml.
  • requirements/edx/base.txt, assets.txt, development.txt (kept, regenerated): machine-generated uv export compatibility exports at their historical paths for external tooling that still installs from them directly. base.txt exports [project.dependencies] plus the bundled group.
  • requirements/edx/coverage.{in,txt}, doc.{in,txt}, testing.{in,txt}, semgrep.{in,txt}, bundled.in, github.in, kernel.in, openstack.txt, private.readme (all deleted): fully absorbed into pyproject.toml dependency-groups; no external tooling installed from these paths directly, so no compatibility export was needed.
  • requirements/common_constraints.txt, requirements/constraints.txt (deleted): absorbed into [tool.uv].constraint-dependencies (machine-managed) and [tool.edx_lint].uv_constraints (hand-maintained) in pyproject.toml, with all original rationale comments and issue links preserved.
  • requirements/pip-tools.{in,txt} (deleted): pip-tools itself is no longer needed.
  • uv.lock, requirements/edx-sandbox/{pyproject.toml,uv.lock}, scripts/{xblock,user_retirement,structures_pruning}/{pyproject.toml,uv.lock} (new): machine-generated lockfiles for the root project and its 3 independent standalone sub-projects (codejail sandbox, XBlock scripts, user-retirement scripts, structures-pruning scripts). Each sub-project sets [tool.uv] package = false (they're script bags, not installable packages) and carries only the subset of root constraints relevant to its own deps.
  • scripts/*/requirements/{base,testing}.txt (kept, regenerated): same compatibility-export treatment as requirements/edx/*.txt.

Misc scripts

  • scripts/compile_sass.py: docstring rewritten with the minimal setup command needed to run just this script (uv sync --no-default-groups --only-group assets --no-install-project), verified to actually compile Sass correctly with that reduced environment.
  • scripts/watch_sass.sh: one pip install -r ... message updated to uv sync --group default.
  • scripts/xsslint_config.py: added .venv to the linter's skip-dirs list.
  • .readthedocs.yaml: replaced RTD's native python.install pip-requirements mechanism with a post_create_environment/post_install hook that exports the docs group via uv export to a plain requirements.txt, then lets RTD's own pip install it -- this preserves the constraint that Django/XBlock/etc. get resolved against uv.lock's pins rather than picking up an unconstrained setuptools>=82 that breaks fs/pyfilesystem2's pkg_resources import.

What's intentionally NOT done here (tracked externally)

  • find_python_dependencies: support pyproject.toml / uv.lock, not just requirements/*.txt repo-tools#725: find_python_dependencies needs pyproject.toml support before check_python_dependencies.yml (disabled as part of this migration) can be re-enabled.
  • Tutor's Dockerfile installs from requirements/edx/{base,assets,development}.txt with plain pip. Those stay as uv export compatibility artifacts rather than being deleted, so no action is required on Tutor's side right now -- but Tutor maintainers should be aware these paths are now machine-generated, not hand-compiled.

Verification

  • uv lock resolves cleanly (445 packages, root project); all 4 sub-projects (requirements/edx-sandbox, scripts/xblock, scripts/user_retirement, scripts/structures_pruning) sync cleanly with uv sync --frozen.
  • Re-ran make compile-requirements end-to-end for the root project and all 4 uv sub-projects -- regenerated compatibility export files are byte-identical to what's committed, confirming consistency.
  • All CI checks pass on this PR.

🤖 Generated with Claude Code

@openedx-webhooks openedx-webhooks added open-source-contribution PR author is not from Axim or 2U core contributor PR author is a Core Contributor (who may or may not have write access to this repo). labels Jul 21, 2026
@openedx-webhooks

openedx-webhooks commented Jul 21, 2026

Copy link
Copy Markdown

Thanks for the pull request, @irfanuddinahmad!

This repository is currently maintained by @openedx/wg-maintenance-openedx-platform-oncall.

Once you've gone through the following steps feel free to tag them in a comment and let them know that your changes are ready for engineering review.

🔘 Get product approval

If you haven't already, check this list to see if your contribution needs to go through the product review process.

  • If it does, you'll need to submit a product proposal for your contribution, and have it reviewed by the Product Working Group.
    • This process (including the steps you'll need to take) is documented here.
  • If it doesn't, simply proceed with the next step.
🔘 Provide context

To help your reviewers and other members of the community understand the purpose and larger context of your changes, feel free to add as much of the following information to the PR description as you can:

  • Dependencies

    This PR must be merged before / after / at the same time as ...

  • Blockers

    This PR is waiting for OEP-1234 to be accepted.

  • Timeline information

    This PR must be merged by XX date because ...

  • Partner information

    This is for a course on edx.org.

  • Supporting documentation
  • Relevant Open edX discussion forum threads
🔘 Get a green build

If one or more checks are failing, continue working on your changes until this is no longer the case and your build turns green.

Details
Where can I find more information?

If you'd like to get more details on all aspects of the review process for open source pull requests (OSPRs), check out the following resources:

When can I expect my changes to be merged?

Our goal is to get community contributions seen and reviewed as efficiently as possible.

However, the amount of time that it takes to review and merge a PR can vary significantly based on factors such as:

  • The size and impact of the changes that it introduces
  • The need for product review
  • Maintenance status of the parent repository

💡 As a result it may take up to several weeks or months to complete a review and merge your PR.

Comment thread tox.ini
Comment thread .github/workflows/unit-tests.yml
Comment thread .github/workflows/compile-python-requirements.yml
Comment thread .github/workflows/js-tests.yml
Comment thread .github/workflows/js-tests.yml Outdated
Comment thread .github/workflows/lint-imports.yml
@irfanuddinahmad

Copy link
Copy Markdown
Contributor Author

Re: the astral-sh/setup-uv SHA-pinning comments on unit-tests.yml, js-tests.yml, and lint-imports.yml

Good catch, and worth noting: the org already ran a dedicated SHA-pinning sweep for this exact reason (openedx/.github#165, prompted by the tj-actions/changed-files supply-chain incident), but openedx-platform wasn't part of that ~121-repo effort.

That said, I don't think pinning just setup-uv here would meaningfully help: 82 other uses: refs in this repo's workflows (checkout, setup-python, setup-node, etc.) are still floating tags, so the actual attack surface stays open regardless, and pinning only one action creates an inconsistent special case for little real benefit. I'd rather this be a proper repo-wide pinact-based migration (same approach used for the other 121 repos) as its own dedicated follow-up, not a partial fix bundled into this PR.

Irfan Ahmad and others added 10 commits July 27, 2026 15:37
…ration 1/5)

Populates [project.dependencies] (from kernel.in + bundled.in), adds
[project.optional-dependencies] for the legacy openstack storage backend,
adds PEP 735 [dependency-groups] (coverage/testing/doc/assets/development/
semgrep/ci/dev, mirroring the current .in file composition), and
[tool.edx_lint].uv_constraints + generated [tool.uv].constraint-dependencies
for the ~20 repo-specific version pins, with a committed uv.lock.

This is purely additive: the Makefile, tox.ini, and CI workflows are
untouched and continue to use pip-compile/requirements/*.txt as the
source of truth. Part of the pip-compile -> uv migration tracked in
openedx/public-engineering#543 (1 of 5 PRs).

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
…ions

Found via real CI runs: a fresh uv resolution picked social-auth-core
5.0.2 (previously locked at 4.9.1 via pip-compile), which changes the
OAuth pipeline's post-login redirect behavior and breaks
common/djangoapps/third_party_auth's integration test suite (AzureAD,
Google, LinkedIn, Twitter full-pipeline specs all failed the same
assertion in tests/specs/base.py's assert_logged_in_cookie_redirect).

This migration is meant to be a tooling swap, not a dependency
upgrade, so pin back to the 4.x line rather than bundle an
investigation into social-auth-core 5.x's behavior change into this
PR. Mirrors the existing social-auth-app-django<=5.4.1 constraint,
pinned for a related, already-deferred migration in this same
dependency family. Follow-up tracked at
#38841.

Verified: all 46 previously-failing third_party_auth tests pass with
social-auth-core==4.9.1 restored via this constraint.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Rewrites the Makefile's requirements targets, tox.ini, and ~13 CI
workflows to use uv instead of pip-compile/pip-sync for the main app.
Deletes requirements/edx/*.in and *.txt (superseded by pyproject.toml +
uv.lock, added in PR 1 / #38835).

requirements/constraints.txt, common_constraints.txt, and pip-tools.{in,txt}
are intentionally kept for now: requirements/edx-sandbox and scripts/* still
pip-compile against them and aren't migrated until PR 3/4.

requirements/edx/{base,assets,development}.txt are regenerated as `uv
export` compatibility artifacts (via the Makefile's compile-requirements
target) since external tooling -- notably tutor's Dockerfile -- installs
from those exact paths with plain pip, not uv.

check_python_dependencies.yml is disabled (workflow_dispatch only, job
gated with if: false) since find_python_dependencies can't scan
pyproject.toml yet; tracked at openedx/repo-tools#725. User-confirmed
before committing since this removes a CI safety net.

Part of openedx/public-engineering#543 (2 of 5).

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Found via real CI runs after opening the PR (unit tests, Quality
Others, and the ReadTheDocs build all failed):

1. Makefile's test-requirements used `uv sync --only-group testing`,
   which EXCLUDES [project.dependencies] entirely (confirmed: `--only-group`
   replaces the dependency set rather than adding to it, unlike `--group`).
   This meant Django, XBlock, and the rest of the actual application were
   never installed for test runs -- ModuleNotFoundError: No module named
   'xblock' on every unit test shard. Fixed to
   `--no-default-groups --group testing`, matching what tox-uv itself
   generates for the equivalent tox environment.

2. .readthedocs.yaml had the same bug in its doc-requirements.txt export
   (`--only-group doc`). Since [project.dependencies] were excluded from
   that export, the subsequent `pip install -e .` resolved the whole
   dependency tree completely unconstrained by uv.lock's
   [tool.uv].constraint-dependencies -- picking setuptools==82.0.1 (violates
   setuptools<82) and Django==6.0.6 (violates Django<6.0). The setuptools
   violation broke fs/pyfilesystem2's pkg_resources import, crashing the
   Sphinx build via Django app loading. Fixed to `--group doc` plus
   `--no-deps` on the `pip install -e .` step, so dependencies only ever
   come from the properly-constrained export.

3. scripts/xsslint_config.py's SKIP_DIRS didn't exclude .venv. Under the
   old pip-compile system, dependencies installed into the system Python
   outside the repo checkout, so this never mattered. Now that `uv sync`
   creates .venv/ inside the checkout, xsslint's directory walk (which
   defaults to scanning the whole cwd) swept up thousands of vendored
   third-party files, inflating violations from 64 (the accepted baseline)
   to 316.

Verified all three: real pytest run (59 passed) plus full Django
`manage.py check` for both LMS and CMS against the corrected
test-requirements; a local simulation of the RTD build job sequence
confirms Django==5.2.15/setuptools==81.0.0 (both constraint-compliant)
and a successful Sphinx build.

Audited every other `--only-group` usage introduced in this migration
(assets.txt compat export, semgrep.yml) -- both are intentionally
project-dependency-free, matching the original files' documented
behavior, and their CI checks already passed.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
requirements/edx/{base,development}.txt were regenerated from the
uv.lock that predated PR 1's social-auth-core<5.0.0 constraint, so
they still referenced social-auth-core==5.0.2 -- caught by
check-consistent-dependencies.yml's re-run of `make compile-requirements`.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Gives requirements/edx-sandbox/ its own standalone pyproject.toml +
uv.lock, independent of the main app's dependency graph (codejail
intentionally runs untrusted code in a separate, isolated venv).

[tool.edx_lint].uv_constraints holds only the subset of the root
constraints relevant to this environment's deps (numpy, lxml,
setuptools) -- uv/edx-lint have no cross-project constraint chaining
equivalent to pip-compile's "-c ../constraints.txt", so root and
sandbox constraints are now independently maintained (documented in
requirements/edx-sandbox/README.rst).

base.txt is regenerated as a `uv export` compatibility artifact (the
README documents it as a supported, if unstable, direct pip-install
target). releases/*.txt are untouched -- they're frozen historical
snapshots, not part of any active compile loop; README now documents
cutting future ones via `uv export` instead of pip-compile.

Part of openedx/public-engineering#543 (3 of 5).

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
…on 4/5)

Gives scripts/xblock, scripts/user_retirement, and scripts/structures_pruning
each their own standalone pyproject.toml + uv.lock, mirroring the
codejail sandbox pattern from PR 3. structures_pruning's local
[tool.edx_lint].uv_constraints keeps the pymongo<4.4.1 pin it inherited
via the old "-c ../../../requirements/constraints.txt" chain.

These scripts are documented (in their own READMEs) to support git
sparse-checkout usage -- cloning only e.g. scripts/user_retirement/
without the rest of edx-platform. A self-contained pyproject.toml is
actually an improvement here over the old relative "-c
../../../requirements/constraints.txt" reference, which wouldn't even
resolve in a sparse checkout that excludes the root requirements/ dir.

Compatibility .txt exports are kept at their previously-documented
paths (e.g. scripts/user_retirement/requirements/{base,testing}.txt)
since each script's own README explicitly instructs `pip install -r`
against those exact paths.

Also fixes check-consistent-dependencies.yml's path filter and the two
PR-creating workflows' add-paths, neither of which would have picked
up changes to the new scripts/*/pyproject.toml or uv.lock files.

Part of openedx/public-engineering#543 (4 of 5).

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Deletes requirements/constraints.txt, common_constraints.txt, and
pip-tools.{in,txt} -- these were kept alive through PR 2-4 because
requirements/edx-sandbox and scripts/* still pip-compiled against
them, but PR 4 was the last consumer, so they're now fully unused.

Removes the correspondingly-vestigial Makefile machinery: the
pre-requirements target, the COMMON_CONSTRAINTS_TXT curl-fetch-and-sed
target, and the CUSTOM_COMPILE_COMMAND/COMPILE_OPTS variables that only
existed to feed pip-compile invocations which no longer exist anywhere
in this repo.

Finalizes requirements/README.rst for the fully-migrated state and
fixes a couple of remaining stale references (constraints.txt ->
[tool.edx_lint].uv_constraints).

This is the last of 5 PRs migrating openedx-platform from pip-compile
to uv + PEP 621/735 pyproject.toml, tracked in
openedx/public-engineering#543. Two follow-up
items remain outside this repo's control:
- openedx/repo-tools#725: find_python_dependencies needs pyproject.toml
  support before check_python_dependencies.yml can be re-enabled.
- Tutor's Dockerfile installs from requirements/edx/{base,assets,development}.txt
  with plain pip; those are kept as `uv export` compatibility artifacts
  (see PR 2 / #38836) rather than deleted, so no action is required there,
  but tutor maintainers should be aware these are now generated files.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
CI's "Compile requirements" check re-runs `make compile-requirements`
and fails if it produces any diff, to catch exactly this kind of
inconsistency. The compat-export files in this PR were originally
generated with uv 0.11.26; a newer uv (0.11.30, matching what
astral-sh/setup-uv installs in CI) resolves grpcio/grpcio-status with
an explicit `; platform_python_implementation != 'PyPy'` marker that
0.11.26 omitted. Regenerated with uv 0.11.30 to match.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
The uv migration for scripts/user_retirement dropped the lxml pin that
requirements/constraints.txt previously carried, letting the lockfile
resolve to lxml 6.1.1. The pin exists to avoid a libxml2 version
mismatch at runtime (#36695), and this script
transitively depends on lxml via simple-salesforce -> zeep, so the
same pin applies here as it does at the repo root.
Irfan Ahmad added 4 commits July 27, 2026 15:39
…emaining setup-uv steps

Faithfully translates .coveragerc into [tool.coverage.*] sections in
pyproject.toml, matching the pattern used across the other uv-migration
repos -- confirmed coverage.py picks up the new config identically
(same source/omit/branch/concurrency/parallel/relative_files/paths
values) once .coveragerc is removed.

Also adds `enable-cache: true` to the 5 remaining astral-sh/setup-uv
steps that weren't touched by the earlier migration commits
(check-consistent-dependencies.yml, compile-python-requirements.yml,
semgrep.yml, unit-tests.yml x2, upgrade-one-python-dependency.yml), for
consistency with the other 7 workflows this migration already updated.
openedx/repo-tools#725 (find_python_dependencies needs to scan
pyproject.toml/uv.lock) now has a proposed fix at
openedx/repo-tools#735 -- linking it from the disabled-check comment
so re-enabling this workflow is easy to track once it merges/releases.
- tox.ini: `quality` in envlist has no [testenv:quality] section and
  predates this migration; this repo's quality checks (ruff, xsslint,
  pii_check, check_keywords) never go through tox, so it was inert.
- js-tests.yml: nothing in this job's test chain (jest, karma) shells
  out to Python, so exporting .venv/bin to GITHUB_PATH was unnecessary.
master bumped edx-enterprise 8.3.0 -> 8.7.0 (and transitively
openedx-filters) in the pip-compile-generated requirements files
while this branch was rebasing; carry the same bump into the
uv-managed constraint and regenerate the affected compat exports.
@irfanuddinahmad
irfanuddinahmad force-pushed the irfanuddinahmad/uv-migration-consolidated branch from ecd4ab7 to 362c94b Compare July 27, 2026 10:48
Comment thread pyproject.toml Outdated
Comment thread pyproject.toml
Comment thread pyproject.toml
Comment thread scripts/compile_sass.py Outdated
Irfan Ahmad added 4 commits July 27, 2026 17:19
… group

- Add a `bundled` dependency-group for the 15 packages (mostly
  third-party XBlocks) that master kept in a separate `bundled.in`,
  explicitly documented as "not core to the platform's functionality"
  -- this PR had flattened them into [project.dependencies]
  indistinguishable from actually-core deps. Include it from
  `testing` and explicitly sync/export it in base-requirements and
  the requirements/edx/base.txt compat export, so nothing that
  currently gets these packages (production images, test runs, CI)
  loses them. Verified via export/dry-run diffing: zero package or
  version changes to base-requirements, test-requirements, or the
  dev group as a result.
- Remove `tox` from the `testing` group: it was duplicated with
  `ci` (which also has `tox-uv`, its required plugin), and nothing
  that syncs `testing` alone ever invokes tox directly.
- Rename the `doc` dependency-group to `docs`, matching the
  `development` group's un-abbreviated naming and the docs/ folder;
  updated its one internal reference and .readthedocs.yaml.
- bundled -> non-core: clearer name for the "installed-by-default but
  not required to run/test" group (matches the in-file comment wording).
- dev -> default: avoids near-duplicate naming with the development
  group it wraps. Explicitly set tool.uv.default-groups = ["default"]
  to preserve bare `uv sync`'s existing behavior of installing this
  group, since renaming away from uv's built-in "dev" default name
  would otherwise silently stop that.
- Verified both renames are lockfile/export no-ops: uv.lock package
  versions are byte-identical (diff is metadata-only), and the
  regenerated requirements/edx/{base,development}.txt compat exports
  only changed in their header comments.
- Verified the assets group's minimal uv sync actually functionally
  compiles Sass (not just installs packages): confirmed libsass's
  _sass.compile_filename binding compiles real .scss to .css from that
  minimal 4-package environment. The one compile failure encountered
  (missing edx-bootstrap import) is from node_modules/npm, a separate
  toolchain untouched by this dependency-group split -- documented in
  the script's docstring.
…migration-consolidated

# Conflicts:
#	requirements/constraints.txt
#	requirements/edx/base.txt
#	requirements/edx/development.txt
#	requirements/edx/doc.txt
#	requirements/edx/testing.txt
Merged master (bringing in automated Python dependency-upgrade PRs
#38926/#38927), which required resolving modify/delete conflicts on
the legacy pip-compile files this PR already deletes (constraints.txt,
edx/doc.txt, edx/testing.txt -- kept deleted) and content conflicts on
the edx/{base,development}.txt compat exports (kept ours, regenerated
below).

Bumped the edx-enterprise pin from 8.7.0 to 8.7.2 in
[tool.edx_lint].uv_constraints to match master's automated bump,
regenerated constraint-dependencies via edx_lint write_uv_constraints,
re-locked (also picks up enterprise-integrated-channels 0.1.61 -> 0.1.65,
matching master), and regenerated the base.txt/development.txt compat
exports.
@salman2013

Copy link
Copy Markdown
Contributor

@irfanuddinahmad This commit changes are not related to PR so either they raised in conflicts resolution or AI tried to fix something by own.

Irfan Ahmad added 2 commits July 29, 2026 16:11
Revert the bundled -> non-core rename from a1d3ea1. The reviewer
flagged (via Slack) that this broke the naming convention the rest
of the migration follows: every dependency-group name traces back to
its corresponding pre-migration requirements/edx/*.in file (testing.in
-> testing, development.in -> development, doc.in -> doc, etc.), and
requirements/edx/bundled.in is the actual source this group replaces.
"non-core" has no such .in file to match.

The dev -> default rename from the same commit is unaffected -- there
was never a dev.in file, so that rename doesn't violate this
convention and stays as-is.

Verified lockfile/export no-op: uv.lock package versions are
byte-identical (diff is metadata-only), and the regenerated
requirements/edx/base.txt compat export only changed in its header
comments.
…rence

- static-assets-check.yml and docs/references/static-assets.rst were
  running/documenting `uv sync --group assets` (or bare `uv sync`),
  which doesn't disable `default-groups` and so installs the entire
  `default` superset (dev/test/docs/ci tooling) on top -- confirmed via
  CI logs this installed 399 packages for a job that only needs a
  handful. Scope both to `--no-default-groups` plus the specific groups
  actually needed (`assets` for building; `bundled` + `assets` for
  collectstatic, which needs the full app's installed Django apps).
  scripts/compile_sass.py's own docstring already documented and
  verified the minimal-install pattern this now matches.
- requirements/edx-sandbox/README.rst referenced a `UV_SUBPROJECTS`
  Makefile variable that doesn't exist; the sub-project loop is inline
  in the `compile-requirements` target. Corrected the cross-reference.

# The ^"? is because git may quote weird file paths
if git diff --name-only "$BASE_SHA" | grep -P '^"?((requirements/)|(scripts/.*?/requirements/))'; then
if git diff --name-only "$BASE_SHA" | grep -P '^"?((requirements/)|(scripts/.*?/requirements/)|(scripts/[^/]+/pyproject\.toml)|(scripts/[^/]+/uv\.lock)|(pyproject\.toml)|(uv\.lock))'; then

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should add a comment here, as this doesn’t seem to be a permanent solution. In the upcoming follow-up PRs, we plan to remove the requirements folder, so this will need to be updated again.


# The ^"? is because git may quote weird file paths
if git diff --name-only "$BASE_SHA" | grep -P '^"?((requirements/)|(scripts/.*?/requirements/))'; then
if git diff --name-only "$BASE_SHA" | grep -P '^"?((requirements/)|(scripts/.*?/requirements/)|(scripts/[^/]+/pyproject\.toml)|(scripts/[^/]+/uv\.lock)|(pyproject\.toml)|(uv\.lock))'; then

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should add a comment here, as this doesn’t seem to be a permanent solution. In the upcoming follow-up PRs, we plan to remove the requirements folder, so this will need to be updated again.

- name: Install Python dependencies
run: |
pip install -r requirements/edx/coverage.txt
pip install coverage diff-cover

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why we are using pip here?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pip should be replaced with uv

jobs:
check_dependencies:
runs-on: ubuntu-latest
if: false

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a TODO so this does not stay disabled indefinitely:

# TODO: Re-enable once openedx/repo-tools#725 and openedx/repo-tools#735 land

Comment thread Makefile

pre-requirements: ## install Python requirements for running pip-tools
pip install -r requirements/pip-tools.txt
local-requirements: ## no-op; `uv sync` (used by the targets below) already installs -e . itself

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This target is now a no-op (@true). External callers that relied on it will silently succeed without any action.

Either remove the target, or make the intent explicit:

local-requirements: ## no-op; kept for backwards compatibility — uv sync handles this now
	@true

- name: Install Python dependencies
run: |
pip install -r requirements/edx/coverage.txt
pip install coverage diff-cover

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pip should be replaced with uv

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

core contributor PR author is a Core Contributor (who may or may not have write access to this repo). open-source-contribution PR author is not from Axim or 2U

Projects

Status: Waiting on Author

Development

Successfully merging this pull request may close these issues.

5 participants