Skip to content

Commit 78d9cc2

Browse files
build: Remove installation of backends from 'test' extra (#2373)
* Remove the 'all' extra from the 'test' extra installs and add 'all' to the 'develop' extra. * Add the 'all' extra to all install commands that also install the 'test' extra.
1 parent 6a347f4 commit 78d9cc2

File tree

7 files changed

+14
-15
lines changed

7 files changed

+14
-15
lines changed

.github/workflows/ci-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Install dependencies
3131
run: |
3232
python -m pip install --upgrade pip setuptools wheel
33-
python -m pip install --upgrade '.[test]'
33+
python -m pip install --upgrade '.[all,test]'
3434
3535
- name: List installed Python packages
3636
run: python -m pip list

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Install dependencies
4444
run: |
4545
python -m pip install --upgrade pip setuptools wheel
46-
python -m pip install --upgrade .[test]
46+
python -m pip install --upgrade ".[all,test]"
4747
4848
- name: List installed Python packages
4949
run: python -m pip list

.github/workflows/dependencies-head.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Install dependencies
3131
run: |
3232
python -m pip install --upgrade pip setuptools wheel
33-
python -m pip --no-cache-dir --quiet install --upgrade --pre .[test]
33+
python -m pip --no-cache-dir --quiet install --upgrade --pre ".[all,test]"
3434
python -m pip list
3535
3636
- name: List release candidates, alpha, and beta releases
@@ -62,7 +62,7 @@ jobs:
6262
- name: Install dependencies
6363
run: |
6464
python -m pip install --upgrade pip setuptools wheel
65-
python -m pip --no-cache-dir --quiet install --upgrade .[test]
65+
python -m pip --no-cache-dir --quiet install --upgrade ".[all,test]"
6666
python -m pip uninstall --yes scipy
6767
python -m pip install --upgrade --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple scipy
6868
python -m pip list
@@ -88,7 +88,7 @@ jobs:
8888
- name: Install dependencies
8989
run: |
9090
python -m pip install --upgrade pip setuptools wheel
91-
python -m pip --no-cache-dir --quiet install --upgrade .[test]
91+
python -m pip --no-cache-dir --quiet install --upgrade ".[all,test]"
9292
python -m pip uninstall --yes iminuit
9393
python -m pip install --upgrade cython
9494
python -m pip install --upgrade git+https://github.com/scikit-hep/iminuit.git
@@ -114,7 +114,7 @@ jobs:
114114
- name: Install dependencies
115115
run: |
116116
python -m pip install --upgrade pip setuptools wheel
117-
python -m pip --no-cache-dir --quiet install --upgrade .[test]
117+
python -m pip --no-cache-dir --quiet install --upgrade ".[all,test]"
118118
python -m pip uninstall --yes uproot
119119
python -m pip install --upgrade git+https://github.com/scikit-hep/uproot5.git
120120
python -m pip list
@@ -141,7 +141,7 @@ jobs:
141141
- name: Install dependencies
142142
run: |
143143
python -m pip install --upgrade pip setuptools wheel
144-
python -m pip --no-cache-dir --quiet install --upgrade .[test]
144+
python -m pip --no-cache-dir --quiet install --upgrade ".[all,test]"
145145
python -m pip uninstall --yes matplotlib
146146
# Need to use --extra-index-url as dependencies aren't on scientific-python-nightly-wheels package index.
147147
# Need to use --pre as dev releases will need priority over stable releases.
@@ -176,7 +176,7 @@ jobs:
176176
- name: Install dependencies
177177
run: |
178178
python -m pip install --upgrade pip setuptools wheel
179-
python -m pip --no-cache-dir --quiet install --upgrade .[test]
179+
python -m pip --no-cache-dir --quiet install --upgrade ".[all,test]"
180180
python -m pip uninstall --yes pytest
181181
python -m pip install --upgrade git+https://github.com/pytest-dev/pytest.git
182182
python -m pip list

.github/workflows/lower-bound-requirements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Install dependencies and force lowest bound
2828
run: |
2929
python -m pip install --upgrade pip setuptools wheel
30-
python -m pip --no-cache-dir install --constraint tests/constraints.txt .[test]
30+
python -m pip --no-cache-dir install --constraint tests/constraints.txt ".[all,test]"
3131
3232
- name: List installed Python packages
3333
run: python -m pip list

.github/workflows/notebooks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
run: |
3131
python -m pip install --upgrade pip setuptools wheel
3232
# FIXME: c.f. https://github.com/scikit-hep/pyhf/issues/2104
33-
python -m pip install --upgrade .[test] 'jupyter-client<8.0.0'
33+
python -m pip install --upgrade ".[all,test]" 'jupyter-client<8.0.0'
3434
3535
- name: List installed Python packages
3636
run: python -m pip list

noxfile.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def tests(session):
3535
$ nox --session tests --python 3.11 -- tests/test_tensor.py # run specific tests
3636
$ nox --session tests --python 3.11 -- coverage # run with coverage but slower
3737
"""
38-
session.install("--upgrade", "--editable", ".[test]")
38+
session.install("--upgrade", "--editable", ".[all,test]")
3939
session.install("--upgrade", "pytest")
4040

4141
# Allow tests to be run with coverage
@@ -107,7 +107,7 @@ def regenerate(session):
107107
"""
108108
Regenerate Matplotlib images.
109109
"""
110-
session.install("--upgrade", "--editable", ".[test]")
110+
session.install("--upgrade", "--editable", ".[all,test]")
111111
session.install("--upgrade", "pytest", "matplotlib")
112112
if not sys.platform.startswith("linux"):
113113
session.error(
@@ -182,7 +182,7 @@ def notebooks(session: nox.Session):
182182
"""
183183
Run the notebook tests.
184184
"""
185-
session.install("--upgrade", "--editable", ".[test]")
185+
session.install("--upgrade", "--editable", ".[all,test]")
186186
session.run(
187187
"pytest",
188188
"--override-ini",

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ all = ["pyhf[backends,xmlio,contrib,shellcomplete]"]
8888

8989
# Developer extras
9090
test = [
91-
"pyhf[all]",
9291
"scikit-hep-testdata>=0.4.11",
9392
"pytest>=6.0",
9493
"coverage[toml]>=6.0.0",
@@ -121,7 +120,7 @@ docs = [
121120
"ipython!=8.7.0", # c.f. https://github.com/scikit-hep/pyhf/pull/2068
122121
]
123122
develop = [
124-
"pyhf[test,docs]",
123+
"pyhf[all,test,docs]",
125124
"tbump>=6.7.0",
126125
"pre-commit",
127126
"nox",

0 commit comments

Comments
 (0)