From 40a3123fa0419d7018f29cfe8266762053ce1bb7 Mon Sep 17 00:00:00 2001 From: Lingxin Meng Date: Thu, 22 May 2025 15:09:01 +0100 Subject: [PATCH 1/4] add zenodo stuff --- .gitattributes | 5 ++ .gitlab-ci.yml | 20 +++++++ .zenodo.json | 142 +++++++++++++++++++++++++++++++++++++++++++++++++ tbump.toml | 5 ++ 4 files changed, 172 insertions(+) create mode 100644 .gitattributes create mode 100644 .zenodo.json diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..ca198ff0f --- /dev/null +++ b/.gitattributes @@ -0,0 +1,5 @@ +.zenodo.json export-ignore +.gitlab-ci.yml export-ignore +.linkcheckerrc export-ignore +.pre-commit-config.yaml export-ignore +tbump.toml export-ignore diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 22833c920..05833fe04 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,6 +64,15 @@ make-docs: - site expire_in: 1 hour +# the below should match the zenodo deploy +check_zenodo: + stage: build + script: + - python3 -m pip install + git+https://gitlab.com/sbeniamine/gitlab2zenodo@1c794155e8dafd3a585f059e32bb4c0826cdf3a3 + - git archive --format zip --output ${CI_COMMIT_REF_SLUG}.zip + ${CI_COMMIT_SHA} + pages: stage: deploy dependencies: [make-docs] @@ -75,3 +84,14 @@ pages: expire_in: 1 hour rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" + +zenodo: + stage: deploy + rules: + - if: $CI_COMMIT_TAG =~ /^v?[0-9]+\.[0-9]+/ + script: + - python3 -m pip install + git+https://gitlab.com/sbeniamine/gitlab2zenodo@1c794155e8dafd3a585f059e32bb4c0826cdf3a3 + - git archive --format zip --output ${CI_COMMIT_TAG#v}.zip ${CI_COMMIT_TAG} + - g2z-send -i ${ZENODO_RECORD} -t ${ZENODO_TOKEN} -m .zenodo.json + ${CI_COMMIT_TAG#v}.zip diff --git a/.zenodo.json b/.zenodo.json new file mode 100644 index 000000000..9ed5b7013 --- /dev/null +++ b/.zenodo.json @@ -0,0 +1,142 @@ +{ + "description": " local database viewer for ITkPixV1.1 and ITkPixV2 module QC tests for the ATLAS ITk project", + "license": "MIT", + "title": "atlas-itk-pixel-modules/ldb: v2.3.6-rc12", + "version": "v2.3.6-rc12", + "upload_type": "software", + "creators": [ + { + "name": "Hideyuki Oide", + "affiliation": "KEK, Japan", + "orcid": "0000-0002-2173-3233" + }, + { + "name": "Eunchong Kim", + "affiliation": "Institute of Science Tokyo", + "orcid": "0000-0002-4203-014X" + }, + { + "name": "Arisa Kubota", + "affiliation": "Institute of Science Tokyo", + "orcid": "0000-0003-3993-4903" + }, + { + "name": "Hiroki Okuyama", + "affiliation": "Institute of Science Tokyo", + "orcid": "" + }, + { + "name": "Satoshi Kinoshita", + "affiliation": "Institute of Science Tokyo", + "orcid": "" + }, + { + "name": "Daiki Sameshima ", + "affiliation": "Tokyo Metropolitan University", + "orcid": "" + }, + { + "name": "Atsuhiro Suzuki", + "affiliation": "Institute of Science Tokyo", + "orcid": "" + }, + { + "name": "Shusaku Arakuta", + "affiliation": "University of Osaka", + "orcid": "" + }, + { + "name": "Minoru Hirose", + "affiliation": "University of Osaka", + "orcid": "0000-0003-4988-9149" + }, + { + "name": "Shohei Yamagaya", + "affiliation": "University of Osaka", + "orcid": "" + }, + { + "name": "Osamu Jinnouchi", + "affiliation": "Institute of Science Tokyo", + "orcid": "0000-0001-5073-0974" + }, + { + "name": "Hajime Nanjo", + "affiliation": "University of Osaka", + "orcid": "0000-0003-0703-103X" + }, + { + "name": "Koji Nakamura", + "affiliation": "KEK, Japan", + "orcid": "0000-0002-1560-0434" + }, + { + "name": "Yuma Uematsu", + "affiliation": "KEK, Japan", + "orcid": "0000-0002-0296-4028" + }, + { + "name": "Shiwen An", + "affiliation": "KEK, Japan", + "orcid": "" + }, + { + "name": "Giordon Stark", + "affiliation": "UC Santa Cruz", + "orcid": "0000-0001-6616-3433" + }, + { + "name": "Matthias Saimpert", + "affiliation": "IRFU, CEA, Université Paris-Saclay", + "orcid": "0000-0002-3765-1320" + }, + { + "name": "Lingxin Meng", + "affiliation": "Lancaster University", + "orcid": "0000-0002-2901-6589" + }, + { + "name": "Lubos Vozdecky", + "affiliation": "University of Oklahoma", + "orcid": "0000-0003-2541-4827" + }, + { + "name": "Timon Heim", + "affiliation": "Lawrence Berkeley National Laboratory, Berkeley", + "orcid": "0000-0002-7669-5318" + }, + { + "name": "Elisabetta Pianori", + "affiliation": "Lawrence Berkeley National Laboratory, Berkeley", + "orcid": "0000-0001-9233-5892" + }, + { + "name": "Emily Thompson", + "affiliation": "Lawrence Berkeley National Laboratory, Berkeley", + "orcid": "0000-0001-7050-8203" + }, + { + "name": "Marija Marjanovic", + "affiliation": "University of Oklahoma", + "orcid": "0000-0002-4468-0154" + } + ], + "access_right": "open", + "keywords": [ + "physics", + "electrical", + "silicon", + "pixel", + "modules", + "atlas", + "hep", + "itk" + ], + "related_identifiers": [ + { + "scheme": "url", + "identifier": "https://gitlab.cern.ch/YARR/localdb-tools/-/tree/v2.3.6-rc12", + "relation": "isSupplementTo" + } + ] +} diff --git a/tbump.toml b/tbump.toml index 524de8c60..a94d9fb34 100644 --- a/tbump.toml +++ b/tbump.toml @@ -48,3 +48,8 @@ name = "candidate" # the default value to use, if there is no match default = "" +[[file]] +src = ".zenodo.json" + +[[file]] +src = "CITATION.cff" -- GitLab From d94c72d637a1a71f231c59ff74632eb7196237a0 Mon Sep 17 00:00:00 2001 From: Giordon Stark Date: Mon, 2 Jun 2025 17:04:47 -0700 Subject: [PATCH 2/4] fix zenodo json --- .zenodo.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index 9ed5b7013..e7b16c913 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -1,8 +1,8 @@ { "description": " local database viewer for ITkPixV1.1 and ITkPixV2 module QC tests for the ATLAS ITk project", "license": "MIT", - "title": "atlas-itk-pixel-modules/ldb: v2.3.6-rc12", - "version": "v2.3.6-rc12", + "title": "atlas-itk-pixel-modules/ldb: v2.4.0", + "version": "v2.4.0", "upload_type": "software", "creators": [ { @@ -135,7 +135,7 @@ "related_identifiers": [ { "scheme": "url", - "identifier": "https://gitlab.cern.ch/YARR/localdb-tools/-/tree/v2.3.6-rc12", + "identifier": "https://gitlab.cern.ch/YARR/localdb-tools/-/tree/v2.4.0", "relation": "isSupplementTo" } ] -- GitLab From b0bef2dc279ca34bfa9b8df9daec5d7093c445d5 Mon Sep 17 00:00:00 2001 From: Giordon Stark Date: Mon, 2 Jun 2025 17:05:13 -0700 Subject: [PATCH 3/4] update yaml --- .gitlab-ci.yml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 05833fe04..eb108de8e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,13 +85,25 @@ pages: rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" -zenodo: +.zenodo_base: stage: deploy - rules: - - if: $CI_COMMIT_TAG =~ /^v?[0-9]+\.[0-9]+/ - script: + before_script: - python3 -m pip install git+https://gitlab.com/sbeniamine/gitlab2zenodo@1c794155e8dafd3a585f059e32bb4c0826cdf3a3 - git archive --format zip --output ${CI_COMMIT_TAG#v}.zip ${CI_COMMIT_TAG} + +zenodo_release: + extends: .zenodo_base + rules: + - if: $CI_COMMIT_TAG =~ /^v?[0-9]+\.[0-9]+\.[0-9]+$/ + script: - g2z-send -i ${ZENODO_RECORD} -t ${ZENODO_TOKEN} -m .zenodo.json ${CI_COMMIT_TAG#v}.zip + +zenodo_rc: + extends: .zenodo_base + rules: + - if: $CI_COMMIT_TAG =~ /^v?[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]*$/ + script: + - g2z-send -s -p -i ${ZENODO_RECORD_SANDBOX} -t ${ZENODO_TOKEN_SANDBOX} -m + .zenodo.json ${CI_COMMIT_TAG#v}.zip -- GitLab From 4c972c51d415214a68fb680564878deff8fed1f9 Mon Sep 17 00:00:00 2001 From: Lingxin Meng Date: Mon, 16 Jun 2025 20:40:33 +0100 Subject: [PATCH 4/4] add CITATION.cff for zenodo --- CITATION.cff | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 CITATION.cff diff --git a/CITATION.cff b/CITATION.cff new file mode 100644 index 000000000..1bb313e7b --- /dev/null +++ b/CITATION.cff @@ -0,0 +1,86 @@ +abstract: local database viewer for ITkPixV1.1 and ITkPixV2 module QC tests for the + ATLAS ITk project +authors: +- affiliation: KEK, Japan + family-names: Hideyuki Oide + orcid: 0000-0002-2173-3233 +- affiliation: Institute of Science Tokyo + family-names: Eunchong Kim + orcid: 0000-0002-4203-014X +- affiliation: Institute of Science Tokyo + family-names: Arisa Kubota + orcid: 0000-0003-3993-4903 +- affiliation: Institute of Science Tokyo + family-names: Hiroki Okuyama +- affiliation: Institute of Science Tokyo + family-names: Satoshi Kinoshita +- affiliation: Tokyo Metropolitan University + family-names: Daiki Sameshima +- affiliation: Institute of Science Tokyo + family-names: Atsuhiro Suzuki +- affiliation: University of Osaka + family-names: Shusaku Arakuta +- affiliation: University of Osaka + family-names: Minoru Hirose + orcid: 0000-0003-4988-9149 +- affiliation: University of Osaka + family-names: Shohei Yamagaya +- affiliation: Institute of Science Tokyo + family-names: Osamu Jinnouchi + orcid: 0000-0001-5073-0974 +- affiliation: University of Osaka + family-names: Hajime Nanjo + orcid: 0000-0003-0703-103X +- affiliation: KEK, Japan + family-names: Koji Nakamura + orcid: 0000-0002-1560-0434 +- affiliation: KEK, Japan + family-names: Yuma Uematsu + orcid: 0000-0002-0296-4028 +- affiliation: KEK, Japan + family-names: Shiwen An +- affiliation: UC Santa Cruz + family-names: Giordon Stark + orcid: 0000-0001-6616-3433 +- affiliation: "IRFU, CEA, Universit\xE9 Paris-Saclay" + family-names: Matthias Saimpert + orcid: 0000-0002-3765-1320 +- affiliation: Lancaster University + family-names: Lingxin Meng + orcid: 0000-0002-2901-6589 +- affiliation: University of Oklahoma + family-names: Lubos Vozdecky + orcid: 0000-0003-2541-4827 +- affiliation: Lawrence Berkeley National Laboratory, Berkeley + family-names: Timon Heim + orcid: 0000-0002-7669-5318 +- affiliation: Lawrence Berkeley National Laboratory, Berkeley + family-names: Elisabetta Pianori + orcid: 0000-0001-9233-5892 +- affiliation: Lawrence Berkeley National Laboratory, Berkeley + family-names: Emily Thompson + orcid: 0000-0001-7050-8203 +- affiliation: University of Oklahoma + family-names: Marija Marjanovic + orcid: 0000-0002-4468-0154 +cff-version: 1.2.0 +date-released: '2025-06-03' +doi: 10.5281/zenodo.15580239 +identifiers: +- type: swh + value: swh:1:dir:1027573c904ef4f8aae9e7e65a6a0d687bb70fef;origin=https://doi.org/10.5281/zenodo.15580238;visit=swh:1:snp:aa2076164a18513987ccdffc463a0887f4174df9;anchor=swh:1:rel:351fdddc4759f393d22fa088adb072d1d128fb30;path=/ +keywords: +- physics +- electrical +- silicon +- pixel +- modules +- atlas +- hep +- itk +license: +- mit +message: If you use this software, please cite it using the metadata from this file. +title: 'atlas-itk-pixel-modules/ldb: v2.4.0' +type: software +version: v2.4.0 -- GitLab