Merge pull request #28 from NII-DG/develop

Bump to 0.1.1
NII-DG · May 15, 2023 · 3fda3a2 · 3fda3a2
2 parents 5e58891 + cc0f9c4
commit 3fda3a2
Show file tree

Hide file tree

Showing 52 changed files with 317 additions and 3,369 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -10,6 +10,8 @@ FROM python:3.8.15-slim-buster
 LABEL org.opencontainers.image.authors="National Institute of Informatics, Japan"
 LABEL org.opencontainers.image.url="https://github.com/NII-DG/nii-dg"
 LABEL org.opencontainers.image.source="https://raw.githubusercontent.com/NII-DG/nii-dg/main/Dockerfile"
+LABEL org.opencontainers.image.version="0.1.1"
+LABEL org.opencontainers.image.licenses="Apache2.0"
 
 RUN apt update && \
     apt install -y --no-install-recommends \

diff --git a/README.md b/README.md
@@ -246,26 +246,26 @@ REST API の仕様として、[open-api_spec.yml](./open-api_spec.yml) を参照
 {
   "@id": "file_1.txt",
   "@type": "File",
-  "@context": "https://raw.githubusercontent.com/NII-DG/nii_dg/1.0.0/schema/context/base.jsonld",
+  "@context": "https://raw.githubusercontent.com/NII-DG/nii-dg/1.0.0/schema/context/base.jsonld",
   "name": "Sample File",
   "contentSize": "128GB",
 },
 ```
 
-ここで、`@context` property により、`https://raw.githubusercontent.com/NII-DG/nii_dg/1.0.0/schema/context/base.jsonld` にて、`File` entity の schema が定義されていることを示している。
+ここで、`@context` property により、`https://raw.githubusercontent.com/NII-DG/nii-dg/1.0.0/schema/context/base.jsonld` にて、`File` entity の schema が定義されていることを示している。
 更に、参照先の JSON-LD Context においては、下記のように定義されている。
 
 ```json
 "File": {
-  "@id": "https://raw.githubusercontent.com/NII-DG/nii_dg/1.0.0/nii_dg/schema/base.yml#File",
+  "@id": "https://raw.githubusercontent.com/NII-DG/nii-dg/1.0.0/nii_dg/schema/base.yml#File",
   "@context": {
-    "@id": "https://raw.githubusercontent.com/NII-DG/nii_dg/1.0.0/nii_dg/schema/base.yml#File:@id",
-    "name": "https://raw.githubusercontent.com/NII-DG/nii_dg/1.0.0/nii_dg/schema/base.yml#File:name",
-    "contentSize": "https://raw.githubusercontent.com/NII-DG/nii_dg/1.0.0/nii_dg/schema/base.yml#File:contentSize",
-    "encodingFormat": "https://raw.githubusercontent.com/NII-DG/nii_dg/1.0.0/nii_dg/schema/base.yml#File:encodingFormat",
-    "sha256": "https://raw.githubusercontent.com/NII-DG/nii_dg/1.0.0/nii_dg/schema/base.yml#File:sha256",
-    "url": "https://raw.githubusercontent.com/NII-DG/nii_dg/1.0.0/nii_dg/schema/base.yml#File:url",
-    "sdDatePublished": "https://raw.githubusercontent.com/NII-DG/nii_dg/1.0.0/nii_dg/schema/base.yml#File:sdDatePublished"
+    "@id": "https://raw.githubusercontent.com/NII-DG/nii-dg/1.0.0/nii_dg/schema/base.yml#File:@id",
+    "name": "https://raw.githubusercontent.com/NII-DG/nii-dg/1.0.0/nii_dg/schema/base.yml#File:name",
+    "contentSize": "https://raw.githubusercontent.com/NII-DG/nii-dg/1.0.0/nii_dg/schema/base.yml#File:contentSize",
+    "encodingFormat": "https://raw.githubusercontent.com/NII-DG/nii-dg/1.0.0/nii_dg/schema/base.yml#File:encodingFormat",
+    "sha256": "https://raw.githubusercontent.com/NII-DG/nii-dg/1.0.0/nii_dg/schema/base.yml#File:sha256",
+    "url": "https://raw.githubusercontent.com/NII-DG/nii-dg/1.0.0/nii_dg/schema/base.yml#File:url",
+    "sdDatePublished": "https://raw.githubusercontent.com/NII-DG/nii-dg/1.0.0/nii_dg/schema/base.yml#File:sdDatePublished"
   }
 },
 ```

diff --git a/compose.api.yml b/compose.api.yml
@@ -1,7 +1,7 @@
 version: "3.5"
 services:
   app:
-    image: ghcr.io/NII-DG/nii-dg:0.1.0
+    image: ghcr.io/NII-DG/nii-dg:0.1.1
     container_name: nii-dg
     volumes:
       - ${PWD}:/app

diff --git a/compose.yml b/compose.yml
@@ -1,7 +1,7 @@
 version: "3.5"
 services:
   app:
-    image: ghcr.io/NII-DG/nii-dg:0.1.0
+    image: ghcr.io/NII-DG/nii-dg:0.1.1
     container_name: nii-dg
     volumes:
       - ${PWD}:/app

diff --git a/docs/conf.py b/docs/conf.py
@@ -27,9 +27,9 @@
 author = 'NII'
 
 # The short X.Y version
-version = '0.1.0'
+version = '0.1.1'
 # The full version, including alpha/beta/rc tags
-release = '0.1.0'
+release = '0.1.1'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/nii_dg/module_info.py b/nii_dg/module_info.py
@@ -5,10 +5,10 @@
 Configuration parameters for the nii_dg package.
 """
 
-GH_REPO: str = "NII-DG/nii_dg"
+GH_REPO: str = "NII-DG/nii-dg"
 """str: The GitHub repository name for the nii_dg package."""
 
-GH_REF: str = "0.1.0"
+GH_REF: str = "0.1.1"
 """str: The GitHub reference (tag or branch) for the nii_dg package."""
 
 

diff --git a/rewrite_version.sh b/rewrite_version.sh
@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+
+# rewrite version in:
+#
+# - nii_dg/module_info.py
+#    - `GH_REF: str = "0.1.0"`
+# - docs/conf.py
+#    - `version = '0.1.0'`
+#    - `release = '0.1.0'`
+# - Dockerfile
+#    - `LABEL org.opencontainers.image.version="0.1.0"`
+# - compose.yml
+#    - `image: ghcr.io/NII-DG/nii-dg:0.1.0`
+# - compose.api.yml
+#    - `image: ghcr.io/NII-DG/nii-dg:0.1.0`
+
+set -euxo pipefail
+
+if [[ $# -lt 1 ]]; then
+  echo "Usage: $0 <new_version>"
+  exit 1
+fi
+
+PREV_VERSION=$(python3 ./nii_dg/module_info.py)
+NEW_VERSION=$1
+
+read -p "Rewrite version from ${PREV_VERSION} to ${NEW_VERSION}? (y/n) :" YN
+
+if [[ "${YN}" != "y" ]]; then
+  echo "Abort."
+  exit 1
+fi
+
+echo "Rewriting version from ${PREV_VERSION} to ${NEW_VERSION} ..."
+
+echo "Rewriting nii_dg/module_info.py ..."
+sed -i "s/GH_REF: str = \"${PREV_VERSION}\"/GH_REF: str = \"${NEW_VERSION}\"/g" ./nii_dg/module_info.py
+
+echo "Rewriting docs/conf.py ..."
+sed -i "s/version = '${PREV_VERSION}'/version = '${NEW_VERSION}'/g" ./docs/conf.py
+sed -i "s/release = '${PREV_VERSION}'/release = '${NEW_VERSION}'/g" ./docs/conf.py
+
+echo "Rewriting Dockerfile ..."
+sed -i "s/LABEL org.opencontainers.image.version=\"${PREV_VERSION}\"/LABEL org.opencontainers.image.version=\"${NEW_VERSION}\"/g" ./Dockerfile
+
+echo "Rewriting compose.yml ..."
+sed -i "s/image: ghcr.io\/NII-DG\/nii-dg:${PREV_VERSION}/image: ghcr.io\/NII-DG\/nii-dg:${NEW_VERSION}/g" ./compose.yml
+
+echo "Rewriting compose.api.yml ..."
+sed -i "s/image: ghcr.io\/NII-DG\/nii-dg:${PREV_VERSION}/image: ghcr.io\/NII-DG\/nii-dg:${NEW_VERSION}/g" ./compose.api.yml
+
+echo "Done."
+
+exit 0
diff --git a/schema/context/amed.jsonld b/schema/context/amed.jsonld
@@ -1,63 +1,63 @@
 {
-  "@id": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/schema/context/amed.jsonld",
+  "@id": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/schema/context/amed.jsonld",
   "@version": 1.1,
   "@context": {
     "DMPMetadata": {
-      "@id": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata",
+      "@id": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata",
       "@context": {
-        "@id": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata:@id",
-        "about": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata:about",
-        "name": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata:name",
-        "funder": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata:funder",
-        "funding": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata:funding",
-        "chiefResearcher": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata:chiefResearcher",
-        "creator": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata:creator",
-        "hostingInstitution": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata:hostingInstitution",
-        "dataManager": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata:dataManager",
-        "repository": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata:repository",
-        "distribution": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata:distribution",
-        "hasPart": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata:hasPart"
+        "@id": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata:@id",
+        "about": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata:about",
+        "name": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata:name",
+        "funder": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata:funder",
+        "funding": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata:funding",
+        "chiefResearcher": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata:chiefResearcher",
+        "creator": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata:creator",
+        "hostingInstitution": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata:hostingInstitution",
+        "dataManager": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata:dataManager",
+        "repository": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata:repository",
+        "distribution": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata:distribution",
+        "hasPart": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMPMetadata:hasPart"
       }
     },
     "DMP": {
-      "@id": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMP",
+      "@id": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMP",
       "@context": {
-        "@id": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMP:@id",
-        "dataNumber": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMP:dataNumber",
-        "name": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMP:name",
-        "description": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMP:description",
-        "keyword": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMP:keyword",
-        "accessRights": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMP:accessRights",
-        "availabilityStarts": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMP:availabilityStarts",
-        "reasonForConcealment": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMP:reasonForConcealment",
-        "repository": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMP:repository",
-        "distribution": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMP:distribution",
-        "contentSize": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMP:contentSize",
-        "gotInformedConsent": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMP:gotInformedConsent",
-        "informedConsentFormat": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMP:informedConsentFormat",
-        "identifier": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#DMP:identifier"
+        "@id": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMP:@id",
+        "dataNumber": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMP:dataNumber",
+        "name": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMP:name",
+        "description": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMP:description",
+        "keyword": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMP:keyword",
+        "accessRights": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMP:accessRights",
+        "availabilityStarts": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMP:availabilityStarts",
+        "reasonForConcealment": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMP:reasonForConcealment",
+        "repository": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMP:repository",
+        "distribution": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMP:distribution",
+        "contentSize": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMP:contentSize",
+        "gotInformedConsent": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMP:gotInformedConsent",
+        "informedConsentFormat": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMP:informedConsentFormat",
+        "identifier": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#DMP:identifier"
       }
     },
     "File": {
-      "@id": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#File",
+      "@id": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#File",
       "@context": {
-        "@id": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#File:@id",
-        "name": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#File:name",
-        "dmpDataNumber": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#File:dmpDataNumber",
-        "contentSize": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#File:contentSize",
-        "encodingFormat": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#File:encodingFormat",
-        "sha256": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#File:sha256",
-        "url": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#File:url",
-        "sdDatePublished": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#File:sdDatePublished"
+        "@id": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#File:@id",
+        "name": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#File:name",
+        "dmpDataNumber": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#File:dmpDataNumber",
+        "contentSize": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#File:contentSize",
+        "encodingFormat": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#File:encodingFormat",
+        "sha256": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#File:sha256",
+        "url": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#File:url",
+        "sdDatePublished": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#File:sdDatePublished"
       }
     },
     "ClinicalResearchRegistration": {
-      "@id": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#ClinicalResearchRegistration",
+      "@id": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#ClinicalResearchRegistration",
       "@context": {
-        "@id": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#ClinicalResearchRegistration:@id",
-        "name": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#ClinicalResearchRegistration:name",
-        "value": "https://raw.githubusercontent.com/NII-DG/nii_dg/0.1.0/nii_dg/schema/amed.yml#ClinicalResearchRegistration:value"
+        "@id": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#ClinicalResearchRegistration:@id",
+        "name": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#ClinicalResearchRegistration:name",
+        "value": "https://raw.githubusercontent.com/NII-DG/nii-dg/0.1.0/nii_dg/schema/amed.yml#ClinicalResearchRegistration:value"
       }
     }
   }
-}
+}