From fc056b065731ccd0c711b0ab614b436c6e01054f Mon Sep 17 00:00:00 2001 From: Martin Weise <martin.weise@tuwien.ac.at> Date: Wed, 23 Oct 2024 13:38:37 +0200 Subject: [PATCH] Wrong version --- .docker/docker-compose.yml | 20 ++++++++++---------- .docs/index.md | 2 +- .docs/installation.md | 6 +++--- .docs/kubernetes.md | 4 ++-- .docs/redirect.html | 6 +++--- Makefile | 4 ++-- README.md | 2 +- dbrepo-analyse-service/Pipfile | 2 +- dbrepo-analyse-service/Pipfile.lock | 2 +- dbrepo-analyse-service/app.py | 4 ++-- dbrepo-data-service/pom.xml | 2 +- dbrepo-metadata-service/pom.xml | 4 ++-- dbrepo-search-service/Pipfile | 2 +- dbrepo-search-service/Pipfile.lock | 2 +- dbrepo-search-service/app.py | 4 ++-- helm/dbrepo-mariadb-galera/Chart.yaml | 6 +++--- helm/dbrepo/Chart.lock | 2 +- helm/dbrepo/Chart.yaml | 8 ++++---- helm/dbrepo/README.md | 8 ++++---- helm/dbrepo/values.yaml | 14 +++++++------- install.sh | 2 +- lib/python/README.md | 10 +++++----- lib/python/docs/index.rst | 2 +- lib/python/pyproject.toml | 6 +++--- lib/python/setup.py | 4 ++-- mkdocs.yml | 4 ++-- sonar-project.properties | 2 +- versions.json | 5 ----- 28 files changed, 67 insertions(+), 72 deletions(-) diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index 1b826fedfd..d94925aa58 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.4.6 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.4.6 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.4.6 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.4.6 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.4.6 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.4.6 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.4.6 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.4.6 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.4.6 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.4.6 volumes: - "${SHARED_VOLUME:-/tmp}:/tmp" environment: diff --git a/.docs/index.md b/.docs/index.md index f24d5c598e..9142377a93 100644 --- a/.docs/index.md +++ b/.docs/index.md @@ -8,7 +8,7 @@ author: Martin Weise [](https://hub.docker.com/u/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.4.6](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 024d39bcd4..5f9a45199a 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.4.6/install.sh | bash ``` !!! bug "Default installation security disclaimer" @@ -39,7 +39,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.4.6/install.sh | DOWNLOAD_ONLY=1 bash ``` ### Static Configuration @@ -81,7 +81,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.4.6/.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 2384f61d04..58d1dbc9a6 100644 --- a/.docs/kubernetes.md +++ b/.docs/kubernetes.md @@ -7,7 +7,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.4.6/helm/dbrepo/values.yaml) for your deployment and update the variables, especially `hostname`. ```shell @@ -15,7 +15,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.4.6" \ --create-namespace \ --cleanup-on-fail ``` diff --git a/.docs/redirect.html b/.docs/redirect.html index 3f3b8027ad..035de3cbfe 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.4.6/'" /> </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.4.6</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.4.6/">/infrastructures/dbrepo/1.4.6/</a> </p> </body> </html> \ No newline at end of file diff --git a/Makefile b/Makefile index 3300a5061d..8c85acc01e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .PHONY: all -APP_VERSION ?= 1.4.7 -CHART_VERSION ?= 1.4.7 +APP_VERSION ?= 1.4.6 +CHART_VERSION ?= 1.4.6 REPOSITORY_URL ?= registry.datalab.tuwien.ac.at/dbrepo .PHONY: all diff --git a/README.md b/README.md index 06f03b6010..1c51793eb9 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,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.4.6/install.sh | bash ``` ## Documentation diff --git a/dbrepo-analyse-service/Pipfile b/dbrepo-analyse-service/Pipfile index 20769992f7..158a03e2d1 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.4.6.tar.gz"} opensearch-py = "*" [dev-packages] diff --git a/dbrepo-analyse-service/Pipfile.lock b/dbrepo-analyse-service/Pipfile.lock index bcff34a23e..7e394ff5f7 100644 --- a/dbrepo-analyse-service/Pipfile.lock +++ b/dbrepo-analyse-service/Pipfile.lock @@ -443,7 +443,7 @@ "sha256:84607677b0826bb9b2fa120aacdf56d16c8d9ae423f435b2bd2c22b1c965a33c" ], "markers": "python_version >= '3.11'", - "path": "./lib/dbrepo-1.4.7.tar.gz" + "path": "./lib/dbrepo-1.4.6.tar.gz" }, "events": { "hashes": [ diff --git a/dbrepo-analyse-service/app.py b/dbrepo-analyse-service/app.py index aa9a42096c..6518265581 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.4.6", "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.4.6/" }, "servers": [ { diff --git a/dbrepo-data-service/pom.xml b/dbrepo-data-service/pom.xml index 6517de4746..9aefac5d75 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.4.6</version> <description>Service that manages the data</description> diff --git a/dbrepo-metadata-service/pom.xml b/dbrepo-metadata-service/pom.xml index a2de622dca..357275f5ab 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.4.6</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.4.6/</url> <developers> <developer> <name>Martin Weise</name> diff --git a/dbrepo-search-service/Pipfile b/dbrepo-search-service/Pipfile index e74391ce66..629de6aec2 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.4.6.tar.gz"} gunicorn = "*" [dev-packages] diff --git a/dbrepo-search-service/Pipfile.lock b/dbrepo-search-service/Pipfile.lock index 123e864f6d..e629543836 100644 --- a/dbrepo-search-service/Pipfile.lock +++ b/dbrepo-search-service/Pipfile.lock @@ -390,7 +390,7 @@ "hashes": [ "sha256:84607677b0826bb9b2fa120aacdf56d16c8d9ae423f435b2bd2c22b1c965a33c" ], - "path": "./lib/dbrepo-1.4.7.tar.gz" + "path": "./lib/dbrepo-1.4.6.tar.gz" }, "docker": { "hashes": [ diff --git a/dbrepo-search-service/app.py b/dbrepo-search-service/app.py index 7566178526..4378f551b8 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.4.6", "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.4.6/" }, "servers": [ { diff --git a/helm/dbrepo-mariadb-galera/Chart.yaml b/helm/dbrepo-mariadb-galera/Chart.yaml index f39aa49157..ea78bb1af2 100644 --- a/helm/dbrepo-mariadb-galera/Chart.yaml +++ b/helm/dbrepo-mariadb-galera/Chart.yaml @@ -6,14 +6,14 @@ description: Helm Chart for installing DBRepo Data Database sources: - https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services type: application -version: "1.4.7" -appVersion: "1.4.7" +version: "1.4.6" +appVersion: "1.4.6" keywords: - dbrepo maintainers: - name: Martin Weise email: martin.weise@tuwien.ac.at -home: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/ +home: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.6/ icon: https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/master/dbrepo-ui/public/favicon.png dependencies: - name: mariadb-galera diff --git a/helm/dbrepo/Chart.lock b/helm/dbrepo/Chart.lock index da97fe0213..0e60aab052 100644 --- a/helm/dbrepo/Chart.lock +++ b/helm/dbrepo/Chart.lock @@ -7,7 +7,7 @@ dependencies: version: 21.6.1 - name: dbrepo-mariadb-galera repository: file://../dbrepo-mariadb-galera - version: 1.4.7 + version: 1.4.6 - name: mariadb-galera repository: https://charts.bitnami.com/bitnami version: 10.1.3 diff --git a/helm/dbrepo/Chart.yaml b/helm/dbrepo/Chart.yaml index a08ce5859e..52747e48af 100644 --- a/helm/dbrepo/Chart.yaml +++ b/helm/dbrepo/Chart.yaml @@ -6,14 +6,14 @@ 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.4.6" +appVersion: "1.4.6" keywords: - dbrepo maintainers: - name: Martin Weise email: martin.weise@tuwien.ac.at -home: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/ +home: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.6/ icon: https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/master/dbrepo-ui/public/favicon.png dependencies: - name: opensearch @@ -28,7 +28,7 @@ dependencies: condition: authservice.enabled - name: dbrepo-mariadb-galera alias: datadb - version: 1.4.7 + version: 1.4.6 repository: file://../dbrepo-mariadb-galera condition: datadb.enabled - name: mariadb-galera diff --git a/helm/dbrepo/README.md b/helm/dbrepo/README.md index 8c479003df..4e4e7d6ffe 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.4.6/) 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.4.6/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.4.6" ``` ## 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.4.6" ``` The command deploys DBRepo on the Kubernetes cluster in the default configuration. The Parameters section lists the diff --git a/helm/dbrepo/values.yaml b/helm/dbrepo/values.yaml index cb60ce9de5..2ad96ddaee 100644 --- a/helm/dbrepo/values.yaml +++ b/helm/dbrepo/values.yaml @@ -285,7 +285,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.4.6 ## @skip analyseservice.image.pullPolicy pullPolicy: Always ## @param analyseservice.image.debug Set the logging level to `trace`. Otherwise, set to `info`. @@ -347,7 +347,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.4.6 ## @skip metadataservice.image.pullPolicy pullPolicy: Always ## @param metadataservice.image.debug Set the logging level to `trace`. Otherwise, set to `info`. @@ -446,7 +446,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.4.6 ## @skip dataservice.image.pullPolicy pullPolicy: Always ## @param dataservice.image.debug Set the logging level to `trace`. Otherwise, set to `info`. @@ -533,7 +533,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.4.6 ## @skip searchservice.image.pullPolicy pullPolicy: Always ## @param searchservice.image.debug Set the logging level to `trace`. Otherwise, set to `info`. @@ -582,7 +582,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.4.6 pullPolicy: Always ## @param searchservice.replicaCount The number of replicas. replicaCount: 2 @@ -630,7 +630,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.4.6 pullPolicy: Always ## @section Identity Service @@ -693,7 +693,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.4.6 ## @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 03974502c2..bce01f0ec3 100644 --- a/install.sh +++ b/install.sh @@ -1,7 +1,7 @@ #!/bin/bash # preset -VERSION="1.4.7" +VERSION="1.4.6" MIN_CPU=8 MIN_RAM=4 MIN_MAP_COUNT=262144 diff --git a/lib/python/README.md b/lib/python/README.md index ccf6e82dd1..d3db052010 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.4.6/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.4.6/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.4.6/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.4.6/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.4.6/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 d535a0b2d3..6348ed12d3 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.4.6/api/>`_. AMQP API Client ----------- diff --git a/lib/python/pyproject.toml b/lib/python/pyproject.toml index 4e6642658b..2989dd3874 100644 --- a/lib/python/pyproject.toml +++ b/lib/python/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "dbrepo" -version = "1.4.7" +version = "1.4.6" 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.4.6/" +Documentation = "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.6/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 8d68681823..b92f73d34f 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.4.6", 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.4.6/", author="Martin Weise", license="Apache-2.0", author_email="martin.weise@tuwien.ac.at", diff --git a/mkdocs.yml b/mkdocs.yml index 28f04c8365..9c3371bcce 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.4.6/ 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.4.6 provider: mike social: - icon: simple/artifacthub diff --git a/sonar-project.properties b/sonar-project.properties index d034d57b10..38f25dba31 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.4.6 # general sonar.qualitygate.wait=true sonar.projectCreation.mainBranchName=master diff --git a/versions.json b/versions.json index 760242683e..435f8c56e8 100644 --- a/versions.json +++ b/versions.json @@ -1,9 +1,4 @@ [ - { - "version": "1.4.7", - "title": "1.4.7", - "aliases": [] - }, { "version": "1.4.6", "title": "1.4.6", -- GitLab