Skip to content

Commit

Permalink
Use 'pyhf[extras] @ .' pattern over '.[extras]' pattern
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewfeickert committed Feb 28, 2024
1 parent 08554b2 commit 062edcb
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
run: |
python -m pip install uv
python -m uv pip install --system --upgrade pip setuptools wheel
python -m uv pip install --system --upgrade '.[all,test]'
python -m uv pip install --system --upgrade "pyhf[all,test] @ ."
- name: List installed Python packages
run: python -m pip list
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
run: |
python -m pip install uv
python -m uv pip install --system --upgrade pip setuptools wheel
python -m uv pip install --system --upgrade ".[all,test]"
python -m uv pip install --system --upgrade "pyhf[all,test] @ ."
- name: List installed Python packages
run: python -m pip list
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/dependencies-head.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
run: |
python -m pip install uv
python -m uv pip install --system --upgrade pip setuptools wheel
python -m uv pip --no-cache --quiet install --system --upgrade --pre ".[all,test]"
python -m uv pip --no-cache --quiet install --system --upgrade --pre "pyhf[all,test] @ ."
python -m pip list
- name: List release candidates, alpha, and beta releases
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
run: |
python -m pip install uv
python -m uv pip install --system --upgrade pip setuptools wheel
python -m uv pip --no-cache --quiet install --system --upgrade ".[all,test]"
python -m uv pip --no-cache --quiet install --system --upgrade "pyhf[all,test] @ ."
python -m uv pip uninstall --yes scipy
python -m uv pip install --system --upgrade --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple scipy
python -m pip list
Expand All @@ -91,7 +91,7 @@ jobs:
run: |
python -m pip install uv
python -m uv pip install --system --upgrade pip setuptools wheel
python -m uv pip --no-cache --quiet install --system --upgrade ".[all,test]"
python -m uv pip --no-cache --quiet install --system --upgrade "pyhf[all,test] @ ."
python -m uv pip uninstall --yes iminuit
python -m uv pip install --system --upgrade cython
python -m uv pip install --system --upgrade git+https://github.com/scikit-hep/iminuit.git
Expand All @@ -118,7 +118,7 @@ jobs:
run: |
python -m pip install uv
python -m uv pip install --system --upgrade pip setuptools wheel
python -m uv pip --no-cache --quiet install --system --upgrade ".[all,test]"
python -m uv pip --no-cache --quiet install --system --upgrade "pyhf[all,test] @ ."
python -m uv pip uninstall --yes uproot
python -m uv pip install --system --upgrade git+https://github.com/scikit-hep/uproot5.git
python -m pip list
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
run: |
python -m pip install uv
python -m uv pip install --system --upgrade pip setuptools wheel
python -m uv pip --no-cache --quiet install --system --upgrade ".[all,test]"
python -m uv pip --no-cache --quiet install --system --upgrade "pyhf[all,test] @ ."
python -m uv pip uninstall --yes matplotlib
# Need to use --extra-index-url as dependencies aren't on scientific-python-nightly-wheels package index.
# Need to use --pre as dev releases will need priority over stable releases.
Expand Down Expand Up @@ -182,7 +182,7 @@ jobs:
run: |
python -m pip install uv
python -m uv pip install --system --upgrade pip setuptools wheel
python -m uv pip --no-cache --quiet install --system --upgrade ".[all,test]"
python -m uv pip --no-cache --quiet install --system --upgrade "pyhf[all,test] @ ."
python -m uv pip uninstall --yes pytest
python -m uv pip install --system --upgrade git+https://github.com/pytest-dev/pytest.git
python -m pip list
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
run: |
python -m pip install uv
python -m uv pip install --system --upgrade pip setuptools wheel
python -m uv pip --quiet install --system --upgrade .[docs,test]
python -m uv pip --quiet install --system --upgrade "pyhf[docs,test] @ ."
python -m uv pip install --system yq
python -m pip list
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lower-bound-requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
run: |
python -m pip install uv
python -m uv pip install --system --upgrade pip setuptools wheel
python -m uv pip --no-cache install --system --constraint tests/constraints.txt ".[all,test]"
python -m uv pip --no-cache install --system --constraint tests/constraints.txt "pyhf[all,test] @ ."
- name: List installed Python packages
run: python -m pip list
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/notebooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
python -m pip install uv
python -m uv pip install --system --upgrade pip setuptools wheel
# FIXME: c.f. https://github.com/scikit-hep/pyhf/issues/2104
python -m uv pip install --system --upgrade ".[all,test]" 'jupyter-client<8.0.0'
python -m uv pip install --system --upgrade "pyhf[all,test] @ ." 'jupyter-client<8.0.0'
- name: List installed Python packages
run: python -m pip list
Expand Down

0 comments on commit 062edcb

Please sign in to comment.