diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index 1b826fedfdaa47fe087d255dff50723d1dc9e25d..1e9708e6845d0bf7f0ce855a5e052a8b97aa5d93 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -109,7 +109,7 @@ services: restart: "no" container_name: dbrepo-metadata-service hostname: metadata-service - image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.4.7 + image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.5 volumes: - "${SHARED_VOLUME:-/tmp}:/tmp" environment: @@ -172,7 +172,7 @@ services: restart: "no" container_name: dbrepo-analyse-service hostname: analyse-service - image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.4.7 + image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.5 environment: AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client} AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG} @@ -225,7 +225,7 @@ services: restart: "no" container_name: dbrepo-search-db hostname: search-db - image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.4.7 + image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.5 healthcheck: test: curl -sSL localhost:9200/_plugins/_security/health | jq .status | grep UP interval: 10s @@ -249,7 +249,7 @@ services: restart: "no" container_name: dbrepo-search-service hostname: search-service - image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.4.7 + image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.5 environment: AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client} AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT_SECRET:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG} @@ -271,7 +271,7 @@ services: restart: "no" container_name: dbrepo-data-db-sidecar hostname: data-db-sidecar - image: registry.datalab.tuwien.ac.at/dbrepo/data-db-sidecar:1.4.7 + image: registry.datalab.tuwien.ac.at/dbrepo/data-db-sidecar:1.5 environment: S3_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-seaweedfsadmin}" S3_BUCKET: "${S3_BUCKET:-dbrepo}" @@ -292,7 +292,7 @@ services: restart: "no" container_name: dbrepo-ui hostname: ui - image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.7 + image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.5 environment: NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}" NUXT_PUBLIC_API_SERVER: "${BASE_URL:-http://localhost}" @@ -360,7 +360,7 @@ services: init: true container_name: dbrepo-search-service-init hostname: search-service-init - image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.4.7 + image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.5 environment: METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080} OPENSEARCH_HOST: ${OPENSEARCH_HOST:-search-db} @@ -414,7 +414,7 @@ services: restart: "no" container_name: dbrepo-dashboard-service hostname: dashboard-service - image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.4.7 + image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.5 environment: LDAP_ADMIN_USERNAME: "${IDENTITY_SERVICE_ADMIN_USERNAME:-admin}" LDAP_ADMIN_PASSWORD: "${IDENTITY_SERVICE_ADMIN_PASSWORD:-admin}" @@ -435,7 +435,7 @@ services: init: true container_name: dbrepo-storage-service-init hostname: storage-service-init - image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.4.7 + image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.5 environment: WEED_CLUSTER_SW_MASTER: "${STORAGE_SERVICE_MASTER_ENDPOINT:-storage-service:9333}" S3_BUCKET: "${S3_BUCKET:-dbrepo}" @@ -475,7 +475,7 @@ services: restart: "no" container_name: dbrepo-data-service hostname: data-service - image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.4.7 + image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.5 volumes: - "${SHARED_VOLUME:-/tmp}:/tmp" environment: diff --git a/.docs/changelog.md b/.docs/changelog.md index e39afc485135155b4b91def5b9f9878d5497cde5..ddf83cb7a4c6cfd3cd899ef9d0590c12fe71d1a9 100644 --- a/.docs/changelog.md +++ b/.docs/changelog.md @@ -2,9 +2,9 @@ author: Martin Weise --- -## v1.4.7 (2024-11-06) +## v1.5.0 (2024-11-06) -[:simple-gitlab: GitLab Release](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/tags/v1.4.7) +[:simple-gitlab: GitLab Release](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/tags/v1.5.0) !!! warning "Contains Breaking Changes" diff --git a/.docs/index.md b/.docs/index.md index f1d1ced056fdd7003487d0f6a919b4690a26abdc..351edbf44133d096dc93b48676eb27fd2149fe3d 100644 --- a/.docs/index.md +++ b/.docs/index.md @@ -2,6 +2,8 @@ author: Martin Weise --- +# DBRepo + [](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 } [](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 } [](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 } @@ -10,7 +12,7 @@ author: Martin Weise [](https://artifacthub.io/packages/helm/dbrepo/dbrepo){ tabindex=-1 } [](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 } -Documentation for version: [v1.4.7](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/releases). +Documentation for version: [v1.5.0](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/releases). DBRepo is a repository for data in databases that are used from the beginning until the end of a research project supporting data evolution, -citation and -versioning. It implements the query store of the diff --git a/.docs/installation.md b/.docs/installation.md index 4a0c6c6f433a1b0e7a766dcffae490e1a49e8792..60f8a0dd5f041599c619dea64aad79f8e6059fee 100644 --- a/.docs/installation.md +++ b/.docs/installation.md @@ -11,7 +11,7 @@ author: Martin Weise If you have [Docker](https://docs.docker.com/engine/install/) already installed on your system, you can install DBRepo with: ```shell -curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.7/install.sh | bash +curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.5/install.sh | bash ``` !!! bug "Default installation security disclaimer" @@ -38,7 +38,7 @@ SSL/TLS certificate is recommended. Follow the [secure install](#secure-install) Execute the install script to download only the environment and save it to `dist`. ```shell -curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.7/install.sh | DOWNLOAD_ONLY=1 bash +curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.5/install.sh | DOWNLOAD_ONLY=1 bash ``` ### Static Configuration @@ -80,7 +80,7 @@ the variable `IDENTITY_SERVICE_ADMIN_PASSWORD` in `.env`. Update the client secret of the `dbrepo-client`: ```bash -curl -sSL "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.7/.scripts/reg-client-secret.sh" | bash +curl -sSL "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.5/.scripts/reg-client-secret.sh" | bash ``` Also, update the JWT key according to the diff --git a/.docs/kubernetes.md b/.docs/kubernetes.md index 72bb4bcc125e6b8d2a78e301211e3ee739a82aed..0fd067fac789480f899fcf6d865a338c5504cfc8 100644 --- a/.docs/kubernetes.md +++ b/.docs/kubernetes.md @@ -5,7 +5,7 @@ author: Martin Weise ## TL;DR To install DBRepo in your existing cluster, download the -sample [`values.yaml`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/release-1.4.7/helm/dbrepo/values.yaml) +sample [`values.yaml`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/release-1.5/helm/dbrepo/values.yaml) for your deployment and update the variables, especially `hostname`. ```shell @@ -13,7 +13,7 @@ helm upgrade --install dbrepo \ -n dbrepo \ "oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo" \ --values ./values.yaml \ - --version "1.4.7" \ + --version "1.5.0" \ --create-namespace \ --cleanup-on-fail ``` diff --git a/.docs/redirect.html b/.docs/redirect.html index 3f3b8027ad9b8493c62219288b8142c4e73aaea8..69ede955cdfbee7f47d4abb431aec9b3b315b348 100644 --- a/.docs/redirect.html +++ b/.docs/redirect.html @@ -5,16 +5,16 @@ <head> <meta charset="UTF-8"> <title>Redirect Notice</title> - <meta http-equiv="Refresh" content="0; url='/infrastructures/dbrepo/1.4.7/'" /> + <meta http-equiv="Refresh" content="0; url='/infrastructures/dbrepo/1.5/'" /> </head> <body> <h1>Redirect Notice</h1> <p> - This page should automatically open the documentation for version <code>1.4.7</code>. In case this page does not load the site is + This page should automatically open the documentation for version <code>1.5</code>. In case this page does not load the site is available at: </p> <p> - <a href="/infrastructures/dbrepo/1.4.7/">/infrastructures/dbrepo/1.4.7/</a> + <a href="/infrastructures/dbrepo/1.5/">/infrastructures/dbrepo/1.5/</a> </p> </body> </html> \ No newline at end of file diff --git a/.docs/stylesheets/.sass-cache/10990fa183107f4149f38216a4d00fe324a8131e/extra.scssc b/.docs/stylesheets/.sass-cache/10990fa183107f4149f38216a4d00fe324a8131e/extra.scssc index c66d9e0bfba4de127388de9e8ad6f4212c1f5d36..2f3098a926efbb1d447f3f621898ced984e8f1a2 100644 Binary files a/.docs/stylesheets/.sass-cache/10990fa183107f4149f38216a4d00fe324a8131e/extra.scssc and b/.docs/stylesheets/.sass-cache/10990fa183107f4149f38216a4d00fe324a8131e/extra.scssc differ diff --git a/.docs/stylesheets/extra.css b/.docs/stylesheets/extra.css index d46da35109e113a53b127c02144f072752093c20..20a4626dbb55f3223708b150f3e6fd162c4a5410 100644 --- a/.docs/stylesheets/extra.css +++ b/.docs/stylesheets/extra.css @@ -1,5 +1,7 @@ :root, [data-md-color-accent=indigo] { + --md-hue: 230; + --md-default-bg-color: hsla(230, 15%, 21%, 1); --md-primary-fg-color: #006699; --md-accent-fg-color: #005c8a; /* darken 10% */ @@ -28,5 +30,3 @@ img.img-border { .md-banner { background-color: var(--md-primary-fg-color--dark); } - -/*# sourceMappingURL=extra.css.map */ diff --git a/.docs/stylesheets/extra.scss b/.docs/stylesheets/extra.scss index 1262644f003e901721a9b2a9c59d08ed88d4c59a..27a239a81219b628124ca15b24ecda0d9e96cd36 100644 --- a/.docs/stylesheets/extra.scss +++ b/.docs/stylesheets/extra.scss @@ -1,5 +1,7 @@ :root, [data-md-color-accent=indigo] { + --md-hue: 230; + --md-default-bg-color: hsla(230, 15%, 21%, 1); --md-primary-fg-color: #006699; --md-accent-fg-color: #005c8a; /* darken 10% */ --md-primary-fg-color--dark: #00537c; /* darken 10% */ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d6c97103ae51b8e08ef231969cf650ae682afd8a..0a9c58518d6a1610fa0e0e7bb88038e5b9dca4f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,8 +3,9 @@ variables: DOCKER_HOST: "unix:///var/run/dind/docker.sock" TESTCONTAINERS_RYUK_DISABLED: "false" PYTHON_VERSION: "3.11" - APP_VERSION: "1.4.7" - CHART_VERSION: "1.4.7" + DOC_VERSION: "1.5" + APP_VERSION: "1.5.0" + CHART_VERSION: "1.5.0" CACHE_FALLBACK_KEY: ${CI_DEFAULT_BRANCH} # This will supress any download for dependencies and plugins or upload messages which would clutter the console log. # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work. @@ -416,15 +417,15 @@ release-docs: - "apk add --update alpine-sdk bash sed wget openssh jq curl" - "pip install pipenv" - "pip install -r ./requirements.txt" - - "mkdir -p ./final/${APP_VERSION}/rest" + - "mkdir -p ./final/${DOC_VERSION}/rest" script: - "make gen-lib-doc gen-docs-doc package-config" - - "cp -r ./lib/python/docs/build/html ./final/${APP_VERSION}/python" # sphinx - - "cp .docs/.swagger/api.yaml ./final/${APP_VERSION}/rest/api.yaml" # swagger - - "cp .docs/.swagger/swagger-ui.html ./final/${APP_VERSION}/rest/index.html" # swagger - - "cp .docs/.swagger/custom.css ./final/${APP_VERSION}/rest/custom.css" # swagger - - "cp -r ./site/* ./final/${APP_VERSION}" # mkdocs - - "cp .docker/dist.tar.gz ./final/${APP_VERSION}/dist.tar.gz" # dist + - "cp -r ./lib/python/docs/build/html ./final/${DOC_VERSION}/python" # sphinx + - "cp .docs/.swagger/api.yaml ./final/${DOC_VERSION}/rest/api.yaml" # swagger + - "cp .docs/.swagger/swagger-ui.html ./final/${DOC_VERSION}/rest/index.html" # swagger + - "cp .docs/.swagger/custom.css ./final/${DOC_VERSION}/rest/custom.css" # swagger + - "cp -r ./site/* ./final/${DOC_VERSION}" # mkdocs + - "cp .docker/dist.tar.gz ./final/${DOC_VERSION}/dist.tar.gz" # dist - "bash ./.gitlab/gen-badge.sh" - eval $(ssh-agent -s) - "mkdir -p /root/.ssh" @@ -435,7 +436,7 @@ release-docs: - "scp -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa final.tar.gz $CI_DOC_USER@$CI_DOC_IP:final.tar.gz" - "scp -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa versions.json $CI_DOC_USER@$CI_DOC_IP:/system/user/ifs/infrastructures/public_html/dbrepo/versions.json" - "scp -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa .docs/redirect.html $CI_DOC_USER@$CI_DOC_IP:/system/user/ifs/infrastructures/public_html/dbrepo/index.html" - - 'ssh -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa $CI_DOC_USER@$CI_DOC_IP "rm -rf /system/user/ifs/infrastructures/public_html/dbrepo/${APP_VERSION}; tar xzf ./final.tar.gz; rm -f ./final.tar.gz; cp -r ./final/* /system/user/ifs/infrastructures/public_html/dbrepo/${APP_VERSION}; rm -rf ./final"' + - 'ssh -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa $CI_DOC_USER@$CI_DOC_IP "rm -rf /system/user/ifs/infrastructures/public_html/dbrepo/${DOC_VERSION}; tar xzf ./final.tar.gz; rm -f ./final.tar.gz; cp -r ./final/* /system/user/ifs/infrastructures/public_html/dbrepo/${DOC_VERSION}; rm -rf ./final"' release-libs: stage: release diff --git a/Makefile b/Makefile index 3300a5061d5b98e914c97dd0fc864a44970fd5de..1af2b09caa39dc9c694de5d6fa139cd052fd63a4 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .PHONY: all -APP_VERSION ?= 1.4.7 -CHART_VERSION ?= 1.4.7 +APP_VERSION ?= 1.5.0 +CHART_VERSION ?= 1.5.0 REPOSITORY_URL ?= registry.datalab.tuwien.ac.at/dbrepo .PHONY: all diff --git a/README.md b/README.md index f01d3f7d78f77b48fd2281facee8592b685497e5..afe792821c287a613000a6d395ceb14ac7c35452 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ If you have [Docker](https://docs.docker.com/engine/install/) already installed with: ```bash -curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.7/install.sh | bash +curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.5.0/install.sh | bash ``` ## Documentation diff --git a/dbrepo-analyse-service/Pipfile b/dbrepo-analyse-service/Pipfile index 20769992f7b88bdce341f3eb99efe10eca72e3dc..50810379ca9577e34e4f4101dd73239a4a8e05b4 100644 --- a/dbrepo-analyse-service/Pipfile +++ b/dbrepo-analyse-service/Pipfile @@ -21,7 +21,7 @@ numpy = "*" pandas = "*" minio = "*" pydantic = "*" -dbrepo = {path = "./lib/dbrepo-1.4.7.tar.gz"} +dbrepo = {path = "./lib/dbrepo-1.5.0.tar.gz"} opensearch-py = "*" [dev-packages] diff --git a/dbrepo-analyse-service/Pipfile.lock b/dbrepo-analyse-service/Pipfile.lock index 5b3e18df9a67bef696e1b68ecf30b3362e4e86dc..26d7476be8b5c53d3062f64d2f859c03b7780c0c 100644 --- a/dbrepo-analyse-service/Pipfile.lock +++ b/dbrepo-analyse-service/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "9e1fb16b1632a76b8a2fb6ac372b92556c573a7246bd37dd32813559bb27c8d9" + "sha256": "54251c15d82f7fdca3b1c8f28093b5f5667acc7de2caa0bc55dfaebe671234f4" }, "pipfile-spec": 6, "requires": { @@ -440,9 +440,9 @@ }, "dbrepo": { "hashes": [ - "sha256:36316d520c23dcbd249b779ad596a979fe574321882a7d4b6c6934c62a5de57b" + "sha256:6e3c7731b432a238de12044669db1deeca693b2086abcd7d483ddb9829b9b782" ], - "path": "./lib/dbrepo-1.4.7.tar.gz" + "path": "./lib/dbrepo-1.5.0.tar.gz" }, "events": { "hashes": [ @@ -1629,7 +1629,7 @@ "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d", "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8" ], - "markers": "python_version >= '3.8'", + "markers": "python_version < '3.13'", "version": "==4.12.2" }, "tzdata": { @@ -1650,11 +1650,11 @@ }, "werkzeug": { "hashes": [ - "sha256:8cd39dfbdfc1e051965f156163e2974e52c210f130810e9ad36858f0fd3edad4", - "sha256:a71124d1ef06008baafa3d266c02f56e1836a5984afd6dd6c9230669d60d9fb5" + "sha256:4f7d1a5de312c810a8a2c6f0b47e9f6a7cffb7c8322def35e4d4d9841ff85597", + "sha256:f471a4cd167233077e9d2a8190c3471c5bc520c636a9e3c1e9300c33bced03bc" ], "markers": "python_version >= '3.9'", - "version": "==3.1.1" + "version": "==3.1.2" }, "yarl": { "hashes": [ @@ -2274,7 +2274,7 @@ "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d", "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8" ], - "markers": "python_version >= '3.8'", + "markers": "python_version < '3.13'", "version": "==4.12.2" }, "urllib3": { diff --git a/dbrepo-analyse-service/app.py b/dbrepo-analyse-service/app.py index 99f1de1a160e3c83b55237b3eefab0c302ee75a9..1a2a0580487eda0645bd664083140e5a26798e09 100644 --- a/dbrepo-analyse-service/app.py +++ b/dbrepo-analyse-service/app.py @@ -188,7 +188,7 @@ template = { "info": { "title": "Database Repository Analyse Service API", "description": "Service that analyses data structures", - "version": "1.4.7", + "version": "1.5", "contact": { "name": "Prof. Andreas Rauber", "email": "andreas.rauber@tuwien.ac.at" @@ -200,7 +200,7 @@ template = { }, "externalDocs": { "description": "Sourcecode Documentation", - "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/" + "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.5/" }, "servers": [ { diff --git a/dbrepo-analyse-service/lib/dbrepo-1.4.5-py3-none-any.whl b/dbrepo-analyse-service/lib/dbrepo-1.4.5-py3-none-any.whl deleted file mode 100644 index 249fd5dc181271a3069745f5a6ef8a26de398037..0000000000000000000000000000000000000000 Binary files a/dbrepo-analyse-service/lib/dbrepo-1.4.5-py3-none-any.whl and /dev/null differ diff --git a/dbrepo-analyse-service/lib/dbrepo-1.4.5.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.4.5.tar.gz deleted file mode 100644 index 2f21496bd2280550f4242bbc0fff4a47116d6ad5..0000000000000000000000000000000000000000 Binary files a/dbrepo-analyse-service/lib/dbrepo-1.4.5.tar.gz and /dev/null differ diff --git a/dbrepo-analyse-service/lib/dbrepo-1.4.6.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.4.6.tar.gz deleted file mode 100644 index 958287917e7f2b38a0286c3e91c2d471462bceee..0000000000000000000000000000000000000000 Binary files a/dbrepo-analyse-service/lib/dbrepo-1.4.6.tar.gz and /dev/null differ diff --git a/dbrepo-analyse-service/lib/dbrepo-1.4.6rc1-py3-none-any.whl b/dbrepo-analyse-service/lib/dbrepo-1.4.6rc1-py3-none-any.whl deleted file mode 100644 index 83944ce88d8aec5a3b767aa09caf9a8700323104..0000000000000000000000000000000000000000 Binary files a/dbrepo-analyse-service/lib/dbrepo-1.4.6rc1-py3-none-any.whl and /dev/null differ diff --git a/dbrepo-analyse-service/lib/dbrepo-1.4.6rc1.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.4.6rc1.tar.gz deleted file mode 100644 index a0c8432134f3c21359cd7fb8ee1a341812a6c034..0000000000000000000000000000000000000000 Binary files a/dbrepo-analyse-service/lib/dbrepo-1.4.6rc1.tar.gz and /dev/null differ diff --git a/dbrepo-analyse-service/lib/dbrepo-1.4.7.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.4.7.tar.gz deleted file mode 100644 index c85b1225ee9cc1f5386e58bced9b979ff160e982..0000000000000000000000000000000000000000 Binary files a/dbrepo-analyse-service/lib/dbrepo-1.4.7.tar.gz and /dev/null differ diff --git a/dbrepo-analyse-service/lib/dbrepo-1.4.7rc0-py3-none-any.whl b/dbrepo-analyse-service/lib/dbrepo-1.4.7rc0-py3-none-any.whl deleted file mode 100644 index 84353af6a26fdb3e281e10ab90d21130a0701258..0000000000000000000000000000000000000000 Binary files a/dbrepo-analyse-service/lib/dbrepo-1.4.7rc0-py3-none-any.whl and /dev/null differ diff --git a/dbrepo-analyse-service/lib/dbrepo-1.4.7rc0.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.4.7rc0.tar.gz deleted file mode 100644 index 735c2e9d3699303d119033e184e0cfb9a571317f..0000000000000000000000000000000000000000 Binary files a/dbrepo-analyse-service/lib/dbrepo-1.4.7rc0.tar.gz and /dev/null differ diff --git a/dbrepo-analyse-service/lib/dbrepo-1.5.0.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.5.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..dfe9572952b2d1408cf85e7eef799ba83e8f60a0 Binary files /dev/null and b/dbrepo-analyse-service/lib/dbrepo-1.5.0.tar.gz differ diff --git a/dbrepo-data-service/pom.xml b/dbrepo-data-service/pom.xml index a6012b573bbfabf3d3b98643aeee28b8de71315b..22c3c5fe37925290300d654128010ab196dcff7e 100644 --- a/dbrepo-data-service/pom.xml +++ b/dbrepo-data-service/pom.xml @@ -11,7 +11,7 @@ <groupId>at.tuwien</groupId> <artifactId>dbrepo-data-service</artifactId> <name>dbrepo-data-service</name> - <version>1.4.7</version> + <version>1.5.0</version> <description>Service that manages the data</description> @@ -23,7 +23,7 @@ <module>report</module> </modules> - <url>https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/</url> + <url>https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.5/</url> <developers> <developer> <name>Martin Weise</name> diff --git a/dbrepo-data-service/querystore/pom.xml b/dbrepo-data-service/querystore/pom.xml index c9e016e488737aa458f9c609b0fbd77947fac304..257db6cebbcd0a06ec22406c5033fc39df4786ff 100644 --- a/dbrepo-data-service/querystore/pom.xml +++ b/dbrepo-data-service/querystore/pom.xml @@ -6,12 +6,12 @@ <parent> <groupId>at.tuwien</groupId> <artifactId>dbrepo-data-service</artifactId> - <version>1.4.7</version> + <version>1.5.0</version> </parent> <artifactId>dbrepo-data-service-querystore</artifactId> <name>dbrepo-data-service-querystore</name> - <version>1.4.7</version> + <version>1.5.0</version> <dependencies/> diff --git a/dbrepo-data-service/report/pom.xml b/dbrepo-data-service/report/pom.xml index e218cad33215dd52f5171d897704bf74dd7b43a6..b93b5eaa43d0ff32cebe64c796750d12003c944d 100644 --- a/dbrepo-data-service/report/pom.xml +++ b/dbrepo-data-service/report/pom.xml @@ -6,12 +6,12 @@ <parent> <groupId>at.tuwien</groupId> <artifactId>dbrepo-data-service</artifactId> - <version>1.4.7</version> + <version>1.5.0</version> </parent> <artifactId>report</artifactId> <name>dbrepo-data-service-report</name> - <version>1.4.7</version> + <version>1.5.0</version> <description> This module is only intended for the pipeline coverage report. See the detailed report in the respective modules diff --git a/dbrepo-data-service/rest-service/pom.xml b/dbrepo-data-service/rest-service/pom.xml index eb2ee53fd463b8910faf24b0547f0032598f8c71..9709cdd160a2a6767ee8a5ccd1147cfe7e6c5f51 100644 --- a/dbrepo-data-service/rest-service/pom.xml +++ b/dbrepo-data-service/rest-service/pom.xml @@ -6,18 +6,18 @@ <parent> <groupId>at.tuwien</groupId> <artifactId>dbrepo-data-service</artifactId> - <version>1.4.7</version> + <version>1.5.0</version> </parent> <artifactId>rest-service</artifactId> <name>dbrepo-data-service-rest-service</name> - <version>1.4.7</version> + <version>1.5.0</version> <dependencies> <dependency> <groupId>at.tuwien</groupId> <artifactId>services</artifactId> - <version>1.4.7</version> + <version>1.5.0</version> </dependency> </dependencies> diff --git a/dbrepo-data-service/services/pom.xml b/dbrepo-data-service/services/pom.xml index ad3fcee0e03334b2e7ada029888cb54d23703c05..060047999f7c9cbdaf837c33cd1ab389e6f9d487 100644 --- a/dbrepo-data-service/services/pom.xml +++ b/dbrepo-data-service/services/pom.xml @@ -6,18 +6,18 @@ <parent> <groupId>at.tuwien</groupId> <artifactId>dbrepo-data-service</artifactId> - <version>1.4.7</version> + <version>1.5.0</version> </parent> <artifactId>services</artifactId> <name>dbrepo-data-service-services</name> - <version>1.4.7</version> + <version>1.5.0</version> <dependencies> <dependency> <groupId>at.tuwien</groupId> <artifactId>dbrepo-data-service-querystore</artifactId> - <version>1.4.7</version> + <version>1.5.0</version> </dependency> </dependencies> diff --git a/dbrepo-metadata-db/1_setup-schema.sql b/dbrepo-metadata-db/1_setup-schema.sql index 58a4c6ff39002bedde3a0d4ed62a209a5d5d36a3..29a0e856569f3a2b1a0c69d207a7a4bdf5b079cc 100644 --- a/dbrepo-metadata-db/1_setup-schema.sql +++ b/dbrepo-metadata-db/1_setup-schema.sql @@ -545,7 +545,7 @@ CREATE TABLE IF NOT EXISTS `mdb_image_operators` PRIMARY KEY (id), FOREIGN KEY (image_id) REFERENCES `mdb_images` (`id`), UNIQUE (value) - ) WITH SYSTEM VERSIONING; +) WITH SYSTEM VERSIONING; COMMIT; diff --git a/dbrepo-metadata-service/api/pom.xml b/dbrepo-metadata-service/api/pom.xml index c5dadcdfd9ff4aebd0ce83c59b55a2d2d45c237b..f3c6345e2644c20924b1bc87a56fae778d1c3476 100644 --- a/dbrepo-metadata-service/api/pom.xml +++ b/dbrepo-metadata-service/api/pom.xml @@ -6,18 +6,18 @@ <parent> <groupId>at.tuwien</groupId> <artifactId>dbrepo-metadata-service</artifactId> - <version>1.4.7</version> + <version>1.5.0</version> </parent> <artifactId>dbrepo-metadata-service-api</artifactId> <name>dbrepo-metadata-service-api</name> - <version>1.4.7</version> + <version>1.5.0</version> <dependencies> <dependency> <groupId>at.tuwien</groupId> <artifactId>dbrepo-metadata-service-entities</artifactId> - <version>1.4.7</version> + <version>1.5.0</version> <scope>compile</scope> </dependency> </dependencies> diff --git a/dbrepo-metadata-service/entities/pom.xml b/dbrepo-metadata-service/entities/pom.xml index 95923c1262a3f9940dbdd7fbd42cbf6e53de7de3..08d5d66172a5ec51239422565a65e45238cf7000 100644 --- a/dbrepo-metadata-service/entities/pom.xml +++ b/dbrepo-metadata-service/entities/pom.xml @@ -6,12 +6,12 @@ <parent> <groupId>at.tuwien</groupId> <artifactId>dbrepo-metadata-service</artifactId> - <version>1.4.7</version> + <version>1.5.0</version> </parent> <artifactId>dbrepo-metadata-service-entities</artifactId> <name>dbrepo-metadata-service-entity</name> - <version>1.4.7</version> + <version>1.5.0</version> <dependencies/> diff --git a/dbrepo-metadata-service/oai/pom.xml b/dbrepo-metadata-service/oai/pom.xml index 3239bbc573401cafe3006852109baaa2d04b7ff3..ef3959bd9866df8d3eee6214b91eae35943076bb 100644 --- a/dbrepo-metadata-service/oai/pom.xml +++ b/dbrepo-metadata-service/oai/pom.xml @@ -6,12 +6,12 @@ <parent> <groupId>at.tuwien</groupId> <artifactId>dbrepo-metadata-service</artifactId> - <version>1.4.7</version> + <version>1.5.0</version> </parent> <artifactId>dbrepo-metadata-service-oai</artifactId> <name>dbrepo-metadata-service-oai</name> - <version>1.4.7</version> + <version>1.5.0</version> <dependencies/> diff --git a/dbrepo-metadata-service/pom.xml b/dbrepo-metadata-service/pom.xml index 5ac480bce0defedbcebd245de9f7c5d62b13dd77..dac6e3a41570f8844fe17fc99ead9d61e30623e7 100644 --- a/dbrepo-metadata-service/pom.xml +++ b/dbrepo-metadata-service/pom.xml @@ -11,7 +11,7 @@ <groupId>at.tuwien</groupId> <artifactId>dbrepo-metadata-service</artifactId> <name>dbrepo-metadata-service</name> - <version>1.4.7</version> + <version>1.5.0</version> <description>Service that manages the metadata</description> @@ -27,7 +27,7 @@ <module>report</module> </modules> - <url>https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/</url> + <url>https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.5/</url> <developers> <developer> <name>Martin Weise</name> diff --git a/dbrepo-metadata-service/report/pom.xml b/dbrepo-metadata-service/report/pom.xml index bfeca5ecff2081adb63d8a1dd9a841665efa67de..9aaa69651e884be663cff92f969288f971b79eeb 100644 --- a/dbrepo-metadata-service/report/pom.xml +++ b/dbrepo-metadata-service/report/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>dbrepo-metadata-service</artifactId> <groupId>at.tuwien</groupId> - <version>1.4.7</version> + <version>1.5.0</version> </parent> <artifactId>dbrepo-metadata-service-report</artifactId> <name>dbrepo-metadata-service-report</name> - <version>1.4.7</version> + <version>1.5.0</version> <dependencies> <dependency> diff --git a/dbrepo-metadata-service/repositories/pom.xml b/dbrepo-metadata-service/repositories/pom.xml index 9fa9d2b6ab0c073485819dd46f03dbe915eefdee..bc3f596cca1558021732decc0d97d9d1b7d61fc2 100644 --- a/dbrepo-metadata-service/repositories/pom.xml +++ b/dbrepo-metadata-service/repositories/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>dbrepo-metadata-service</artifactId> <groupId>at.tuwien</groupId> - <version>1.4.7</version> + <version>1.5.0</version> </parent> <artifactId>dbrepo-metadata-service-repositories</artifactId> <name>dbrepo-metadata-service-repositories</name> - <version>1.4.7</version> + <version>1.5.0</version> <dependencies> <dependency> diff --git a/dbrepo-metadata-service/rest-service/pom.xml b/dbrepo-metadata-service/rest-service/pom.xml index 1e7c35cbf93b0249c07822b66dcf65b8da26b06e..f9da41cb61773d95fdcd26f26049974e9a282270 100644 --- a/dbrepo-metadata-service/rest-service/pom.xml +++ b/dbrepo-metadata-service/rest-service/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>dbrepo-metadata-service</artifactId> <groupId>at.tuwien</groupId> - <version>1.4.7</version> + <version>1.5.0</version> </parent> <artifactId>dbrepo-metadata-service-rest-service</artifactId> <name>dbrepo-metadata-service-rest</name> - <version>1.4.7</version> + <version>1.5.0</version> <dependencies> <dependency> diff --git a/dbrepo-metadata-service/services/pom.xml b/dbrepo-metadata-service/services/pom.xml index 744a4e6def94c9ff67a24bea56375c0c7fb076d1..9acadd807b72b77d5dedd95f5805bd48070bdb20 100644 --- a/dbrepo-metadata-service/services/pom.xml +++ b/dbrepo-metadata-service/services/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>dbrepo-metadata-service</artifactId> <groupId>at.tuwien</groupId> - <version>1.4.7</version> + <version>1.5.0</version> </parent> <artifactId>dbrepo-metadata-service-services</artifactId> <name>dbrepo-metadata-service-services</name> - <version>1.4.7</version> + <version>1.5.0</version> <dependencies> <dependency> diff --git a/dbrepo-metadata-service/test/pom.xml b/dbrepo-metadata-service/test/pom.xml index a03ae0b3a6d6316c1537a7acff40aa8694db309e..19bc0dd49b0475f9a052eb8cff18545093785b80 100644 --- a/dbrepo-metadata-service/test/pom.xml +++ b/dbrepo-metadata-service/test/pom.xml @@ -6,12 +6,12 @@ <parent> <groupId>at.tuwien</groupId> <artifactId>dbrepo-metadata-service</artifactId> - <version>1.4.7</version> + <version>1.5.0</version> </parent> <artifactId>dbrepo-metadata-service-test</artifactId> <name>dbrepo-metadata-service-test</name> - <version>1.4.7</version> + <version>1.5.0</version> <dependencies> <dependency> diff --git a/dbrepo-search-service/Pipfile b/dbrepo-search-service/Pipfile index e74391ce665a39201bd480819e31a712fe82a6c7..5c358cb51a04aa7f77bbd94aa14faf3f52f8e98f 100644 --- a/dbrepo-search-service/Pipfile +++ b/dbrepo-search-service/Pipfile @@ -18,7 +18,7 @@ jwt = "~=1.3" testcontainers-opensearch = "*" pytest = "*" rdflib = "*" -dbrepo = {path = "./lib/dbrepo-1.4.7.tar.gz"} +dbrepo = {path = "./lib/dbrepo-1.5.0.tar.gz"} gunicorn = "*" [dev-packages] diff --git a/dbrepo-search-service/Pipfile.lock b/dbrepo-search-service/Pipfile.lock index fc5839fcdb5054840363d5a4a010208af681d852..a9753f8966425f1e329af32b53b08a9e7bf7de41 100644 --- a/dbrepo-search-service/Pipfile.lock +++ b/dbrepo-search-service/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "491e5f6ada48e8af417dfa7d6a0b4d98ccf9b9072df53b44d8de014b687fc80c" + "sha256": "861f22bdd4573963cb0df29800ff91d53e534cf2e7feb542602d9fbb41cb8375" }, "pipfile-spec": 6, "requires": { @@ -388,9 +388,9 @@ }, "dbrepo": { "hashes": [ - "sha256:36316d520c23dcbd249b779ad596a979fe574321882a7d4b6c6934c62a5de57b" + "sha256:6e3c7731b432a238de12044669db1deeca693b2086abcd7d483ddb9829b9b782" ], - "path": "./lib/dbrepo-1.4.7.tar.gz" + "path": "./lib/dbrepo-1.5.0.tar.gz" }, "docker": { "hashes": [ @@ -1623,11 +1623,11 @@ }, "werkzeug": { "hashes": [ - "sha256:8cd39dfbdfc1e051965f156163e2974e52c210f130810e9ad36858f0fd3edad4", - "sha256:a71124d1ef06008baafa3d266c02f56e1836a5984afd6dd6c9230669d60d9fb5" + "sha256:4f7d1a5de312c810a8a2c6f0b47e9f6a7cffb7c8322def35e4d4d9841ff85597", + "sha256:f471a4cd167233077e9d2a8190c3471c5bc520c636a9e3c1e9300c33bced03bc" ], "markers": "python_version >= '3.9'", - "version": "==3.1.1" + "version": "==3.1.2" }, "wrapt": { "hashes": [ diff --git a/dbrepo-search-service/app.py b/dbrepo-search-service/app.py index 7566178526d97cd7e21a288edd1d9881e49ad9cc..e8107b76f13cede3edb1b7ee926e915244c62bfa 100644 --- a/dbrepo-search-service/app.py +++ b/dbrepo-search-service/app.py @@ -167,7 +167,7 @@ template = { "info": { "title": "Database Repository Search Service API", "description": "Service that searches the search database", - "version": "1.4.7", + "version": "1.5", "contact": { "name": "Prof. Andreas Rauber", "email": "andreas.rauber@tuwien.ac.at" @@ -179,7 +179,7 @@ template = { }, "externalDocs": { "description": "Sourcecode Documentation", - "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/" + "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.5/" }, "servers": [ { diff --git a/dbrepo-search-service/init/Pipfile b/dbrepo-search-service/init/Pipfile index a6a48b1cfb4d5f8d10e398ca42e636abf6191eff..faeac700fc35d5b812313d6a7f126618d567fcf8 100644 --- a/dbrepo-search-service/init/Pipfile +++ b/dbrepo-search-service/init/Pipfile @@ -9,7 +9,7 @@ opensearch-py = "~=2.2" python-dotenv = "~=1.0" testcontainers-opensearch = "*" pytest = "*" -dbrepo = {path = "./lib/dbrepo-1.4.7.tar.gz"} +dbrepo = {path = "./lib/dbrepo-1.5.0.tar.gz"} rdflib = "*" [dev-packages] diff --git a/dbrepo-search-service/init/Pipfile.lock b/dbrepo-search-service/init/Pipfile.lock index de0064f408e2aefd4f4478c641e3ae6520d18fba..22e02e1c40ff556dfad574e757b3f859499442d5 100644 --- a/dbrepo-search-service/init/Pipfile.lock +++ b/dbrepo-search-service/init/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "17c83557efb9ffbe3c93e34a0df4e794f27b0fb6658915e2c68f4a9a3ef1e09b" + "sha256": "aa2d078600b517c54d177bd6bda4e1d7975005628c1b576e7593052d9dac0b25" }, "pipfile-spec": 6, "requires": { @@ -282,9 +282,9 @@ }, "dbrepo": { "hashes": [ - "sha256:36316d520c23dcbd249b779ad596a979fe574321882a7d4b6c6934c62a5de57b" + "sha256:6e3c7731b432a238de12044669db1deeca693b2086abcd7d483ddb9829b9b782" ], - "path": "./lib/dbrepo-1.4.7.tar.gz" + "path": "./lib/dbrepo-1.5.0.tar.gz" }, "docker": { "hashes": [ @@ -1076,11 +1076,11 @@ }, "werkzeug": { "hashes": [ - "sha256:8cd39dfbdfc1e051965f156163e2974e52c210f130810e9ad36858f0fd3edad4", - "sha256:a71124d1ef06008baafa3d266c02f56e1836a5984afd6dd6c9230669d60d9fb5" + "sha256:4f7d1a5de312c810a8a2c6f0b47e9f6a7cffb7c8322def35e4d4d9841ff85597", + "sha256:f471a4cd167233077e9d2a8190c3471c5bc520c636a9e3c1e9300c33bced03bc" ], "markers": "python_version >= '3.9'", - "version": "==3.1.1" + "version": "==3.1.2" }, "wrapt": { "hashes": [ diff --git a/dbrepo-search-service/init/lib/dbrepo-1.4.7.tar.gz b/dbrepo-search-service/init/lib/dbrepo-1.4.7.tar.gz deleted file mode 100644 index c85b1225ee9cc1f5386e58bced9b979ff160e982..0000000000000000000000000000000000000000 Binary files a/dbrepo-search-service/init/lib/dbrepo-1.4.7.tar.gz and /dev/null differ diff --git a/dbrepo-search-service/init/lib/dbrepo-1.5.0.tar.gz b/dbrepo-search-service/init/lib/dbrepo-1.5.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..dfe9572952b2d1408cf85e7eef799ba83e8f60a0 Binary files /dev/null and b/dbrepo-search-service/init/lib/dbrepo-1.5.0.tar.gz differ diff --git a/dbrepo-search-service/lib/dbrepo-1.4.7.tar.gz b/dbrepo-search-service/lib/dbrepo-1.4.7.tar.gz deleted file mode 100644 index c85b1225ee9cc1f5386e58bced9b979ff160e982..0000000000000000000000000000000000000000 Binary files a/dbrepo-search-service/lib/dbrepo-1.4.7.tar.gz and /dev/null differ diff --git a/dbrepo-search-service/lib/dbrepo-1.5.0.tar.gz b/dbrepo-search-service/lib/dbrepo-1.5.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..dfe9572952b2d1408cf85e7eef799ba83e8f60a0 Binary files /dev/null and b/dbrepo-search-service/lib/dbrepo-1.5.0.tar.gz differ diff --git a/helm/dbrepo/Chart.yaml b/helm/dbrepo/Chart.yaml index 301352c6b26405e04f34e8ce0ef217cc83402cde..c4cdd065bb525ba267c5da677b997875265002e7 100644 --- a/helm/dbrepo/Chart.yaml +++ b/helm/dbrepo/Chart.yaml @@ -6,8 +6,8 @@ description: Helm Chart for installing DBRepo sources: - https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services type: application -version: "1.4.7" -appVersion: "1.4.7" +version: "1.5.0" +appVersion: "1.5.0" keywords: - dbrepo maintainers: diff --git a/helm/dbrepo/README.md b/helm/dbrepo/README.md index 8c479003df6c435f27bc999d2c181bdd2daa11b1..cc57a2a2214dc4893006dc2e325e1d7a813c4cb5 100644 --- a/helm/dbrepo/README.md +++ b/helm/dbrepo/README.md @@ -1,17 +1,17 @@ # DBRepo Helm chart -[DBRepo](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/) is a database repository system that +[DBRepo](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.5.0/) is a database repository system that allows researchers to ingest data into a central, versioned repository through common interfaces. ## TL;DR Download the sample [ -`values.yaml`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.7/helm-charts/dbrepo/values.yaml?inline=true) +`values.yaml`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.5.0/helm-charts/dbrepo/values.yaml?inline=true) for your deployment and update the variables, especially `hostname`. ```bash -helm install my-release "oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo" --values ./values.yaml --version "1.4.7" +helm install my-release "oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo" --values ./values.yaml --version "1.5.0" ``` ## Prerequisites @@ -28,7 +28,7 @@ helm install my-release "oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo" To install the chart with the release name `my-release`: ```bash -helm install my-release "oci://oci://registry.datalab.tuwien.ac.at/dbrepo/helm" --values ./values.yaml --version "1.4.7" +helm install my-release "oci://oci://registry.datalab.tuwien.ac.at/dbrepo/helm" --values ./values.yaml --version "1.5.0" ``` The command deploys DBRepo on the Kubernetes cluster in the default configuration. The Parameters section lists the diff --git a/helm/dbrepo/templates/metadata-configmap.yaml b/helm/dbrepo/templates/metadata-configmap.yaml index bdd2cdbcf8540fa4e9dd0fdcbd59c7dfab91e0f0..d05b8572d4b6fbe5862b9f9acc833ae23ed46d16 100644 --- a/helm/dbrepo/templates/metadata-configmap.yaml +++ b/helm/dbrepo/templates/metadata-configmap.yaml @@ -16,7 +16,7 @@ data: COMMIT; 01-setup-schema.sql: | BEGIN; - + CREATE TABLE IF NOT EXISTS `mdb_users` ( id character varying(36) NOT NULL, @@ -33,7 +33,7 @@ data: UNIQUE (username), UNIQUE (email) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_images` ( id SERIAL, @@ -51,7 +51,7 @@ data: UNIQUE (name, version), UNIQUE (is_default) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_containers` ( id SERIAL, @@ -72,7 +72,7 @@ data: quota integer NOT NULL DEFAULT 50, PRIMARY KEY (id) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_data` ( ID SERIAL, @@ -83,7 +83,7 @@ data: Seperator text, PRIMARY KEY (ID) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_licenses` ( identifier character varying(255) NOT NULL, @@ -92,7 +92,7 @@ data: PRIMARY KEY (identifier), UNIQUE (uri(200)) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_databases` ( id SERIAL, @@ -115,14 +115,14 @@ data: FOREIGN KEY (owned_by) REFERENCES mdb_users (id), FOREIGN KEY (contact_person) REFERENCES mdb_users (id) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_databases_subjects` ( dbid BIGINT NOT NULL, subjects character varying(255) NOT NULL, PRIMARY KEY (dbid, subjects) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_tables` ( ID SERIAL, @@ -154,7 +154,7 @@ data: FOREIGN KEY (created_by) REFERENCES mdb_users (id), FOREIGN KEY (owned_by) REFERENCES mdb_users (id) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_columns` ( ID SERIAL, @@ -180,7 +180,7 @@ data: PRIMARY KEY (ID), UNIQUE (tID, internal_name) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_columns_enums` ( id SERIAL, @@ -189,7 +189,7 @@ data: FOREIGN KEY (column_id) REFERENCES mdb_columns (ID) ON DELETE CASCADE, PRIMARY KEY (id) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_columns_sets` ( id SERIAL, @@ -198,7 +198,7 @@ data: FOREIGN KEY (column_id) REFERENCES mdb_columns (ID) ON DELETE CASCADE, PRIMARY KEY (id) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_columns_nom` ( cID BIGINT UNSIGNED, @@ -209,7 +209,7 @@ data: PRIMARY KEY (cID), FOREIGN KEY (cID) REFERENCES mdb_columns (ID) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_columns_cat` ( cID BIGINT UNSIGNED, @@ -221,7 +221,7 @@ data: PRIMARY KEY (cID), FOREIGN KEY (cID) REFERENCES mdb_columns (ID) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_constraints_foreign_key` ( fkid SERIAL, @@ -235,7 +235,7 @@ data: FOREIGN KEY (tid) REFERENCES mdb_tables (id) ON DELETE CASCADE, FOREIGN KEY (rtid) REFERENCES mdb_tables (id) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_constraints_primary_key` ( pkid SERIAL, @@ -245,7 +245,7 @@ data: FOREIGN KEY (tID) REFERENCES mdb_tables (id) ON DELETE CASCADE, FOREIGN KEY (cid) REFERENCES mdb_columns (id) ON DELETE CASCADE ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_constraints_foreign_key_reference` ( id SERIAL, @@ -258,7 +258,7 @@ data: FOREIGN KEY (cid) REFERENCES mdb_columns (id), FOREIGN KEY (rcid) REFERENCES mdb_columns (id) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_constraints_unique` ( uid SERIAL, @@ -268,7 +268,7 @@ data: PRIMARY KEY (uid), FOREIGN KEY (tid) REFERENCES mdb_tables (id) ON DELETE CASCADE ); - + CREATE TABLE IF NOT EXISTS `mdb_constraints_unique_columns` ( id SERIAL, @@ -278,7 +278,7 @@ data: FOREIGN KEY (uid) REFERENCES mdb_constraints_unique (uid), FOREIGN KEY (cid) REFERENCES mdb_columns (id) ON DELETE CASCADE ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_constraints_checks` ( id SERIAL, @@ -287,8 +287,8 @@ data: PRIMARY KEY (id), FOREIGN KEY (tid) REFERENCES mdb_tables (id) ON DELETE CASCADE ) WITH SYSTEM VERSIONING; - - + + CREATE TABLE IF NOT EXISTS `mdb_concepts` ( id SERIAL, @@ -299,7 +299,7 @@ data: PRIMARY KEY (id), UNIQUE (uri(200)) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_units` ( id SERIAL, @@ -310,7 +310,7 @@ data: PRIMARY KEY (id), UNIQUE (uri(200)) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_columns_concepts` ( id BIGINT UNSIGNED NOT NULL, @@ -319,7 +319,7 @@ data: PRIMARY KEY (id, cid), FOREIGN KEY (cID) REFERENCES mdb_columns (ID) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_columns_units` ( id BIGINT UNSIGNED NOT NULL, @@ -328,7 +328,7 @@ data: PRIMARY KEY (id, cID), FOREIGN KEY (cID) REFERENCES mdb_columns (ID) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_view` ( id SERIAL, @@ -346,7 +346,7 @@ data: FOREIGN KEY (vdbid) REFERENCES mdb_databases (id), FOREIGN KEY (created_by) REFERENCES mdb_users (id) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_banner_messages` ( id SERIAL, @@ -358,7 +358,7 @@ data: display_end timestamp NULL, PRIMARY KEY (id) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_ontologies` ( id SERIAL, @@ -373,7 +373,7 @@ data: UNIQUE (uri(200)), PRIMARY KEY (id) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_view_columns` ( id SERIAL, @@ -389,7 +389,7 @@ data: FOREIGN KEY (view_id) REFERENCES mdb_view (id) ON DELETE CASCADE, UNIQUE (view_id, internal_name) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_identifiers` ( id SERIAL, @@ -418,7 +418,7 @@ data: FOREIGN KEY (dbid) REFERENCES mdb_databases (id), FOREIGN KEY (created_by) REFERENCES mdb_users (id) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_identifier_licenses` ( pid BIGINT UNSIGNED NOT NULL, @@ -427,7 +427,7 @@ data: FOREIGN KEY (pid) REFERENCES mdb_identifiers (id), FOREIGN KEY (license_id) REFERENCES mdb_licenses (identifier) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_identifier_titles` ( id SERIAL, @@ -438,7 +438,7 @@ data: PRIMARY KEY (id), FOREIGN KEY (pid) REFERENCES mdb_identifiers (id) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_identifier_funders` ( id SERIAL, @@ -453,7 +453,7 @@ data: PRIMARY KEY (id), FOREIGN KEY (pid) REFERENCES mdb_identifiers (id) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_identifier_descriptions` ( id SERIAL, @@ -464,7 +464,7 @@ data: PRIMARY KEY (id), FOREIGN KEY (pid) REFERENCES mdb_identifiers (id) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_related_identifiers` ( id SERIAL, @@ -476,7 +476,7 @@ data: FOREIGN KEY (pid) REFERENCES mdb_identifiers (id), UNIQUE (pid, value) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_identifier_creators` ( id SERIAL, @@ -495,7 +495,7 @@ data: PRIMARY KEY (id), FOREIGN KEY (pid) REFERENCES mdb_identifiers (id) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_update` ( uUserID character varying(255) NOT NULL, @@ -504,7 +504,7 @@ data: PRIMARY KEY (uUserID, uDBID), FOREIGN KEY (uDBID) REFERENCES mdb_databases (id) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_access` ( aUserID character varying(255) NOT NULL, @@ -514,7 +514,7 @@ data: created timestamp NOT NULL DEFAULT NOW(), PRIMARY KEY (aUserID, aDBID) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_have_access` ( user_id character varying(36) NOT NULL, @@ -524,7 +524,7 @@ data: PRIMARY KEY (user_id, database_id), FOREIGN KEY (user_id) REFERENCES mdb_users (id) ) WITH SYSTEM VERSIONING; - + CREATE TABLE IF NOT EXISTS `mdb_image_types` ( id SERIAL, @@ -551,21 +551,33 @@ data: FOREIGN KEY (image_id) REFERENCES `mdb_images` (`id`), UNIQUE (value) ) WITH SYSTEM VERSIONING; - + + CREATE TABLE IF NOT EXISTS `mdb_image_operators` + ( + id SERIAL, + image_id BIGINT UNSIGNED NOT NULL, + display_name varchar(255) NOT NULL, + value varchar(255) NOT NULL, + documentation TEXT NOT NULL, + PRIMARY KEY (id), + FOREIGN KEY (image_id) REFERENCES `mdb_images` (`id`), + UNIQUE (value) + ) WITH SYSTEM VERSIONING; + COMMIT; - + BEGIN; - + INSERT INTO `mdb_licenses` (identifier, uri, description) VALUES ('CC0-1.0', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode', 'CC0 waives copyright interest in a work you''ve created and dedicates it to the world-wide public domain. Use CC0 to opt out of copyright entirely and ensure your work has the widest reach.'), ('CC-BY-4.0', 'https://creativecommons.org/licenses/by/4.0/legalcode', 'The Creative Commons Attribution license allows re-distribution and re-use of a licensed work on the condition that the creator is appropriately credited.'); - + INSERT INTO `mdb_images` (name, registry, version, default_port, dialect, driver_class, jdbc_method) VALUES ('mariadb', 'docker.io', '11.1.3', 3306, 'org.hibernate.dialect.MariaDBDialect', 'org.mariadb.jdbc.Driver', 'mariadb'); - + INSERT INTO `mdb_image_types` (image_id, display_name, value, size_min, size_max, size_default, size_required, size_step, d_min, d_max, d_default, d_required, d_step, type_hint, data_hint, documentation, is_quoted, is_buildable, is_generated) @@ -635,7 +647,38 @@ data: null, 'https://mariadb.com/kb/en/varbinary/', false, true, false), (1, 'VARCHAR(size)', 'varchar', 0, 65532, 255, true, null, null, null, null, null, null, null, null, 'https://mariadb.com/kb/en/varchar/', false, true, false); - + + INSERT INTO `mdb_image_operators` (image_id, display_name, value, documentation) + VALUES (1, 'Equal operator', '=', 'https://mariadb.com/kb/en/assignment-operators-assignment-operator/'), + (1, 'NULL-safe equal operator', '<=>', 'https://mariadb.com/kb/en/null-safe-equal/'), + (1, 'Less-than operator', '<', 'https://mariadb.com/kb/en/less-than/'), + (1, 'Less than or equal operator', '<=', 'https://mariadb.com/kb/en/less-than-or-equal/'), + (1, 'Greater-than operator', '>', 'https://mariadb.com/kb/en/greater-than/'), + (1, 'Greater than or equal operator', '>=', 'https://mariadb.com/kb/en/greater-than-or-equal/'), + (1, 'Not equal operator', '!=', 'https://mariadb.com/kb/en/not-equal/'), + (1, 'Addition operator', '+', 'https://mariadb.com/kb/en/addition-operator/'), + (1, 'Division operator', '/', 'https://mariadb.com/kb/en/division-operator/'), + (1, 'Modulo operator', '%', 'https://mariadb.com/kb/en/modulo-operator/'), + (1, 'Multiplication operator', '*', 'https://mariadb.com/kb/en/multiplication-operator/'), + (1, 'Subtraction operator', '-', 'https://mariadb.com/kb/en/subtraction-operator-/'), + (1, 'LIKE', 'LIKE', 'https://mariadb.com/kb/en/like/'), + (1, 'NOT LIKE', 'NOT LIKE', 'https://mariadb.com/kb/en/not-like/'), + (1, 'IN', 'IN', 'https://mariadb.com/kb/en/in/'), + (1, 'NOT IN', 'NOT IN', 'https://mariadb.com/kb/en/not-in/'), + (1, 'IS', 'IS', 'https://mariadb.com/kb/en/is/'), + (1, 'IS NOT', 'IS NOT', 'https://mariadb.com/kb/en/is-not/'), + (1, 'IS NOT NULL', 'IS NOT NULL', 'https://mariadb.com/kb/en/is-not-null/'), + (1, 'IS NULL', 'IS NULL', 'https://mariadb.com/kb/en/is-null/'), + (1, 'ISNULL', 'ISNULL', 'https://mariadb.com/kb/en/isnull/'), + (1, 'REGEXP', 'REGEXP', 'https://mariadb.com/kb/en/regexp/'), + (1, 'NOT REGEXP', 'NOT REGEXP', 'https://mariadb.com/kb/en/not-regexp/'), + (1, 'Bitwise AND', '&', 'https://mariadb.com/kb/en/bitwise_and/'), + (1, 'Bitwise OR', '|', 'https://mariadb.com/kb/en/bitwise-or/'), + (1, 'Bitwise XOR', '^', 'https://mariadb.com/kb/en/bitwise-xor/'), + (1, 'Bitwise NOT', '~', 'https://mariadb.com/kb/en/bitwise-not/'), + (1, 'Left shift', '<<', 'https://mariadb.com/kb/en/shift-left/'), + (1, 'Right shift', '>>', 'https://mariadb.com/kb/en/shift-right/'); + INSERT INTO `mdb_ontologies` (prefix, uri, uri_pattern, sparql_endpoint, rdf_path) VALUES ('om', 'http://www.ontology-of-units-of-measure.org/resource/om-2/', diff --git a/helm/dbrepo/values.yaml b/helm/dbrepo/values.yaml index 36dceda681fad0ad39f201437b91aab5e740aada..5c76e6f8e68790c4cb73d95497c92a9ebfd44897 100644 --- a/helm/dbrepo/values.yaml +++ b/helm/dbrepo/values.yaml @@ -292,7 +292,7 @@ analyseservice: enabled: true image: ## @skip analyseservice.image.name - name: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.4.7 + name: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.5.0 ## @skip analyseservice.image.pullPolicy pullPolicy: Always ## @param analyseservice.image.debug Set the logging level to `trace`. Otherwise, set to `info`. @@ -356,7 +356,7 @@ metadataservice: enabled: true image: ## @skip metadataservice.image.name - name: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.4.7 + name: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.5.0 ## @skip metadataservice.image.pullPolicy pullPolicy: Always ## @param metadataservice.image.debug Set the logging level to `trace`. Otherwise, set to `info`. @@ -455,7 +455,7 @@ dataservice: endpoint: http://data-service image: ## @skip dataservice.image.name - name: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.4.7 + name: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.5.0 ## @skip dataservice.image.pullPolicy pullPolicy: Always ## @param dataservice.image.debug Set the logging level to `trace`. Otherwise, set to `info`. @@ -535,7 +535,7 @@ searchservice: endpoint: http://search-service image: ## @skip searchservice.image.name - name: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.4.7 + name: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.5.0 ## @skip searchservice.image.pullPolicy pullPolicy: Always ## @param searchservice.image.debug Set the logging level to `trace`. Otherwise, set to `info`. @@ -584,7 +584,7 @@ searchservice: ## @skip searchservice.init init: image: - name: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.4.7 + name: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.5.0 pullPolicy: Always ## @param searchservice.replicaCount The number of replicas. replicaCount: 2 @@ -632,7 +632,7 @@ storageservice: adminSecretAccessKey: seaweedfsadmin ## @skip storageservice.init init: - image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.4.7 + image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.5.0 pullPolicy: Always ## @section Identity Service @@ -698,7 +698,7 @@ ui: enabled: true image: ## @skip ui.image.name - name: registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.7 + name: registry.datalab.tuwien.ac.at/dbrepo/ui:1.5.0 ## @skip ui.image.pullPolicy pullPolicy: Always ## @param ui.image.debug Set the logging level to `trace`. Otherwise, set to `info`. diff --git a/install.sh b/install.sh index 03974502c259f964cd22a8bd5f5f2ec983635c71..fc2c17d0b11fa3c63ecd73c78ce708e323600461 100644 --- a/install.sh +++ b/install.sh @@ -1,7 +1,7 @@ #!/bin/bash # preset -VERSION="1.4.7" +VERSION="1.5.0" MIN_CPU=8 MIN_RAM=4 MIN_MAP_COUNT=262144 diff --git a/lib/python/README.md b/lib/python/README.md index ccf6e82dd14db37362a3b87ac6fe605c14f4e9de..b499c62c4868ca3a5605bdfd0c2c3f7cab0f1d09 100644 --- a/lib/python/README.md +++ b/lib/python/README.md @@ -48,17 +48,17 @@ client.import_table_data(database_id=7, table_id=13, file_name_or_data_frame=df) ## Supported Features & Best-Practices - Manage user - account ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/api/#create-user-account)) + account ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.5.0/api/#create-user-account)) - Manage databases ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo//usage-overview/#create-database)) - Manage database access & - visibility ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/api/#create-database)) + visibility ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.5.0/api/#create-database)) - Import - dataset ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/api/#import-dataset)) + dataset ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.5.0/api/#import-dataset)) - Create persistent - identifiers ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/api/#assign-database-pid)) + identifiers ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.5.0/api/#assign-database-pid)) - Execute - queries ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/api/#export-subset)) + queries ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.5.0/api/#export-subset)) - Get data from tables/views/subsets ## Configure diff --git a/lib/python/docs/index.rst b/lib/python/docs/index.rst index d535a0b2d359e13ca02bee2ecc12cbfb3d3d0bce..e39c19f8054c3052fb04e7b059f6c3fac1b9908c 100644 --- a/lib/python/docs/index.rst +++ b/lib/python/docs/index.rst @@ -12,7 +12,7 @@ Quickstart ---------- Find numerous quickstart examples on -the `DBRepo website <https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/api/>`_. +the `DBRepo website <https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.5.0/api/>`_. AMQP API Client ----------- diff --git a/lib/python/pyproject.toml b/lib/python/pyproject.toml index 4e6642658bab6423df8db412f529021104e532fd..ced215c9393dc383c64401db4a88291c689dc3e6 100644 --- a/lib/python/pyproject.toml +++ b/lib/python/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "dbrepo" -version = "1.4.7" +version = "1.5.0" description = "DBRepo Python Library" keywords = [ "DBRepo", @@ -34,7 +34,7 @@ requires = [ build-backend = "setuptools.build_meta" [project.urls] -Homepage = "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/" -Documentation = "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/python/" +Homepage = "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.5.0/" +Documentation = "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.5.0/python/" Issues = "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues" Source = "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/" \ No newline at end of file diff --git a/lib/python/setup.py b/lib/python/setup.py index 8d686818235b9ca80e1f9f2bcb83765ee8a912d6..a3fe366b7d94e550faed3c92ed3cc0a4b815f970 100644 --- a/lib/python/setup.py +++ b/lib/python/setup.py @@ -2,9 +2,9 @@ from distutils.core import setup setup(name="dbrepo", - version="1.4.7", + version="1.5.0", description="A library for communicating with DBRepo", - url="https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/", + url="https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.5.0/", author="Martin Weise", license="Apache-2.0", author_email="martin.weise@tuwien.ac.at", diff --git a/mkdocs.yml b/mkdocs.yml index 28f04c8365f0d0a729a0eaf093cf87ebd72ff04a..22bf05b5acf9c7f403f4e467c2e59877aafa5cad 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,5 +1,5 @@ site_name: Database Repository -site_url: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/ +site_url: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.5/ repo_url: https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services repo_name: fda-services site_author: Research Unit Data Science, Technische Universität Wien @@ -121,7 +121,7 @@ markdown_extensions: extra: homepage: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/ version: - default: 1.4.7 + default: 1.5 provider: mike social: - icon: simple/artifacthub diff --git a/sonar-project.properties b/sonar-project.properties index d034d57b104243b02aa8eb0f050a4497e39f513a..528f5fddc24ab96854495b21329b059b3c712265 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=fair-data-austria-db-repository_fda-services_a57fa043-ab99-4cdd-a721-162d9a916d77 sonar.host.url=https://s34.datalab.tuwien.ac.at # project -sonar.projectVersion=1.4.7 +sonar.projectVersion=1.5.0 # general sonar.qualitygate.wait=true sonar.projectCreation.mainBranchName=master diff --git a/versions.json b/versions.json index 760242683ec68967ba967b659c87d8b970ed1cc9..8ba789267d564384cbeb2a16bb1e212bf4047e72 100644 --- a/versions.json +++ b/versions.json @@ -1,42 +1,12 @@ [ { - "version": "1.4.7", - "title": "1.4.7", + "version": "1.5", + "title": "1.5", "aliases": [] }, { - "version": "1.4.6", - "title": "1.4.6", - "aliases": [] - }, - { - "version": "1.4.5", - "title": "1.4.5", - "aliases": [] - }, - { - "version": "1.4.4", - "title": "1.4.4", - "aliases": [] - }, - { - "version": "1.4.3", - "title": "1.4.3", - "aliases": [] - }, - { - "version": "1.4.2", - "title": "1.4.2", - "aliases": [] - }, - { - "version": "1.4.1", - "title": "1.4.1", - "aliases": [] - }, - { - "version": "1.4.0", - "title": "1.4.0", + "version": "1.4", + "title": "1.4", "aliases": [] } ] \ No newline at end of file