[Palm backports] fix: inconsistency between JWT & sessions and GH workflows updates #32337
Conversation
This file contains 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
…ord reset (#32073) VAN-1371 Co-authored-by: Syed Sajjad Hussain Shah <[email protected]> (cherry picked from commit 416a502)
…#32081) There was a `requirements/pip.txt` with old versions, and a newer `requirements/edx/pip.txt` managed via a `pip.in` file. The old one was used in most places, but came out of sync with pip-tools.txt, which was managed properly. Eventually this caused a `pip check` failure due to the mismatch. This should resolve at least part of edx/edx-arch-experiments#267 This PR moves pip.in and pip-tools.in and their corresponding pin files up to the `requirements/` dir, since they should be shared between the edx and sandbox environments. This also has the effect of upgrading pip to match the version in the file we've been uselessly upgrading. Other improvements: - Remove `-q` option from pip and pip-sync calls, as it was hiding some debugging information that would have resolved this sooner. - Depend on `pre-requirements` from `compile-requirements`, rather than from `upgrade`. (The base target is the one that actually needs it.) This also lets us remove the explicit `pip install pip-tools` line. - Install the recompiled pip and pip-tools files right away, not after the loop. When we upgrade pip-tools, we want to use the upgraded version, not the previous version. This requires moving the pip-tools.txt recompilation outside of the loop and into its own explicit line. - Don't upgrade pip if we're not running `make upgrade` (respect the compile options). - Remove apparently-unneeded `--no-emit-trusted-host --no-emit-index-url` options (we don't pass trusted-host or index-url options). (cherry picked from commit b852344)
* fix: upgrade pip & pip-tools versions * fix: install libmysqlclient-dev system package again * fix: skip reinstalling mysqlclient package * fix: add pytz package constraint --------- Co-authored-by: edX requirements bot <[email protected]> (cherry picked from commit 0ec7b8c)
openedx-webhooks
added
open-source-contribution
|
Thanks for the pull request, @mariajgrimaldi! As a core committer in this repo, you can merge this once the pull request is approved per the core committer reviewer requirements and according to the agreement with your edX Champion. |
52 tasks
mtyaka
approved these changes
Jun 12, 2023
There was a problem hiding this comment.
Thanks for for backporting these changes to Palm, @mariajgrimaldi!
|
@mariajgrimaldi 🎉 Your pull request was merged! Please take a moment to answer a two question survey so we can improve your experience in the future. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
This PR backports the following:
Inconsistency between JWT and session authentication after password reset: #32073
Deduplicate mismatched pip.txt files that caused build failure: #32081
Fix make upgrade job and _mysql issue: #32084
Since two of them fixed GH workflows, we didn't think had to create separate PRs for testing. Let me know if you think otherwise.
Supporting information
These backports are related to the BTR wg release tasks: openedx/wg-build-test-release#261
Testing instructions
Follow each PRs instructions.
Deadline
Before the next Palm release.
Other information
None