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.

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

Update makefile to pin pip version to fix nightly CI #3182

Merged
merged 6 commits into from
Oct 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 14 additions & 7 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@ build:
jobs:
post_create_environment:
- npm install -g @mermaid-js/mermaid-cli
pre_install:
# pip==23.2 breaks pip-tools<7.0, and pip-tools>=7.0 does not support Python 3.7
# pip==23.3 breaks dependency resolution
- python -m pip install -U "pip>=21.2,<23.2"
# These are technically installation steps, due to RTD's limit we need to inject the installation earlier.
- python -m pip install --upgrade --no-cache-dir sphinx readthedocs-sphinx-ext
- python -m pip install --upgrade --upgrade-strategy only-if-needed --no-cache-dir .[docs,test]
pre_build:
- pip freeze
- python -m sphinx -WETan -j auto -D language=en -b linkcheck -d _build/doctrees docs/source _build/linkcheck
Expand All @@ -30,10 +37,10 @@ sphinx:
# configuration: mkdocs.yml

# Optionally set the version of Python and requirements required to build your docs
python:
install:
- method: pip
path: .
extra_requirements:
- docs
- test
# python:
# install:
# - method: pip
# path: .
# extra_requirements:
# - docs
# - test
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ package: clean install
python -m pip install build && python -m build

install-test-requirements:
# pip==23.2 breaks pip-tools<7.0, and pip-tools>=7.0 does not support Python 3.7
# pip==23.3 breaks dependency resolution
python -m pip install -U "pip>=21.2,<23.2"
pip install .[test]

install-pre-commit: install-test-requirements
Expand Down
4 changes: 2 additions & 2 deletions features/environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ def _setup_minimal_env(context):
"install",
"-U",
# pip==23.2 breaks pip-tools<7.0, and pip-tools>=7.0 does not support Python 3.7
"pip>=21.2,<23.2; python_version < '3.8'",
"pip>=21.2; python_version >= '3.8'",
# pip==23.3 breaks dependency resolution
"pip>=21.2,<23.2",
],
env=context.env,
)
Expand Down