Merge branch 'main' into 3774-fix-missing-required-field-should-not-t…

…hrow-error
microsoft · Feb 20, 2024 · 0ce2235 · 0ce2235
2 parents ff7c322 + b40e4e7
commit 0ce2235
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 13 deletions.
diff --git a/.github/workflows/deploy_tre_reusable.yml b/.github/workflows/deploy_tre_reusable.yml
@@ -385,8 +385,6 @@ jobs:
              BUNDLE_DIR: "./templates/workspace_services/guacamole"}
           - {BUNDLE_TYPE: "workspace_service",
              BUNDLE_DIR: "./templates/workspace_services/azureml"}
-          - {BUNDLE_TYPE: "workspace_service",
-             BUNDLE_DIR: "./templates/workspace_services/innereye"}
           - {BUNDLE_TYPE: "workspace_service",
              BUNDLE_DIR: "./templates/workspace_services/gitea"}
           - {BUNDLE_TYPE: "workspace_service",
@@ -546,8 +544,6 @@ jobs:
              BUNDLE_DIR: "./templates/workspace_services/guacamole"}
           - {BUNDLE_TYPE: "workspace_service",
              BUNDLE_DIR: "./templates/workspace_services/azureml"}
-          - {BUNDLE_TYPE: "workspace_service",
-             BUNDLE_DIR: "./templates/workspace_services/innereye"}
           - {BUNDLE_TYPE: "workspace_service",
              BUNDLE_DIR: "./templates/workspace_services/gitea"}
           - {BUNDLE_TYPE: "workspace_service",

diff --git a/api_app/requirements.txt b/api_app/requirements.txt
@@ -1,4 +1,4 @@
-aiohttp==3.9.0
+aiohttp==3.9.3
 azure-core==1.29.5
 azure-cosmos==4.5.1
 azure-eventgrid==4.15.0

diff --git a/cli/requirements.txt b/cli/requirements.txt
@@ -8,4 +8,4 @@ pygments==2.16.1
 PyJWT==2.8.0
 azure-cli-core==2.50.0
 azure-identity==1.14.1
-aiohttp==3.9.0
+aiohttp==3.9.3
diff --git a/cli/setup.py b/cli/setup.py
@@ -4,7 +4,7 @@
 from setuptools import setup
 
 PROJECT = 'azure-tre-cli'
-VERSION = '0.2.0'
+VERSION = '0.2.1'
 
 try:
     long_description = open('README.md', 'rt').read()
@@ -49,7 +49,7 @@
         "PyJWT==2.8.0",
         "azure-cli-core==2.50.0",
         "azure-identity==1.14.1",
-        "aiohttp==3.9.0"
+        "aiohttp==3.9.3"
     ],
 
     namespace_packages=[],

diff --git a/e2e_tests/resources/strings.py b/e2e_tests/resources/strings.py
@@ -14,7 +14,6 @@
 AIRLOCK_IMPORT_REVIEW_WORKSPACE = "tre-workspace-airlock-import-review"
 
 AZUREML_SERVICE = "tre-service-azureml"
-INNEREYE_SERVICE = "tre-service-innereye"
 GUACAMOLE_SERVICE = "tre-service-guacamole"
 GITEA_SERVICE = "tre-workspace-service-gitea"
 MLFLOW_SERVICE = "tre-service-mlflow"

diff --git a/e2e_tests/test_workspace_service_templates.py b/e2e_tests/test_workspace_service_templates.py
@@ -13,7 +13,6 @@
 workspace_service_templates = [
     (strings.AZUREML_SERVICE),
     (strings.GUACAMOLE_SERVICE),
-    (strings.INNEREYE_SERVICE),
     (strings.GITEA_SERVICE)
 ]
 

diff --git a/e2e_tests/test_workspace_services.py b/e2e_tests/test_workspace_services.py
@@ -9,7 +9,6 @@
 
 workspace_services = [
     strings.AZUREML_SERVICE,
-    # strings.INNEREYE_SERVICE,
     strings.GITEA_SERVICE,
     strings.MLFLOW_SERVICE,
     strings.MYSQL_SERVICE,

diff --git a/resource_processor/_version.py b/resource_processor/_version.py
@@ -1 +1 @@
-__version__ = "0.8.2"
+__version__ = "0.8.3"
diff --git a/resource_processor/vmss_porter/requirements.txt b/resource_processor/vmss_porter/requirements.txt
@@ -1,4 +1,4 @@
-aiohttp==3.9.0
+aiohttp==3.9.3
 azure-cli-core==2.50.0
 azure-identity==1.14.1
 azure-monitor-opentelemetry==1.1.1