Resolves CI failure due to bad patch failure#62
Merged
knikolla merged 1 commit intonerc-project:mainfrom Sep 17, 2025
Merged
Conversation
QuanMPhm
force-pushed
the
61/ci_failure
branch
3 times, most recently
from
1da1661 to
0e8397f
Compare
naved001
reviewed
Sep 12, 2025
requirements.txt
Outdated
| @@ -1,4 +1,4 @@ | |||
| coldfront | |||
| git+https://github.com/ubccr/coldfront@v1.1.6#egg=coldfront | |||
The latest version of `coldfront` (v1.1.7) made a change to `coldfront/config/urls.py b/coldfront/config/urls.py`, which caused `01_add_coldfront_urls.patch` to be out-of-date. This meant the CI script was unable to apply the patch. A version pin for `coldfront` has been added to `requirements.txt`, matching the version used in `coldfront-nerc` (v1.1.6). The order of pip install commands in `ci/setup.sh` has been changed to resolve a much more convoluted dependancy-related issue as described below. `coldfront v1.1.6` required `django-q` [1], while `coldfront v1.1.7` required `django-q2` [2]. Both packages provide the `django_q` module, and are incompatible with each other. The `test-requirements.txt` file in this repo requires `coldfront-plugin-cloud`, which doesn't set a upper limit on the version of `coldfront`. `coldfront-plugin-api` requires `coldfront v1.1.6`. This means when `test-requirements.txt` is installed first, it will install `coldfront v1.1.7` and `django-q2`. Afterwards, when `coldfront-plugin-api` is installed, it will downgrade `coldfront` to v1.1.6, and install `django-q`, which will corrupt the `django_q` module. By reversing the order of installation, `coldfront` is never downgraded, avoiding the corruption. All of this stems from the fact that `coldfront-plugin-cloud` doesn't set an upper limit on the version of `coldfront` it supports. [1] https://github.com/Koed00/django-q/tree/master [2] https://github.com/django-q2/django-q2
QuanMPhm
force-pushed
the
61/ci_failure
branch
from
0e8397f to
f6a425c
Compare
naved001
approved these changes
Sep 16, 2025
knikolla
approved these changes
Sep 17, 2025
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
3 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.
Closes #61. More info in the commit message. Sorry for the length of it. This is a truly marvelous debugging experience.