Skip to content

fix: propagate --upgrade flag to all pip-compile calls in make upgrade#254

Merged
rodmgwgu merged 2 commits intomainfrom
MJG/fix-upgrade
Apr 10, 2026
Merged

fix: propagate --upgrade flag to all pip-compile calls in make upgrade#254
rodmgwgu merged 2 commits intomainfrom
MJG/fix-upgrade

Conversation

@mariajgrimaldi
Copy link
Copy Markdown
Member

Description

The PIP_COMPILE macro did not include ${COMPILE_OPTS}, so only pip.txt and pip-tools.txt were compiled with --upgrade. All other files (base.txt, test.txt, quality.txt, etc.) were compiled without it, keeping their existing pinned versions.

When a transitive dependency releases a new version, pip-tools.txt would upgrade but the rest of the chain would not, causing version conflicts in dev.txt (which includes both as -r inputs).

Aligns the Makefile with the pattern from openedx/openedx-core:

  • Add --rebuild to the PIP_COMPILE macro
  • Pass --upgrade via PIP_COMPILE_OPTS so all files get it uniformly
  • Remove the split code path for pip.txt and pip-tools.txt

Merge checklist:
Check off if complete or not applicable:

  • Version bumped
  • Changelog record added
  • Documentation updated (not only docstrings)
  • Fixup commits are squashed away
  • Unit tests added/updated
  • Manual testing instructions provided
  • Noted any: Concerns, dependencies, migration issues, deadlines, tickets

The PIP_COMPILE macro did not include \${COMPILE_OPTS}, so only
pip.txt and pip-tools.txt were compiled with --upgrade. All other
files (base.txt, test.txt, quality.txt, etc.) were compiled without
it, keeping their existing pinned versions.

When a transitive dependency releases a new version, pip-tools.txt
would upgrade but the rest of the chain would not, causing version
conflicts in dev.txt (which includes both as -r inputs).

Aligns the Makefile with the pattern from openedx/openedx-core:
- Add --rebuild to the PIP_COMPILE macro
- Pass --upgrade via PIP_COMPILE_OPTS so all files get it uniformly
- Remove the split code path for pip.txt and pip-tools.txt

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@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 Apr 10, 2026
@openedx-webhooks
Copy link
Copy Markdown

openedx-webhooks commented Apr 10, 2026

Thanks for the pull request, @mariajgrimaldi!

This repository is currently maintained by @openedx/committers-openedx-authz.

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.

@mariajgrimaldi mariajgrimaldi marked this pull request as ready for review April 10, 2026 14:36
Copy link
Copy Markdown
Contributor

@rodmgwgu rodmgwgu left a comment

Choose a reason for hiding this comment

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

Tested in my local, working fine, thanks!

Copy link
Copy Markdown
Contributor

@bmtcril bmtcril left a comment

Choose a reason for hiding this comment

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

Hmm, I'm not clear on why it's needed but glad it works. Also glad that we're so close to being able to move to uv 😄

@rodmgwgu rodmgwgu merged commit e33e57b into main Apr 10, 2026
8 checks passed
@rodmgwgu rodmgwgu deleted the MJG/fix-upgrade branch April 10, 2026 18:27
@github-project-automation github-project-automation bot moved this from Needs Triage to Done in Contributions Apr 10, 2026
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: Done

Development

Successfully merging this pull request may close these issues.

4 participants