chore: Migrate from diana-hep GitHub org to scikit-hep (#643)

* Replace all instances of diana-hep with scikit-hep

Author: matthewfeickert

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 # Description
 
-Please first read [CONTRIBUTING.md](https://github.com/diana-hep/pyhf/tree/master/CONTRIBUTING.md).
+Please first read [CONTRIBUTING.md](https://github.com/scikit-hep/pyhf/tree/master/CONTRIBUTING.md).
 
 Please describe the purpose of this pull request in some detail. Reference and link to any relevant issues or pull requests.
 

.github/PULL_REQUEST_TEMPLATE/Bug-Fix.md

@@ -1,6 +1,6 @@
 # Pull Request Description
 
-Please first read [CONTRIBUTING.md](https://github.com/diana-hep/pyhf/tree/master/CONTRIBUTING.md).
+Please first read [CONTRIBUTING.md](https://github.com/scikit-hep/pyhf/tree/master/CONTRIBUTING.md).
 
 Please describe the purpose of this pull request in some detail and what bug it fixes. Reference and link to any relevant issues or pull requests (such as the issue in which this bug was first discussed).
 

.github/PULL_REQUEST_TEMPLATE/Feature.md

@@ -1,6 +1,6 @@
 # Pull Request Description
 
-Please first read [CONTRIBUTING.md](https://github.com/diana-hep/pyhf/tree/master/CONTRIBUTING.md).
+Please first read [CONTRIBUTING.md](https://github.com/scikit-hep/pyhf/tree/master/CONTRIBUTING.md).
 
 Please describe the purpose of this pull request in some detail and what the specific feature being added will do. Reference and link to any relevant issues or pull requests (such as the issue in which this feature was first suggested).
 

.github/workflows/merged.yml

@@ -14,5 +14,5 @@ jobs:
     - name: Trigger Binder build
       run: |
         # Use Binder build API to trigger repo2docker to build image on GKE and OVH Binder Federation clusters
-        bash binder/trigger_binder.sh https://gke.mybinder.org/build/gh/diana-hep/pyhf/master
-        bash binder/trigger_binder.sh https://ovh.mybinder.org/build/gh/diana-hep/pyhf/master
+        bash binder/trigger_binder.sh https://gke.mybinder.org/build/gh/scikit-hep/pyhf/master
+        bash binder/trigger_binder.sh https://ovh.mybinder.org/build/gh/scikit-hep/pyhf/master

.github/workflows/publish-package.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   build-and-publish:
-    name: Build and publish Python 🐍 distributions 📦 to PyPI and TestPyPI
+    name: Build and publish Python distro to (Test)PyPI
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@master
@@ -30,13 +30,13 @@ jobs:
         python -m pep517.build --source --binary --out-dir dist/ .
     - name: Publish distribution 📦 to Test PyPI
       # every PR will trigger a push event on master, so check the push event is actually coming from master
-      if: github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'diana-hep/pyhf'
+      if: github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'scikit-hep/pyhf'
       uses: pypa/[email protected]
       with:
         password: ${{ secrets.test_pypi_password }}
         repository_url: https://test.pypi.org/legacy/
     - name: Publish distribution 📦 to PyPI
-      if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') && github.repository == 'diana-hep/pyhf'
+      if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') && github.repository == 'scikit-hep/pyhf'
       uses: pypa/[email protected]
       with:
         password: ${{ secrets.pypi_password }}

CONTRIBUTING.md

@@ -21,11 +21,11 @@ If you would like to make a pull request please:
 
 ## Bug Reports
 
-If you have found a bug please report it by filling out the [bug report template](https://github.com/diana-hep/pyhf/issues/new?template=Bug-Report.md&labels=bug&title=Bug+Report+:+Title+Here).
+If you have found a bug please report it by filling out the [bug report template](https://github.com/scikit-hep/pyhf/issues/new?template=Bug-Report.md&labels=bug&title=Bug+Report+:+Title+Here).
 
 ## Installing the development environment
 
-We recommend first reading the "[Developing](https://diana-hep.org/pyhf/development.html)" page on the pyhf website and the coming back here.
+We recommend first reading the "[Developing](https://scikit-hep.org/pyhf/development.html)" page on the pyhf website and the coming back here.
 
 You can install the development environment (which includes a number of extra) libraries and all others needed to run the tests via `pip`:
 

README.md

@@ -2,17 +2,17 @@
 
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1169739.svg)](https://doi.org/10.5281/zenodo.1169739)
 
-[![Travis Build Status](https://travis-ci.org/diana-hep/pyhf.svg?branch=master)](https://travis-ci.org/diana-hep/pyhf)
-[![GitHub Actions Status: CI](https://github.com/diana-hep/pyhf/workflows/CI/CD/badge.svg)](https://github.com/diana-hep/pyhf/actions?query=workflow%3ACI%2FCD+branch%3Amaster)
-[![GitHub Actions Status: Publish](https://github.com/diana-hep/pyhf/workflows/publish%20distributions/badge.svg)](https://github.com/diana-hep/pyhf/actions?query=workflow%3A%22publish+distributions%22+branch%3Amaster)
+[![Travis Build Status](https://travis-ci.org/scikit-hep/pyhf.svg?branch=master)](https://travis-ci.org/scikit-hep/pyhf)
+[![GitHub Actions Status: CI](https://github.com/scikit-hep/pyhf/workflows/CI/CD/badge.svg)](https://github.com/scikit-hep/pyhf/actions?query=workflow%3ACI%2FCD+branch%3Amaster)
+[![GitHub Actions Status: Publish](https://github.com/scikit-hep/pyhf/workflows/publish%20distributions/badge.svg)](https://github.com/scikit-hep/pyhf/actions?query=workflow%3A%22publish+distributions%22+branch%3Amaster)
 [![Docker Automated](https://img.shields.io/docker/automated/pyhf/pyhf.svg)](https://hub.docker.com/r/pyhf/pyhf/)
-[![Code Coverage](https://codecov.io/gh/diana-hep/pyhf/graph/badge.svg?branch=master)](https://codecov.io/gh/diana-hep/pyhf?branch=master)
-[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/diana-hep/pyhf.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/diana-hep/pyhf/latest/files/)
-[![CodeFactor](https://www.codefactor.io/repository/github/diana-hep/pyhf/badge)](https://www.codefactor.io/repository/github/diana-hep/pyhf)
+[![Code Coverage](https://codecov.io/gh/scikit-hep/pyhf/graph/badge.svg?branch=master)](https://codecov.io/gh/scikit-hep/pyhf?branch=master)
+[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/scikit-hep/pyhf.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/scikit-hep/pyhf/latest/files/)
+[![CodeFactor](https://www.codefactor.io/repository/github/scikit-hep/pyhf/badge)](https://www.codefactor.io/repository/github/scikit-hep/pyhf)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
 
-[![Docs](https://img.shields.io/badge/docs-master-blue.svg)](https://diana-hep.github.io/pyhf)
-[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/diana-hep/pyhf/master?filepath=docs%2Fexamples%2Fnotebooks%2Fbinderexample%2FStatisticalAnalysis.ipynb)
+[![Docs](https://img.shields.io/badge/docs-master-blue.svg)](https://scikit-hep.github.io/pyhf)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/scikit-hep/pyhf/master?filepath=docs%2Fexamples%2Fnotebooks%2Fbinderexample%2FStatisticalAnalysis.ipynb)
 
 [![PyPI version](https://badge.fury.io/py/pyhf.svg)](https://badge.fury.io/py/pyhf)
 [![Supported Python versionss](https://img.shields.io/pypi/pyversions/pyhf.svg)](https://pypi.org/project/pyhf/)
@@ -73,8 +73,8 @@ results obtained from this package are validated against output computed from Hi
 nobs = 55, b = 50, db = 7, nom_sig = 10.
 ```
 
-<img src="https://raw.githubusercontent.com/diana-hep/pyhf/master/docs/_static/img/manual_1bin_55_50_7.png" alt="manual" width="500"/>
-<img src="https://raw.githubusercontent.com/diana-hep/pyhf/master/docs/_static/img/hfh_1bin_55_50_7.png" alt="manual" width="500"/>
+<img src="https://raw.githubusercontent.com/scikit-hep/pyhf/master/docs/_static/img/manual_1bin_55_50_7.png" alt="manual" width="500"/>
+<img src="https://raw.githubusercontent.com/scikit-hep/pyhf/master/docs/_static/img/hfh_1bin_55_50_7.png" alt="manual" width="500"/>
 
 
 ## A two bin example
@@ -84,8 +84,8 @@ bin 1: nobs = 100, b = 100, db = 15., nom_sig = 30.
 bin 2: nobs = 145, b = 150, db = 20., nom_sig = 45.
 ```
 
-<img src="https://raw.githubusercontent.com/diana-hep/pyhf/master/docs/_static/img/manual_2_bin_100.0_145.0_100.0_150.0_15.0_20.0_30.0_45.0.png" alt="manual" width="500"/>
-<img src="https://raw.githubusercontent.com/diana-hep/pyhf/master/docs/_static/img/hfh_2_bin_100.0_145.0_100.0_150.0_15.0_20.0_30.0_45.0.png" alt="manual" width="500"/>
+<img src="https://raw.githubusercontent.com/scikit-hep/pyhf/master/docs/_static/img/manual_2_bin_100.0_145.0_100.0_150.0_15.0_20.0_30.0_45.0.png" alt="manual" width="500"/>
+<img src="https://raw.githubusercontent.com/scikit-hep/pyhf/master/docs/_static/img/hfh_2_bin_100.0_145.0_100.0_150.0_15.0_20.0_30.0_45.0.png" alt="manual" width="500"/>
 
 ## Installation
 
@@ -107,4 +107,4 @@ pip uninstall pyhf
 
 ## Authors
 
-Please check the [contribution statistics for a list of contributors](https://github.com/diana-hep/pyhf/graphs/contributors)
+Please check the [contribution statistics for a list of contributors](https://github.com/scikit-hep/pyhf/graphs/contributors)

docs/_templates/modifierclass.rst

@@ -1,4 +1,4 @@
-:github_url: https://github.com/diana-hep/pyhf/blob/master/{{module | replace(".", "/") }}
+:github_url: https://github.com/scikit-hep/pyhf/blob/master/{{module | replace(".", "/") }}
 
 {{ name | escape | underline}}
 

docs/bib/docs.bib

@@ -83,18 +83,18 @@ @Article{Cowan:2010js
 
 @misc{schema_workspace,
   title = {Workspace Schema},
-  url = {https://diana-hep.org/pyhf/schemas/1.0.0/workspace.json},
+  url = {https://scikit-hep.org/pyhf/schemas/1.0.0/workspace.json},
   note = {Accessed: 2019-06-20}
 }
 
 @misc{schema_model,
   title = {Model Schema},
-  url = {https://diana-hep.org/pyhf/schemas/1.0.0/model.json},
+  url = {https://scikit-hep.org/pyhf/schemas/1.0.0/model.json},
   note = {Accessed: 2019-06-20}
 }
 
 @misc{schema_defs,
   title = {HistFactory Definitions Schema},
-  url = {https://diana-hep.org/pyhf/schemas/1.0.0/defs.json},
+  url = {https://scikit-hep.org/pyhf/schemas/1.0.0/defs.json},
   note = {Accessed: 2019-06-20}
 }

docs/conf.py

@@ -53,7 +53,7 @@ def setup(app):
 ]
 
 # Github repo
-issues_github_path = 'diana-hep/pyhf'
+issues_github_path = 'scikit-hep/pyhf'
 
 # Generate the API documentation when building
 autosummary_generate = True

docs/development.rst

@@ -5,7 +5,7 @@ To develop, we suggest using `virtual environments <https://packaging.python.org
 
 .. code-block:: console
 
-    git clone https://github.com/diana-hep/pyhf.git
+    git clone https://github.com/scikit-hep/pyhf.git
 
 and install all necessary packages for development
 

docs/examples.rst

@@ -4,7 +4,7 @@ Examples
 Try out in Binder! |Binder|
 
 .. |Binder| image:: https://mybinder.org/badge_logo.svg
-    :target: https://mybinder.org/v2/gh/diana-hep/pyhf/master?filepath=docs%2Fexamples%2Fnotebooks%2Fbinderexample%2FStatisticalAnalysis.ipynb
+    :target: https://mybinder.org/v2/gh/scikit-hep/pyhf/master?filepath=docs%2Fexamples%2Fnotebooks%2Fbinderexample%2FStatisticalAnalysis.ipynb
 
 Notebooks:
 

docs/examples/notebooks/binderexample/StatisticalAnalysis.ipynb

@@ -47,7 +47,7 @@
     "\n",
     "## The Demo\n",
     "\n",
-    "The input data for the statistical analysis was built generated using the containerized workflow engine [yadage](https://github.com/diana-hep/yadage) (see demo from KubeCon 2018 [[youtube](https://github.com/diana-hep/yadage)]). Similarly to Binder this utilizes modern container technology for reproducible science. Below you see the execution graph leading up to the model input data at the bottom."
+    "The input data for the statistical analysis was built generated using the containerized workflow engine [yadage](https://github.com/scikit-hep/yadage) (see demo from KubeCon 2018 [[youtube](https://github.com/scikit-hep/yadage)]). Similarly to Binder this utilizes modern container technology for reproducible science. Below you see the execution graph leading up to the model input data at the bottom."
    ]
   },
   {

docs/faq.rst

@@ -9,7 +9,7 @@ Questions
 Is it possible to set the backend from the CLI?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Not at the moment. `Pull Requests <https://github.com/diana-hep/pyhf/compare>`__ are welcome.
+Not at the moment. `Pull Requests <https://github.com/scikit-hep/pyhf/compare>`__ are welcome.
 
 See also:
   - :issue:`266`

docs/governance/ROADMAP.md

@@ -1,4 +1,4 @@
-# pyhf 2019 into 2020 Roadmap (Issue [#561](https://github.com/diana-hep/pyhf/issues/561))
+# pyhf 2019 into 2020 Roadmap (Issue [#561](https://github.com/scikit-hep/pyhf/issues/561))
 
 ## Overview and Goals
 
@@ -35,7 +35,7 @@ The roadmap will be executed over mostly Quarter 3 of 2019 through Quarter 1 of
 
 1. **Documentation and Deployment**
    - [ ] Add docstrings to all functions and classes (Issues #38, #349) [2019-Q3]
-   - [ ] [Greatly revise and expand examples](https://github.com/diana-hep/pyhf/issues?q=is%3Aopen+is%3Aissue+label%3Adocs) (Issues #168, #202, #212, #325, #342, #349, #367) [2019-Q3 → 2019-Q4]
+   - [ ] [Greatly revise and expand examples](https://github.com/scikit-hep/pyhf/issues?q=is%3Aopen+is%3Aissue+label%3Adocs) (Issues #168, #202, #212, #325, #342, #349, #367) [2019-Q3 → 2019-Q4]
       - [ ] Add small case studies with published sbottom likelihood from HEPData
    - [ ] Move to [scikit-hep](https://github.com/scikit-hep) GitHub organization [2019-Q3]
    - [ ] Develop a release schedule/criteria [2019-Q4]

docs/index.rst

@@ -19,7 +19,7 @@
 
 .. raw:: html
 
-   <a class="github-fork-ribbon right-top fixed" href="https://github.com/diana-hep/pyhf/fork" data-ribbon="Fork me on GitHub" title="Fork me on GitHub">Fork me on GitHub</a>
+   <a class="github-fork-ribbon right-top fixed" href="https://github.com/scikit-hep/pyhf/fork" data-ribbon="Fork me on GitHub" title="Fork me on GitHub">Fork me on GitHub</a>
 
 .. mdinclude:: ../README.md
 

docs/installation.rst

@@ -61,44 +61,44 @@ Install latest stable release from `PyPI <https://pypi.org/project/pyhf/>`__...
     pip install pyhf[xmlio]
 
 
-Install latest development version from `GitHub <https://github.com/diana-hep/pyhf>`__...
+Install latest development version from `GitHub <https://github.com/scikit-hep/pyhf>`__...
 -----------------------------------------------------------------------------------------
 
 ... with NumPy backend
 ++++++++++++++++++++++
 
 .. code-block:: console
 
-    pip install --ignore-installed -U "git+https://github.com/diana-hep/pyhf.git#egg=pyhf"
+    pip install --ignore-installed -U "git+https://github.com/scikit-hep/pyhf.git#egg=pyhf"
 
 ... with TensorFlow backend
 +++++++++++++++++++++++++++
 
 .. code-block:: console
 
-    pip install --ignore-installed -U "git+https://github.com/diana-hep/pyhf.git#egg=pyhf[tensorflow]"
+    pip install --ignore-installed -U "git+https://github.com/scikit-hep/pyhf.git#egg=pyhf[tensorflow]"
 
 ... with PyTorch backend
 ++++++++++++++++++++++++
 
 .. code-block:: console
 
-    pip install --ignore-installed -U "git+https://github.com/diana-hep/pyhf.git#egg=pyhf[torch]"
+    pip install --ignore-installed -U "git+https://github.com/scikit-hep/pyhf.git#egg=pyhf[torch]"
 
 ... with all backends
 +++++++++++++++++++++
 
 .. code-block:: console
 
-    pip install --ignore-installed -U "git+https://github.com/diana-hep/pyhf.git#egg=pyhf[tensorflow,torch]"
+    pip install --ignore-installed -U "git+https://github.com/scikit-hep/pyhf.git#egg=pyhf[tensorflow,torch]"
 
 
 ... with xml import/export functionality
 ++++++++++++++++++++++++++++++++++++++++
 
 .. code-block:: console
 
-    pip install --ignore-installed -U "git+https://github.com/diana-hep/pyhf.git#egg=pyhf[xmlio]"
+    pip install --ignore-installed -U "git+https://github.com/scikit-hep/pyhf.git#egg=pyhf[xmlio]"
 
 
 Updating :code:`pyhf`

docs/likelihood.rst

@@ -29,7 +29,7 @@ check that it conforms to the provided workspace specification as follows:
    import json, requests, jsonschema
    workspace = json.load(open('/path/to/analysis_workspace.json'))
    # if no exception is raised, it found and parsed the schema
-   schema = requests.get('https://diana-hep.org/pyhf/schemas/1.0.0/workspace.json').json()
+   schema = requests.get('https://scikit-hep.org/pyhf/schemas/1.0.0/workspace.json').json()
    # If no exception is raised by validate(), the instance is valid.
    jsonschema.validate(instance=workspace, schema=schema)
 

setup.py

@@ -74,7 +74,7 @@ def _is_test_pypi():
     description='(partial) pure python histfactory implementation',
     long_description=long_description,
     long_description_content_type='text/markdown',
-    url='https://github.com/diana-hep/pyhf',
+    url='https://github.com/scikit-hep/pyhf',
     author='Lukas Heinrich, Matthew Feickert, Giordon Stark',
     author_email='[email protected], [email protected], [email protected]',
     license='Apache',

src/pyhf/schemas/1.0.0/defs.json

@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft-06/schema#",
-    "$id": "https://diana-hep.org/pyhf/schemas/1.0.0/defs.json",
+    "$id": "https://scikit-hep.org/pyhf/schemas/1.0.0/defs.json",
     "definitions": {
         "observation": {
             "type": "object",

src/pyhf/schemas/1.0.0/measurement.json

@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft-06/schema#",
-    "$id": "https://diana-hep.org/pyhf/schemas/1.0.0/measurement.json",
+    "$id": "https://scikit-hep.org/pyhf/schemas/1.0.0/measurement.json",
     "type": "object",
     "$ref": "defs.json#/definitions/measurement"
 }

src/pyhf/schemas/1.0.0/model.json

@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft-06/schema#",
-    "$id": "https://diana-hep.org/pyhf/schemas/1.0.0/model.json",
+    "$id": "https://scikit-hep.org/pyhf/schemas/1.0.0/model.json",
     "type": "object",
     "properties": {
         "channels": { "type": "array", "items": {"$ref": "defs.json#/definitions/channel"} },

src/pyhf/schemas/1.0.0/workspace.json

@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft-06/schema#",
-    "$id": "https://diana-hep.org/pyhf/schemas/1.0.0/workspace.json",
+    "$id": "https://scikit-hep.org/pyhf/schemas/1.0.0/workspace.json",
     "type": "object",
     "properties": {
         "channels": { "type": "array", "items": {"$ref": "defs.json#/definitions/channel"} },

src/pyhf/utils.py

@@ -9,7 +9,7 @@
 from . import get_backend
 
 SCHEMA_CACHE = {}
-SCHEMA_BASE = "https://diana-hep.org/pyhf/schemas/"
+SCHEMA_BASE = "https://scikit-hep.org/pyhf/schemas/"
 SCHEMA_VERSION = '1.0.0'
 
 
@@ -103,7 +103,7 @@ def qmu(mu, data, pdf, init_pars, par_bounds):
         par_bounds(Tensor): The bounds on the paramter values
 
     .. |pyhf.pdf.Model| replace:: ``pyhf.pdf.Model``
-    .. _pyhf.pdf.Model: https://diana-hep.org/pyhf/_generated/pyhf.pdf.Model.html
+    .. _pyhf.pdf.Model: https://scikit-hep.org/pyhf/_generated/pyhf.pdf.Model.html
 
     Returns:
         Float: The calculated test statistic, :math:`q_{\mu}`
@@ -216,7 +216,7 @@ def hypotest(
         qtilde (Bool): When ``True`` perform the calculation using the alternative test statistic, :math:`\tilde{q}`, as defined in Equation (62) of `arXiv:1007.1727`_
 
     .. |pyhf.pdf.Model| replace:: ``pyhf.pdf.Model``
-    .. _pyhf.pdf.Model: https://diana-hep.org/pyhf/_generated/pyhf.pdf.Model.html
+    .. _pyhf.pdf.Model: https://scikit-hep.org/pyhf/_generated/pyhf.pdf.Model.html
 
     Keyword Args:
         return_tail_probs (bool): Bool for returning :math:`\textrm{CL}_{s+b}` and :math:`\textrm{CL}_{b}`