bump to 2.0.2

neuroforgede · May 26, 2023 · ae6df8a · ae6df8a
1 parent 8da508f
commit ae6df8a
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 31 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -73,9 +73,9 @@ jobs:
 
       - name: "Run Skipper Tests"
         run: |
-          export SKIPPER_DOCKER_IMAGE="ghcr.io/neuroforgede/nfcompose-skipper:2.0.1"
+          export SKIPPER_DOCKER_IMAGE="ghcr.io/neuroforgede/nfcompose-skipper:2.0.2"
           # skipper_proxy is still in the default place, but we dont push it in this pipeline
-          export SKIPPER_PROXY_DOCKER_IMAGE="ghcr.io/neuroforgede/nfcompose-skipper-proxy:2.0.1"
+          export SKIPPER_PROXY_DOCKER_IMAGE="ghcr.io/neuroforgede/nfcompose-skipper-proxy:2.0.2"
 
           cd skipper
           exec python3 build.py \
@@ -88,9 +88,9 @@ jobs:
         run: |
           export NFCOMPOSE_SETUP_SKIP_PULL="yes"
           export COMPOSE_PROJECT_NAME="ci_test_unit_tests"
-          export SKIPPER_DOCKER_IMAGE="ghcr.io/neuroforgede/nfcompose-skipper:2.0.1"
+          export SKIPPER_DOCKER_IMAGE="ghcr.io/neuroforgede/nfcompose-skipper:2.0.2"
           # skipper_proxy is still in the default place, but we dont push it in this pipeline
-          export SKIPPER_PROXY_DOCKER_IMAGE="ghcr.io/neuroforgede/nfcompose-skipper-proxy:2.0.1"
+          export SKIPPER_PROXY_DOCKER_IMAGE="ghcr.io/neuroforgede/nfcompose-skipper-proxy:2.0.2"
 
           cd client
           bash ci_test.sh || exit 1

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -101,8 +101,8 @@ jobs:
 
       - name: "Build Skipper"
         run: |
-          export SKIPPER_DOCKER_IMAGE="ghcr.io/neuroforgede/nfcompose-skipper:2.0.1"
-          export SKIPPER_PROXY_DOCKER_IMAGE="ghcr.io/neuroforgede/nfcompose-skipper-proxy:2.0.1"
+          export SKIPPER_DOCKER_IMAGE="ghcr.io/neuroforgede/nfcompose-skipper:2.0.2"
+          export SKIPPER_PROXY_DOCKER_IMAGE="ghcr.io/neuroforgede/nfcompose-skipper-proxy:2.0.2"
 
           cd skipper
           exec python3 build.py \
@@ -114,8 +114,8 @@ jobs:
         run: |
           export NFCOMPOSE_SETUP_SKIP_PULL="yes"
           export COMPOSE_PROJECT_NAME="ci_test_unit_tests"
-          export SKIPPER_DOCKER_IMAGE="ghcr.io/neuroforgede/nfcompose-skipper:2.0.1"
-          export SKIPPER_PROXY_DOCKER_IMAGE="ghcr.io/neuroforgede/nfcompose-skipper-proxy:2.0.1"
+          export SKIPPER_DOCKER_IMAGE="ghcr.io/neuroforgede/nfcompose-skipper:2.0.2"
+          export SKIPPER_PROXY_DOCKER_IMAGE="ghcr.io/neuroforgede/nfcompose-skipper-proxy:2.0.2"
 
           cd client
           bash ci_test.sh || exit 1
@@ -137,12 +137,12 @@ jobs:
       - name: "zip deploy/local folder"
         run: |
           cd deploy
-          zip -r deploy-local-2.0.1.zip local/
+          zip -r deploy-local-2.0.2.zip local/
 
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
         with:
           files: |
-            ./client/dist/compose_client-2.0.1.tar.gz
-            deploy/deploy-local-2.0.1.zip
+            ./client/dist/compose_client-2.0.2.tar.gz
+            deploy/deploy-local-2.0.2.zip
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.0.1
+    NF Compose CLI - version: 2.0.2
     """
     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.0.1'
+USER_AGENT = 'compose_cli 2.0.2'
 
 def credentials_cache(ttl: datetime.timedelta = datetime.timedelta(minutes=2)) -> \
     Callable[

diff --git a/client/liccheck.ini b/client/liccheck.ini
@@ -13,7 +13,7 @@ unauthorized_licenses:
         gpl v3
 
 [Authorized Packages]
-        compose-client==2.0.1
+        compose-client==2.0.2
         # has artistic license, but is dual licensed
         # if this fails, please check current state of license
         text-unidecode==1.3
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.0.1",
+    version="2.0.2",
     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.0.1}"
+    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.0.2}"
     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.0.1}"
+    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.0.2}"
     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.0.1}"
+    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.0.2}"
     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.0.1}"
+    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.0.2}"
     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.0.1}"
+    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.0.2}"
     networks:
       postgres: {}
       nfcompose:
@@ -144,7 +144,7 @@ services:
     restart: unless-stopped
 
   nfcomposeskipperproxy:
-    image: "${SKIPPER_PROXY_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper-proxy:2.0.1}"
+    image: "${SKIPPER_PROXY_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper-proxy:2.0.2}"
     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.0.1'
+USER_AGENT = 'integration_test compose 2.0.2'
 
 
 class APIClient(abc.ABC):

diff --git a/deploy/production/docker-compose/docker-compose.yml b/deploy/production/docker-compose/docker-compose.yml
@@ -136,7 +136,7 @@ services:
           - "nodered.local"
 
   consumer_gateway:
-    image: "${SKIPPER_PROXY_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-consumer-gateway:2.0.1}"
+    image: "${SKIPPER_PROXY_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-consumer-gateway:2.0.2}"
     restart: unless-stopped
     networks:
       postgres:
@@ -151,7 +151,7 @@ services:
       start_period: 1s
 
   skipper:
-    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.0.1}"
+    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.0.2}"
     restart: unless-stopped
     networks:
       postgres:
@@ -164,7 +164,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.0.1}"
+    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.0.2}"
     restart: unless-stopped
     networks:
       postgres:
@@ -177,7 +177,7 @@ services:
       SKIPPER_DJANGO_EXTRA_ALLOWED_HOSTS: "skipper.internal.local"
 
   skipper_celery:
-    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.0.1}"
+    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.0.2}"
     restart: unless-stopped
     networks:
       - postgres
@@ -190,7 +190,7 @@ services:
       SKIPPER_CONTAINER_TYPE: "CELERY"
 
   skipper_celery_beat:
-    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.0.1}"
+    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.0.2}"
     restart: unless-stopped
     networks:
       - postgres
@@ -207,7 +207,7 @@ services:
       SKIPPER_CONTAINER_TYPE: "CELERY_BEAT"
 
   skipper_task_dashboard:
-    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.0.1}"
+    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.0.2}"
     restart: unless-stopped
     networks:
       postgres: {}
@@ -219,7 +219,7 @@ services:
       SKIPPER_CONTAINER_TYPE: "TASK_DASHBOARD"
 
   skipper_proxy:
-    image: "${SKIPPER_PROXY_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper-proxy:2.0.1}"
+    image: "${SKIPPER_PROXY_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper-proxy:2.0.2}"
     environment:
       SKIPPER_BACKEND_SERVICE: "skipper.local"
       SKIPPER_BACKEND_SERVICE_PORT: "8000"
@@ -267,7 +267,7 @@ services:
 
         python manage.py collectstatic --noinput
         check_result "failed to collect static files"
-    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.0.1}"
+    image: "${SKIPPER_DOCKER_IMAGE:-ghcr.io/neuroforgede/nfcompose-skipper:2.0.2}"
     environment:
       # force rerun everytime
       DEPLOY_DATE: "${DEPLOY_DATE}"

diff --git a/skipper/buildinfo/version.py b/skipper/buildinfo/version.py
@@ -1,6 +1,6 @@
 major_version = "2"
 minor_version = "0"
-patch_version = "1"
+patch_version = "2"
 suffix_version = ""
 
 major_version_string = f"{major_version}{suffix_version}"