From 64bb7ccea1da6108690a45d27c7ef3c59c2a39a3 Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Fri, 27 Oct 2023 11:34:15 -0500 Subject: [PATCH 1/2] build: Remove installation of backends from 'test' extra --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index fcbdeff0bc..916d9b2d07 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -88,7 +88,6 @@ all = ["pyhf[backends,xmlio,contrib,shellcomplete]"] # Developer extras test = [ - "pyhf[all]", "scikit-hep-testdata>=0.4.11", "pytest>=6.0", "coverage[toml]>=6.0.0", @@ -121,7 +120,7 @@ docs = [ "ipython!=8.7.0", # c.f. https://github.com/scikit-hep/pyhf/pull/2068 ] develop = [ - "pyhf[test,docs]", + "pyhf[all,test,docs]", "tbump>=6.7.0", "pre-commit", "nox", From 2a9532c1d62cd686f983e0d2854c7792c09a7053 Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Fri, 27 Oct 2023 11:34:33 -0500 Subject: [PATCH 2/2] Add 'all' to use of 'test' extra --- .github/workflows/ci-windows.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/dependencies-head.yml | 12 ++++++------ .github/workflows/lower-bound-requirements.yml | 2 +- .github/workflows/notebooks.yml | 2 +- noxfile.py | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index 2aab9607f3..bd26b06053 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -30,7 +30,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools wheel - python -m pip install --upgrade '.[test]' + python -m pip install --upgrade '.[all,test]' - name: List installed Python packages run: python -m pip list diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 81324f2884..1f61c5fb95 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools wheel - python -m pip install --upgrade .[test] + python -m pip install --upgrade ".[all,test]" - name: List installed Python packages run: python -m pip list diff --git a/.github/workflows/dependencies-head.yml b/.github/workflows/dependencies-head.yml index ab2e8e8de2..a213e2052c 100644 --- a/.github/workflows/dependencies-head.yml +++ b/.github/workflows/dependencies-head.yml @@ -30,7 +30,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools wheel - python -m pip --no-cache-dir --quiet install --upgrade --pre .[test] + python -m pip --no-cache-dir --quiet install --upgrade --pre ".[all,test]" python -m pip list - name: List release candidates, alpha, and beta releases @@ -62,7 +62,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools wheel - python -m pip --no-cache-dir --quiet install --upgrade .[test] + python -m pip --no-cache-dir --quiet install --upgrade ".[all,test]" python -m pip uninstall --yes scipy python -m pip install --upgrade --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple scipy python -m pip list @@ -88,7 +88,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools wheel - python -m pip --no-cache-dir --quiet install --upgrade .[test] + python -m pip --no-cache-dir --quiet install --upgrade ".[all,test]" python -m pip uninstall --yes iminuit python -m pip install --upgrade cython python -m pip install --upgrade git+https://github.com/scikit-hep/iminuit.git @@ -114,7 +114,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools wheel - python -m pip --no-cache-dir --quiet install --upgrade .[test] + python -m pip --no-cache-dir --quiet install --upgrade ".[all,test]" python -m pip uninstall --yes uproot python -m pip install --upgrade git+https://github.com/scikit-hep/uproot5.git python -m pip list @@ -141,7 +141,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools wheel - python -m pip --no-cache-dir --quiet install --upgrade .[test] + python -m pip --no-cache-dir --quiet install --upgrade ".[all,test]" python -m 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. @@ -176,7 +176,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools wheel - python -m pip --no-cache-dir --quiet install --upgrade .[test] + python -m pip --no-cache-dir --quiet install --upgrade ".[all,test]" python -m pip uninstall --yes pytest python -m pip install --upgrade git+https://github.com/pytest-dev/pytest.git python -m pip list diff --git a/.github/workflows/lower-bound-requirements.yml b/.github/workflows/lower-bound-requirements.yml index 27e9a9cf4c..69f0937e8f 100644 --- a/.github/workflows/lower-bound-requirements.yml +++ b/.github/workflows/lower-bound-requirements.yml @@ -27,7 +27,7 @@ jobs: - name: Install dependencies and force lowest bound run: | python -m pip install --upgrade pip setuptools wheel - python -m pip --no-cache-dir install --constraint tests/constraints.txt .[test] + python -m pip --no-cache-dir install --constraint tests/constraints.txt ".[all,test]" - name: List installed Python packages run: python -m pip list diff --git a/.github/workflows/notebooks.yml b/.github/workflows/notebooks.yml index 47c6acaff0..bc4c817efe 100644 --- a/.github/workflows/notebooks.yml +++ b/.github/workflows/notebooks.yml @@ -30,7 +30,7 @@ jobs: run: | python -m pip install --upgrade pip setuptools wheel # FIXME: c.f. https://github.com/scikit-hep/pyhf/issues/2104 - python -m pip install --upgrade .[test] 'jupyter-client<8.0.0' + python -m pip install --upgrade ".[all,test]" 'jupyter-client<8.0.0' - name: List installed Python packages run: python -m pip list diff --git a/noxfile.py b/noxfile.py index ba75fae440..8104dbd28b 100644 --- a/noxfile.py +++ b/noxfile.py @@ -35,7 +35,7 @@ def tests(session): $ nox --session tests --python 3.11 -- tests/test_tensor.py # run specific tests $ nox --session tests --python 3.11 -- coverage # run with coverage but slower """ - session.install("--upgrade", "--editable", ".[test]") + session.install("--upgrade", "--editable", ".[all,test]") session.install("--upgrade", "pytest") # Allow tests to be run with coverage @@ -107,7 +107,7 @@ def regenerate(session): """ Regenerate Matplotlib images. """ - session.install("--upgrade", "--editable", ".[test]") + session.install("--upgrade", "--editable", ".[all,test]") session.install("--upgrade", "pytest", "matplotlib") if not sys.platform.startswith("linux"): session.error( @@ -182,7 +182,7 @@ def notebooks(session: nox.Session): """ Run the notebook tests. """ - session.install("--upgrade", "--editable", ".[test]") + session.install("--upgrade", "--editable", ".[all,test]") session.run( "pytest", "--override-ini",