Renaming DACCS to Marble in service-config.json.template files (#372)

## Overview Small change to the location of schema describing node services following the renaming of DACCS to Marble. ## Changes **Non-breaking changes** - Changed https://github.com/DACCS-Climate/DACCS-node-registry to https://github.com/DACCS-Climate/Marble-node-registry in all `service-config.json.template` files. **Breaking changes** None ## Related Issue / Discussion ## Additional Information
bird-house · Sep 13, 2023 · e4789b9 · e4789b9
2 parents 6be0107 + 6bb76a8
commit e4789b9
Show file tree

Hide file tree

Showing 16 changed files with 35 additions and 26 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.31.0
+current_version = 1.31.1
 commit = True
 tag = False
 tag_name = {new_version}
@@ -30,11 +30,11 @@ search = {current_version}
 replace = {new_version}
 
 [bumpversion:file:RELEASE.txt]
-search = {current_version} 2023-09-13T15:40:14Z
+search = {current_version} 2023-09-13T17:50:55Z
 replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}
 
 [bumpversion:part:releaseTime]
-values = 2023-09-13T15:40:14Z
+values = 2023-09-13T17:50:55Z
 
 [bumpversion:file(version):birdhouse/config/canarie-api/docker_configuration.py.template]
 search = 'version': '{current_version}'

diff --git a/CHANGES.md b/CHANGES.md
@@ -17,6 +17,15 @@
 
 [//]: # (list changes here, using '-' for each new entry, remove this when items are added)
 
+[1.31.1](https://github.com/bird-house/birdhouse-deploy/tree/1.31.1) (2023-09-13)
+------------------------------------------------------------------------------------------------------------------
+
+## Changes
+
+- Small change to the location of schema defining services
+  - Changed https://github.com/DACCS-Climate/DACCS-node-registry to https://github.com/DACCS-Climate/Marble-node-registry
+    in all service-config.json.template files.
+
 [1.31.0](https://github.com/bird-house/birdhouse-deploy/tree/1.31.0) (2023-09-13)
 ------------------------------------------------------------------------------------------------------------------
 

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # Generic variables
 override SHELL       := bash
 override APP_NAME    := birdhouse-deploy
-override APP_VERSION := 1.31.0
+override APP_VERSION := 1.31.1
 
 # utility to remove comments after value of an option variable
 override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g")

diff --git a/README.rst b/README.rst
@@ -14,13 +14,13 @@ for a full-fledged production platform.
     * - releases
       - | |latest-version| |commits-since|
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.31.0.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.31.1.svg
     :alt: Commits since latest release
-    :target: https://github.com/bird-house/birdhouse-deploy/compare/1.31.0...master
+    :target: https://github.com/bird-house/birdhouse-deploy/compare/1.31.1...master
 
-.. |latest-version| image:: https://img.shields.io/badge/tag-1.31.0-blue.svg?style=flat
+.. |latest-version| image:: https://img.shields.io/badge/tag-1.31.1-blue.svg?style=flat
     :alt: Latest Tag
-    :target: https://github.com/bird-house/birdhouse-deploy/tree/1.31.0
+    :target: https://github.com/bird-house/birdhouse-deploy/tree/1.31.1
 
 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
     :alt: ReadTheDocs Build Status (latest version)

diff --git a/RELEASE.txt b/RELEASE.txt
@@ -1 +1 @@
-1.31.0 2023-09-13T15:40:14Z
+1.31.1 2023-09-13T17:50:55Z
diff --git a/birdhouse/components/weaver/service-config.json.template b/birdhouse/components/weaver/service-config.json.template
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/DACCS-Climate/DACCS-node-registry/main/node_registry.schema.json#service",
+  "$schema": "https://raw.githubusercontent.com/DACCS-Climate/Marble-node-registry/main/node_registry.schema.json#service",
   "name": "weaver",
   "keywords": [
     "service-ogcapi_processes"

diff --git a/birdhouse/config/canarie-api/docker_configuration.py.template b/birdhouse/config/canarie-api/docker_configuration.py.template
@@ -109,8 +109,8 @@ SERVICES = {
             # NOTE:
             #   Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
             #   Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
-            'version': '1.31.0',
-            'releaseTime': '2023-09-13T15:40:14Z',
+            'version': '1.31.1',
+            'releaseTime': '2023-09-13T17:50:55Z',
             'institution': 'Ouranos',
             'researchSubject': 'Climatology',
             'supportEmail': '${SUPPORT_EMAIL}',
@@ -142,8 +142,8 @@ PLATFORMS = {
             # NOTE:
             #   Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
             #   Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
-            'version': '1.31.0',
-            'releaseTime': '2023-09-13T15:40:14Z',
+            'version': '1.31.1',
+            'releaseTime': '2023-09-13T17:50:55Z',
             'institution': 'Ouranos',
             'researchSubject': 'Climatology',
             'supportEmail': '${SUPPORT_EMAIL}',

diff --git a/birdhouse/config/finch/service-config.json.template b/birdhouse/config/finch/service-config.json.template
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/DACCS-Climate/DACCS-node-registry/main/node_registry.schema.json#service",
+  "$schema": "https://raw.githubusercontent.com/DACCS-Climate/Marble-node-registry/main/node_registry.schema.json#service",
   "name": "finch",
   "keywords": [
     "service-wps"

diff --git a/birdhouse/config/geoserver/service-config.json.template b/birdhouse/config/geoserver/service-config.json.template
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/DACCS-Climate/DACCS-node-registry/main/node_registry.schema.json#service",
+  "$schema": "https://raw.githubusercontent.com/DACCS-Climate/Marble-node-registry/main/node_registry.schema.json#service",
   "name": "geoserver",
   "keywords": [
     "data",

diff --git a/birdhouse/config/hummingbird/service-config.json.template b/birdhouse/config/hummingbird/service-config.json.template
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/DACCS-Climate/DACCS-node-registry/main/node_registry.schema.json#service",
+  "$schema": "https://raw.githubusercontent.com/DACCS-Climate/Marble-node-registry/main/node_registry.schema.json#service",
   "name": "hummingbird",
   "keywords": [
     "service-wps"

diff --git a/birdhouse/config/jupyterhub/service-config.json.template b/birdhouse/config/jupyterhub/service-config.json.template
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/DACCS-Climate/DACCS-node-registry/main/node_registry.schema.json#service",
+  "$schema": "https://raw.githubusercontent.com/DACCS-Climate/Marble-node-registry/main/node_registry.schema.json#service",
   "name": "jupyterhub",
   "keywords": [
     "jupyterhub"

diff --git a/birdhouse/config/raven/service-config.json.template b/birdhouse/config/raven/service-config.json.template
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/DACCS-Climate/DACCS-node-registry/main/node_registry.schema.json#service",
+  "$schema": "https://raw.githubusercontent.com/DACCS-Climate/Marble-node-registry/main/node_registry.schema.json#service",
   "name": "raven",
   "keywords": [
     "service-wps"

diff --git a/birdhouse/config/thredds/service-config.json.template b/birdhouse/config/thredds/service-config.json.template
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/DACCS-Climate/DACCS-node-registry/main/node_registry.schema.json#service",
+  "$schema": "https://raw.githubusercontent.com/DACCS-Climate/Marble-node-registry/main/node_registry.schema.json#service",
   "name": "thredds",
   "keywords": [
     "data",

diff --git a/birdhouse/deprecated-components/flyingpigeon/service-config.json.template b/birdhouse/deprecated-components/flyingpigeon/service-config.json.template
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/DACCS-Climate/DACCS-node-registry/main/node_registry.schema.json#service",
+  "$schema": "https://raw.githubusercontent.com/DACCS-Climate/Marble-node-registry/main/node_registry.schema.json#service",
   "name": "flyingpigeon",
   "keywords": [
     "service-wps"

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -69,9 +69,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.31.0'
+version = '1.31.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.31.0'
+release = '1.31.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/tests/test_deployment.py b/tests/test_deployment.py
@@ -1,10 +1,10 @@
-import os
-import pytest
 import glob
 import json
+import os
 from string import Template
 
 import jsonschema
+import pytest
 import requests
 
 COMPONENT_LOCATIONS = ("components", "optional-components", "config")
@@ -29,7 +29,7 @@ def component_paths(root_dir):
 def services_config_schema():
     branch = os.environ.get("DACCS_NODE_REGISTRY_BRANCH", "main")
     schema = {
-        "$ref": "https://raw.githubusercontent.com/DACCS-Climate/DACCS-node-registry"
+        "$ref": "https://raw.githubusercontent.com/DACCS-Climate/Marble-node-registry"
         f"/{branch}/node_registry.schema.json#service"
     }
     return schema
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		1.31.0 2023-09-13T15:40:14Z
		1.31.1 2023-09-13T17:50:55Z