Merge pull request #122 from neuroforgede/wip/make_compose_client_bac…

…kwards_compatible#main bump to 2.2.6
neuroforgede · Apr 19, 2024 · f17245f · f17245f
2 parents 9a0e014 + eb0257c
commit f17245f
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -145,7 +145,7 @@ jobs:
           source venv/bin/activate
           (bash install_dev_dependencies.sh && python3 setup.py sdist) || exit 1
           # copy into separate file to prevent issues where the source and target are the same
-          mv dist/compose_client-2.2.5*.tar.gz dist/release.tar.gz
+          mv dist/compose_client-2.2.6*.tar.gz dist/release.tar.gz
           mv dist/release.tar.gz dist/compose_client-$RELEASE_VERSION.tar.gz
 
       - name: "zip deploy/local folder"

diff --git a/client/compose_client/cli/main.py b/client/compose_client/cli/main.py
@@ -29,7 +29,7 @@
 @click.group()
 def cli() -> None:
     """
-    NF Compose CLI - version: 2.2.5
+    NF Compose CLI - version: 2.2.6
     """
     pass
 

diff --git a/client/compose_client/library/connection/client.py b/client/compose_client/library/connection/client.py
@@ -22,7 +22,7 @@
 import datetime
 
 
-USER_AGENT = 'compose_cli 2.2.5'
+USER_AGENT = 'compose_cli 2.2.6'
 
 
 class APIClient(abc.ABC):

diff --git a/client/setup.py b/client/setup.py
@@ -20,7 +20,7 @@ def cli_test_suite():
 setuptools.setup(
     name="compose_client",
     scripts=['bin/compose_cli'],
-    version="2.2.5",
+    version="2.2.6",
     author="NeuroForge GmbH & Co. KG",
     author_email="kontakt@neuroforge.de",
     description="NF Compose package",

diff --git a/deploy/local/compose/docker-compose.yml b/deploy/local/compose/docker-compose.yml
@@ -44,7 +44,7 @@ services:
     restart: unless-stopped
 
   nfcomposeskipper:
-    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.5}"
+    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.6}"
     networks:
       postgres:
       nfcompose:
@@ -66,7 +66,7 @@ services:
 
   # inside facing container used for separating internal requests so that outside requests are not harmed by etl jobs
   nfcomposeskipper_internal:
-    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.5}"
+    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.6}"
     networks:
       postgres:
       nfcompose:
@@ -86,7 +86,7 @@ services:
         SKIPPER_TASK_DASHBOARD_UPSTREAM: "http://skipper.task.dashboard.${INTERNAL_DOMAIN_SUFFIX:-test.local}:5555"
 
   nfcompose_skipper_celery:
-    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.5}"
+    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.6}"
     networks:
       - postgres
       - nfcompose
@@ -104,7 +104,7 @@ services:
     restart: unless-stopped
 
   nfcompose_skipper_celery_beat:
-    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.5}"
+    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.6}"
     networks:
       - postgres
       - nfcompose
@@ -126,7 +126,7 @@ services:
     restart: unless-stopped
 
   nfcompose_skipper_task_dashboard:
-    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.5}"
+    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.6}"
     networks:
       postgres: {}
       nfcompose:
@@ -144,7 +144,7 @@ services:
     restart: unless-stopped
 
   nfcomposeskipperproxy:
-    image: "${SKIPPER_PROXY_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper-proxy:2.2.5}"
+    image: "${SKIPPER_PROXY_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper-proxy:2.2.6}"
     restart: unless-stopped
     depends_on:
       - nfcomposeskipper

diff --git a/deploy/local/integration/library/client.py b/deploy/local/integration/library/client.py
@@ -17,7 +17,7 @@
 from library.types import JSONType
 
 
-USER_AGENT = 'integration_test compose 2.2.5'
+USER_AGENT = 'integration_test compose 2.2.6'
 
 
 class APIClient(abc.ABC):

diff --git a/deploy/production/docker-compose/docker-compose.yml b/deploy/production/docker-compose/docker-compose.yml
@@ -148,7 +148,7 @@ services:
           - "nodered.local"
 
   consumer_gateway:
-    image: "${SKIPPER_CONSUMER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-consumer-gateway:2.2.5}"
+    image: "${SKIPPER_CONSUMER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-consumer-gateway:2.2.6}"
     restart: unless-stopped
     networks:
       postgres:
@@ -163,7 +163,7 @@ services:
       start_period: 1s
 
   skipper:
-    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.5}"
+    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.6}"
     restart: unless-stopped
     networks:
       postgres:
@@ -179,7 +179,7 @@ services:
 
   # inside facing container used for separating internal requests so that outside requests are not harmed by etl jobs
   skipper_internal:
-    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.5}"
+    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.6}"
     restart: unless-stopped
     networks:
       postgres:
@@ -195,7 +195,7 @@ services:
       SKIPPER_DJANGO_EXTRA_ALLOWED_HOSTS: "skipper.internal.local"
 
   skipper_celery:
-    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.5}"
+    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.6}"
     restart: unless-stopped
     networks:
       - postgres
@@ -208,7 +208,7 @@ services:
       SKIPPER_CONTAINER_TYPE: "CELERY"
 
   skipper_celery_beat:
-    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.5}"
+    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.6}"
     restart: unless-stopped
     networks:
       - postgres
@@ -225,7 +225,7 @@ services:
       SKIPPER_CONTAINER_TYPE: "CELERY_BEAT"
 
   skipper_task_dashboard:
-    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.5}"
+    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.6}"
     restart: unless-stopped
     networks:
       postgres: {}
@@ -237,7 +237,7 @@ services:
       SKIPPER_CONTAINER_TYPE: "TASK_DASHBOARD"
 
   skipper_proxy:
-    image: "${SKIPPER_PROXY_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper-proxy:2.2.5}"
+    image: "${SKIPPER_PROXY_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper-proxy:2.2.6}"
     environment:
       SKIPPER_BACKEND_SERVICE: "skipper.local"
       SKIPPER_BACKEND_SERVICE_PORT: "8000"
@@ -281,7 +281,7 @@ services:
 
         python manage.py collectstatic --noinput
         check_result "failed to collect static files"
-    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.5}"
+    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.2.6}"
     environment:
       # force rerun everytime
       DEPLOY_DATE: "${DEPLOY_DATE}"