Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use pip-compile's backtracking dependency resolver to fix failing CI pipelines #2509

Merged
merged 2 commits into from
Nov 22, 2022
Merged

Use pip-compile's backtracking dependency resolver to fix failing CI pipelines #2509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f124af
Use pip-compile's backtracking dependency resolver
lunkwill42 Nov 22, 2022
dd75aec
Use backtracking resolver in docker image as well
lunkwill42 Nov 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ COPY requirements/ /requirements
COPY requirements.txt /
COPY tests/requirements.txt /test-requirements.txt
# Since we used pip3 to install pip globally, pip should now be for Python 3
RUN pip-compile --output-file /requirements.txt.lock /requirements.txt /test-requirements.txt
RUN pip-compile --resolver=backtracking --output-file /requirements.txt.lock /requirements.txt /test-requirements.txt
RUN pip install -r /requirements.txt.lock

ARG CUSTOM_PIP=ipython
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ allowlist_externals =
sed
mkdir
commands_pre =
pip-compile --output-file {envdir}/requirements.txt tests/requirements.txt requirements/base.txt requirements/optional.txt requirements/django{env:DJANGO_VER}.txt
pip-compile --resolver=backtracking --output-file {envdir}/requirements.txt tests/requirements.txt requirements/base.txt requirements/optional.txt requirements/django{env:DJANGO_VER}.txt
pip-sync {envdir}/requirements.txt
pip install -e .

Expand Down Expand Up @@ -87,7 +87,7 @@ setenv =
LC_ALL=C.UTF-8
LANG=C.UTF-8
commands_pre =
pip-compile --output-file {envdir}/requirements.txt tests/requirements.txt requirements/base.txt requirements/django22.txt
pip-compile --resolver=backtracking --output-file {envdir}/requirements.txt tests/requirements.txt requirements/base.txt requirements/django22.txt
pip-sync {envdir}/requirements.txt
commands =
{toxinidir}/tests/docker/scripts/pylint.sh python/nav --jobs=4 --rcfile=python/pylint.rc --disable=I,similarities --load-plugins pylint_django --output-format=parseable
Expand All @@ -102,7 +102,7 @@ setenv =
LANG=C.UTF-8
allowlist_externals = sh
commands_pre =
pip-compile --output-file {envdir}/requirements.txt doc/requirements.txt
pip-compile --resolver=backtracking --output-file {envdir}/requirements.txt doc/requirements.txt
pip-sync {envdir}/requirements.txt
commands =
python setup.py build_sphinx
Expand Down