Skip to content

Commit

Permalink
fix: Use codemetapy v2.2.2+ API (#2002)
Browse files Browse the repository at this point in the history 
* Update codemetapy to v2.2.2+ in 'current release' workflow to have access to
  the `--no-extras` CLI API in v2.0+ and reproducible runs.
   - c.f. proycon/codemetapy#24
   - c.f. proycon/codemetapy#26
   - Amends PR #1995
* Use the codemetapy v2.0 API which requires `--inputtype python` to be added.
* Update codemeta.json to follow codemetapy v2.0+ general spec.
  • Loading branch information
@matthewfeickert
matthewfeickert authored Sep 13, 2022
1 parent de6bf04 commit 49de9a4
Show file tree
Hide file tree
Showing 2 changed files with 86 additions and 100 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release_tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ jobs:
# 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.5"
codemetapy --no-extras pyhf > codemeta_generated.json
python -m pip install jq "codemetapy>=2.2.2"
codemetapy --inputtype python --no-extras pyhf > codemeta_generated.json
diff <(jq -S .softwareRequirements codemeta.json) <(jq -S .softwareRequirements codemeta_generated.json)
182 changes: 84 additions & 98 deletions codemeta.json
View file
Original file line number Diff line number Diff line change
@@ -1,159 +1,145 @@
{
"@context": [
"https://doi.org/10.5063/schema/codemeta-2.0",
"http://schema.org"
"https://raw.githubusercontent.com/codemeta/codemeta/2.0/codemeta.jsonld",
"https://w3id.org/software-iodata",
"https://raw.githubusercontent.com/schemaorg/schemaorg/main/data/releases/13.0/schemaorgcontext.jsonld",
"https://w3id.org/software-types"
],
"@id": "https://github.com/scikit-hep/pyhf",
"@type": "SoftwareSourceCode",
"identifier": "pyhf",
"name": "pyhf",
"version": "0.7.0rc4",
"description": "pure-Python HistFactory implementation with tensors and autodiff",
"license": "Apache, OSI Approved :: Apache Software License",
"applicationCategory": [
"Scientific/Engineering",
"Scientific/Engineering > Physics"
],
"audience": {
"@id": "/audience/science-research",
"@type": "Audience",
"audienceType": "Science/Research"
},
"author": [
{
"@id": "https://orcid.org/0000-0002-4048-7584",
"@id": "/person/lukas-heinrich",
"@type": "Person",
"givenName": "Lukas",
"email": "[email protected]",
"familyName": "Heinrich",
"email": "[email protected]"
"givenName": "Lukas",
"identifier": "https://orcid.org/0000-0002-4048-7584",
"position": 1
},
{
"@id": "https://orcid.org/0000-0003-4124-7862",
"@id": "/person/matthew-feickert",
"@type": "Person",
"givenName": "Matthew",
"email": "[email protected]",
"familyName": "Feickert",
"email": "[email protected]"
"givenName": "Matthew",
"identifier": "https://orcid.org/0000-0003-4124-7862",
"position": 2
},
{
"@id": "https://orcid.org/0000-0001-6616-3433",
"@id": "/person/giordon-stark",
"@type": "Person",
"givenName": "Giordon",
"email": "[email protected]",
"familyName": "Stark",
"email": "[email protected]"
"givenName": "Giordon",
"identifier": "https://orcid.org/0000-0001-6616-3433",
"position": 3
}
],
"codeRepository": "https://github.com/scikit-hep/pyhf",
"description": "pure-Python HistFactory implementation with tensors and autodiff",
"developmentStatus": "4 - Beta",
"identifier": "pyhf",
"issueTracker": "https://github.com/scikit-hep/pyhf/issues",
"keywords": "physics fitting numpy scipy tensorflow pytorch jax",
"license": "http://spdx.org/licenses/Apache-2.0",
"name": "pyhf",
"releaseNotes": "https://pyhf.readthedocs.io/en/stable/release-notes.html",
"runtimePlatform": [
"Python 3",
"Python 3 Only",
"Python 3.10",
"Python 3.7",
"Python 3.8",
"Python 3.9",
"Python Implementation CPython"
],
"softwareHelp": {
"@id": "https://pyhf.readthedocs.io/"
},
"softwareRequirements": [
{
"@id": "/dependency/click-ge-8.0.0",
"@type": "SoftwareApplication",
"identifier": "scipy",
"name": "scipy",
"provider": {
"@id": "https://pypi.org",
"@type": "Organization",
"name": "The Python Package Index",
"url": "https://pypi.org"
},
"identifier": "click",
"name": "click",
"runtimePlatform": "Python 3",
"version": ">=1.1.0"
"version": ">=8.0.0"
},
{
"@id": "/dependency/importlib-resources-ge-1.4.0",
"@type": "SoftwareApplication",
"identifier": "click",
"name": "click",
"provider": {
"@id": "https://pypi.org",
"@type": "Organization",
"name": "The Python Package Index",
"url": "https://pypi.org"
},
"identifier": "importlib-resources",
"name": "importlib-resources",
"runtimePlatform": "Python 3",
"version": ">=8.0.0"
"version": ">=1.4.0"
},
{
"@id": "/dependency/jsonpatch-ge-1.15",
"@type": "SoftwareApplication",
"identifier": "tqdm",
"name": "tqdm",
"provider": {
"@id": "https://pypi.org",
"@type": "Organization",
"name": "The Python Package Index",
"url": "https://pypi.org"
},
"identifier": "jsonpatch",
"name": "jsonpatch",
"runtimePlatform": "Python 3",
"version": ">=4.56.0"
"version": ">=1.15"
},
{
"@id": "/dependency/jsonschema-ge-4.15.0",
"@type": "SoftwareApplication",
"identifier": "jsonschema",
"name": "jsonschema",
"provider": {
"@id": "https://pypi.org",
"@type": "Organization",
"name": "The Python Package Index",
"url": "https://pypi.org"
},
"runtimePlatform": "Python 3",
"version": ">=4.15.0"
},
{
"@id": "/dependency/pyyaml-ge-5.1",
"@type": "SoftwareApplication",
"identifier": "jsonpatch",
"name": "jsonpatch",
"provider": {
"@id": "https://pypi.org",
"@type": "Organization",
"name": "The Python Package Index",
"url": "https://pypi.org"
},
"identifier": "pyyaml",
"name": "pyyaml",
"runtimePlatform": "Python 3",
"version": ">=1.15"
"version": ">=5.1"
},
{
"@id": "/dependency/scipy-ge-1.1.0",
"@type": "SoftwareApplication",
"identifier": "pyyaml",
"name": "pyyaml",
"provider": {
"@id": "https://pypi.org",
"@type": "Organization",
"name": "The Python Package Index",
"url": "https://pypi.org"
},
"identifier": "scipy",
"name": "scipy",
"runtimePlatform": "Python 3",
"version": ">=5.1"
"version": ">=1.1.0"
},
{
"@id": "/dependency/tqdm-ge-4.56.0",
"@type": "SoftwareApplication",
"identifier": "importlib-resources",
"name": "importlib-resources",
"provider": {
"@id": "https://pypi.org",
"@type": "Organization",
"name": "The Python Package Index",
"url": "https://pypi.org"
},
"identifier": "tqdm",
"name": "tqdm",
"runtimePlatform": "Python 3",
"version": ">=1.4.0"
"version": ">=4.56.0"
},
{
"@id": "/dependency/typing-extensions-ge-3.7.4.3",
"@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": [
{
"@type": "Audience",
"audienceType": "Science/Research"
}
],
"provider": {
"@id": "https://pypi.org",
"@type": "Organization",
"name": "The Python Package Index",
"url": "https://pypi.org"
"targetProduct": {
"@id": "/commandlineapplication/pyhf",
"@type": "CommandLineApplication",
"description": "The pyhf command line interface.",
"executableName": "pyhf",
"name": "pyhf",
"runtimePlatform": "Python 3"
},
"runtimePlatform": "Python 3",
"url": "https://github.com/scikit-hep/pyhf",
"keywords": "physics fitting numpy scipy tensorflow pytorch jax",
"developmentStatus": "4 - Beta",
"applicationCategory": "Scientific/Engineering, Scientific/Engineering :: Physics",
"programmingLanguage": "Python 3, Python 3 Only, Python 3.7, Python 3.8, Python 3.9, Python 3.10, Python Implementation CPython"
"version": "0.7.0rc4"
}

0 comments on commit 49de9a4

Please sign in to comment.