Merge branch 'master' into docs/add-v0.7.0-release-notes

scikit-hep · Sep 9, 2022 · 906478b · 906478b
2 parents 67827f8 + c165c69
commit 906478b
Show file tree

Hide file tree

Showing 49 changed files with 834 additions and 275 deletions.
diff --git a/.github/workflows/release_tests.yml b/.github/workflows/release_tests.yml
@@ -42,8 +42,9 @@ jobs:
       run: |
         pytest tests/test_public_api.py
 
+      # FIXME: c.f. https://github.com/proycon/codemetapy/issues/24
     - name: Verify requirements in codemeta.json
       run: |
-        python -m pip install jq "codemetapy>=0.3.4"
+        python -m pip install jq "codemetapy==0.3.5"
         codemetapy --no-extras pyhf > codemeta_generated.json
-        diff <(jq -S .softwareRequirements codemeta_generated.json) <(jq -S .softwareRequirements codemeta.json)
+        diff <(jq -S .softwareRequirements codemeta.json) <(jq -S .softwareRequirements codemeta_generated.json)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -38,23 +38,23 @@ repos:
     - id: absolufy-imports
 
 -   repo: https://github.com/psf/black
-    rev: 22.6.0
+    rev: 22.8.0
     hooks:
     - id: black-jupyter
 
 -   repo: https://github.com/asottile/blacken-docs
     rev: v1.12.1
     hooks:
     - id: blacken-docs
-      additional_dependencies: [black==22.6.0]
+      additional_dependencies: [black==22.8.0]
 
 -   repo: https://github.com/asottile/yesqa
     rev: v1.4.0
     hooks:
     - id: yesqa
 
 -   repo: https://github.com/PyCQA/flake8
-    rev: 5.0.2
+    rev: 5.0.4
     hooks:
     - id: flake8
       args: ["--count", "--statistics"]
@@ -81,7 +81,7 @@ repos:
       additional_dependencies: [pyupgrade==2.37.3]
 
 -   repo: https://github.com/codespell-project/codespell
-    rev: v2.1.0
+    rev: v2.2.1
     hooks:
     - id: codespell
       files: ^.*\.(py|md|rst)$

diff --git a/.zenodo.json b/.zenodo.json
@@ -1,8 +1,8 @@
 {
     "description": "pure-Python HistFactory implementation with tensors and autodiff",
     "license": "Apache-2.0",
-    "title": "scikit-hep/pyhf: v0.7.0rc2",
-    "version": "v0.7.0rc2",
+    "title": "scikit-hep/pyhf: v0.7.0rc3",
+    "version": "v0.7.0rc3",
     "upload_type": "software",
     "creators": [
         {
@@ -36,7 +36,7 @@
     "related_identifiers": [
         {
             "scheme": "url",
-            "identifier": "https://github.com/scikit-hep/pyhf/tree/v0.7.0rc2",
+            "identifier": "https://github.com/scikit-hep/pyhf/tree/v0.7.0rc3",
             "relation": "isSupplementTo"
         }
     ]

diff --git a/CITATION.cff b/CITATION.cff
@@ -14,11 +14,11 @@ authors:
   given-names: "Giordon"
   orcid: "https://orcid.org/0000-0001-6616-3433"
   affiliation: "SCIPP, University of California, Santa Cruz"
-title: "pyhf: v0.7.0rc2"
-version: 0.7.0rc2
+title: "pyhf: v0.7.0rc3"
+version: 0.7.0rc3
 doi: 10.5281/zenodo.1169739
-repository-code: "https://github.com/scikit-hep/pyhf/releases/tag/v0.7.0rc2"
-url: "https://pyhf.readthedocs.io/en/v0.7.0rc2/"
+repository-code: "https://github.com/scikit-hep/pyhf/releases/tag/v0.7.0rc3"
+url: "https://pyhf.readthedocs.io/en/v0.7.0rc3/"
 keywords:
   - python
   - physics

diff --git a/README.rst b/README.rst
@@ -309,11 +309,11 @@ the preferred BibTeX entry for citation of ``pyhf`` includes both the
 
    @software{pyhf,
      author = {Lukas Heinrich and Matthew Feickert and Giordon Stark},
-     title = "{pyhf: v0.7.0rc2}",
-     version = {0.7.0rc2},
+     title = "{pyhf: v0.7.0rc3}",
+     version = {0.7.0rc3},
      doi = {10.5281/zenodo.1169739},
      url = {https://doi.org/10.5281/zenodo.1169739},
-     note = {https://github.com/scikit-hep/pyhf/releases/tag/v0.7.0rc2}
+     note = {https://github.com/scikit-hep/pyhf/releases/tag/v0.7.0rc3}
    }
 
    @article{pyhf_joss,
@@ -360,7 +360,7 @@ and grant `OAC-1450377 <https://www.nsf.gov/awardsearch/showAward?AWD_ID=1450377
    :target: https://scikit-hep.org/
 .. |NSF Award Number| image:: https://img.shields.io/badge/NSF-1836650-blue.svg
    :target: https://nsf.gov/awardsearch/showAward?AWD_ID=1836650
-.. |Docs from latest| image:: https://img.shields.io/badge/docs-v0.7.0rc2-blue.svg
+.. |Docs from latest| image:: https://img.shields.io/badge/docs-v0.7.0rc3-blue.svg
    :target: https://pyhf.readthedocs.io/
 .. |Docs from master| image:: https://img.shields.io/badge/docs-master-blue.svg
    :target: https://scikit-hep.github.io/pyhf
@@ -375,7 +375,7 @@ and grant `OAC-1450377 <https://www.nsf.gov/awardsearch/showAward?AWD_ID=1450377
    :target: https://github.com/conda-forge/pyhf-feedstock
 .. |Supported Python versions| image:: https://img.shields.io/pypi/pyversions/pyhf.svg
    :target: https://pypi.org/project/pyhf/
-.. |Docker Hub pyhf| image:: https://img.shields.io/badge/pyhf-v0.7.0rc2-blue?logo=Docker
+.. |Docker Hub pyhf| image:: https://img.shields.io/badge/pyhf-v0.7.0rc3-blue?logo=Docker
    :target: https://hub.docker.com/r/pyhf/pyhf/tags
 .. |Docker Hub pyhf CUDA| image:: https://img.shields.io/badge/pyhf-CUDA-blue?logo=Docker
    :target: https://hub.docker.com/r/pyhf/cuda/tags

diff --git a/codemeta.json b/codemeta.json
@@ -6,7 +6,7 @@
     "@type": "SoftwareSourceCode",
     "identifier": "pyhf",
     "name": "pyhf",
-    "version": "0.7.0rc2",
+    "version": "0.7.0rc3",
     "description": "pure-Python HistFactory implementation with tensors and autodiff",
     "license": "Apache, OSI Approved :: Apache Software License",
     "author": [
@@ -44,7 +44,7 @@
                 "url": "https://pypi.org"
             },
             "runtimePlatform": "Python 3",
-            "version": ">=1.4.1"
+            "version": ">=1.1.0"
         },
         {
             "@type": "SoftwareApplication",
@@ -57,7 +57,7 @@
                 "url": "https://pypi.org"
             },
             "runtimePlatform": "Python 3",
-            "version": ">=7.0"
+            "version": ">=8.0.0"
         },
         {
             "@type": "SoftwareApplication",
@@ -110,6 +110,32 @@
             },
             "runtimePlatform": "Python 3",
             "version": ">=5.1"
+        },
+        {
+            "@type": "SoftwareApplication",
+            "identifier": "importlib-resources",
+            "name": "importlib-resources",
+            "provider": {
+                "@id": "https://pypi.org",
+                "@type": "Organization",
+                "name": "The Python Package Index",
+                "url": "https://pypi.org"
+            },
+            "runtimePlatform": "Python 3",
+            "version": ">=1.3.0"
+        },
+        {
+            "@type": "SoftwareApplication",
+            "identifier": "typing-extensions",
+            "name": "typing-extensions",
+            "provider": {
+                "@id": "https://pypi.org",
+                "@type": "Organization",
+                "name": "The Python Package Index",
+                "url": "https://pypi.org"
+            },
+            "runtimePlatform": "Python 3",
+            "version": ">=3.7.4.3"
         }
     ],
     "audience": [
@@ -129,5 +155,5 @@
     "keywords": "physics fitting numpy scipy tensorflow pytorch jax",
     "developmentStatus": "4 - Beta",
     "applicationCategory": "Scientific/Engineering, Scientific/Engineering :: Physics",
-    "programmingLanguage": "Python 3, Python 3.7, Python 3.8, Python 3.9, Python 3.10, Python Implementation CPython"
+    "programmingLanguage": "Python 3, Python 3 Only, Python 3.7, Python 3.8, Python 3.9, Python 3.10, Python Implementation CPython"
 }
diff --git a/docs/_templates/autosummary/class.rst b/docs/_templates/autosummary/class.rst
@@ -15,6 +15,14 @@
    .. autoattribute:: {{ name }}.{{ item }}
    {%- endfor %}
    {% endif %}
+   {% if name == 'numpy_backend' %}
+     {% if 'array_type' in members %}
+   .. autoattribute:: {{ name }}.array_type
+     {% endif %}
+     {% if 'array_subtype' in members %}
+   .. autoattribute:: {{ name }}.array_subtype
+     {% endif %}
+   {% endif %}
    {% endblock %}
 
    {% block methods %}
@@ -23,7 +31,7 @@
    .. rubric:: {{ _('Methods') }}
 
    {% for item in members %}
-   {% if item not in attributes and item not in inherited_members and not item.startswith('__') %}
+   {% if item not in attributes and item not in inherited_members and not item.startswith('__') and item not in ['array_type', 'array_subtype'] %}
    .. automethod:: {{ name }}.{{ item }}
    {% endif %}
    {%- endfor %}

diff --git a/docs/api.rst b/docs/api.rst
@@ -44,6 +44,7 @@ Making Models from PDFs
 
    ~pdf.Model
    ~pdf._ModelConfig
+   ~mixins._ChannelSummaryMixin
    ~workspace.Workspace
    ~patchset.PatchSet
    ~patchset.Patch

diff --git a/docs/contributors.rst b/docs/contributors.rst
@@ -29,3 +29,4 @@ Contributors include:
 - Aryan Roy
 - Graeme Watt
 - Jerry Ling
+- Nathan Simpson