From 8a16e71e8fe7b4c4e46755c5cab0c5c3914d287f Mon Sep 17 00:00:00 2001 From: Karol Szuster Date: Tue, 8 Aug 2023 10:24:48 +0200 Subject: [PATCH] Bump version `hdn-research-environment` to `2.3.6` --- .env.example | 4 +--- physionet-django/physionet/settings/base.py | 5 ----- poetry.lock | 6 +++--- pyproject.toml | 2 +- requirements.txt | 4 ++-- 5 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.env.example b/.env.example index ff738bf0f4..bdb593a99e 100644 --- a/.env.example +++ b/.env.example @@ -98,8 +98,6 @@ GCS_SIGNED_URL_LIFETIME_IN_MINUTES=1440 # GCP Research Environments ENABLE_CLOUD_RESEARCH_ENVIRONMENTS="False" CLOUD_RESEARCH_ENVIRONMENTS_API_URL="https://example.api" -CLOUD_RESEARCH_ENVIRONMENTS_API_JWT_SERVICE_ACCOUNT_PATH="environment/api/tests/service_account.json" -CLOUD_RESEARCH_ENVIRONMENTS_API_JWT_AUDIENCE="https://example.com" # Site-specific content SITE_NAME="DataShare" @@ -187,7 +185,7 @@ MIN_WORDS_RESEARCH_SUMMARY_CREDENTIALING = 20 # CITISOAPService API # This is the WebServices username and password to access the CITI SOAP Service to obtain users training report details # The account can be created at https://webservices.citiprogram.org/login/CreateAccount.aspx -# The SOAP Service Access can be tested at https://webservices.citiprogram.org/Client/CITISOAPClient_Simple.aspx +# The SOAP Service Access can be tested at https://webservices.citiprogram.org/Client/CITISOAPClient_Simple.aspx CITI_USERNAME= CITI_PASSWORD= CITI_SOAP_URL="https://webservices.citiprogram.org/SOAP/CITISOAPService.asmx" diff --git a/physionet-django/physionet/settings/base.py b/physionet-django/physionet/settings/base.py index 5e5b0b63b1..ca7cb457f7 100644 --- a/physionet-django/physionet/settings/base.py +++ b/physionet-django/physionet/settings/base.py @@ -576,12 +576,7 @@ class StorageTypes: ENABLE_CLOUD_RESEARCH_ENVIRONMENTS = config('ENABLE_CLOUD_RESEARCH_ENVIRONMENTS', default=False, cast=bool) if ENABLE_CLOUD_RESEARCH_ENVIRONMENTS: - CLOUD_RESEARCH_ENVIRONMENTS_API_JWT_SERVICE_ACCOUNT_PATH = os.path.join( - BASE_DIR, - config('CLOUD_RESEARCH_ENVIRONMENTS_API_JWT_SERVICE_ACCOUNT_PATH') - ) CLOUD_RESEARCH_ENVIRONMENTS_API_URL = config('CLOUD_RESEARCH_ENVIRONMENTS_API_URL') - CLOUD_RESEARCH_ENVIRONMENTS_API_JWT_AUDIENCE = config('CLOUD_RESEARCH_ENVIRONMENTS_API_JWT_AUDIENCE') INSTALLED_APPS.append('environment.apps.EnvironmentConfig') diff --git a/poetry.lock b/poetry.lock index cd8c1f3332..42d230d59c 100644 --- a/poetry.lock +++ b/poetry.lock @@ -754,12 +754,12 @@ protobuf = ">=3.12.0" [[package]] name = "hdn-research-environment" -version = "1.4.0" +version = "2.3.6" description = "A Django app for supporting cloud-native research environments" optional = false python-versions = ">=3.7" files = [ - {file = "hdn-research-environment-1.4.0.tar.gz", hash = "sha256:296a336847c1078c149baa6773654a2e2a5b16cc1b03ca25f6f19f8606980e5b"}, + {file = "hdn-research-environment-2.3.6.tar.gz", hash = "sha256:b28d67db8ba4cf82e1362aefde47d483b549e8f7b96d1d4f56baebe0b76dfc31"}, ] [package.dependencies] @@ -1453,4 +1453,4 @@ files = [ [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "1c680953888a101ede203b84ea510fdb24cd5f1020e668881919f06b59b94cca" +content-hash = "2297d8c676de9b2ac1455227f408f5a45f51a249993c1f72ea56221882937464" diff --git a/pyproject.toml b/pyproject.toml index fafa8f8e48..4a3fbe318c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,7 +36,7 @@ zxcvbn = "^4.4.28" certifi = "^2023.7.22" setuptools = "65.5.1" django-js-asset = "2.0.0" -hdn-research-environment = "^1.4.0" +hdn-research-environment = "2.3.6" django-oauth-toolkit = "^2.2.0" django-cors-headers = "^3.14.0" diff --git a/requirements.txt b/requirements.txt index de39cc6030..8bb56ed7d4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -297,8 +297,8 @@ grpcio==1.53.0 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:f3e837d29f0e1b9d6e7b29d569e2e9b0da61889e41879832ea15569c251c303a \ --hash=sha256:fa8eaac75d3107e3f5465f2c9e3bbd13db21790c6e45b7de1756eba16b050aca \ --hash=sha256:fdc6191587de410a184550d4143e2b24a14df495c86ca15e59508710681690ac -hdn-research-environment==1.4.0 ; python_version >= "3.9" and python_version < "4.0" \ - --hash=sha256:296a336847c1078c149baa6773654a2e2a5b16cc1b03ca25f6f19f8606980e5b +hdn-research-environment==2.3.6 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:b28d67db8ba4cf82e1362aefde47d483b549e8f7b96d1d4f56baebe0b76dfc31 html2text==2018.1.9 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:490db40fe5b2cd79c461cf56be4d39eb8ca68191ae41ba3ba79f6cb05b7dd662 \ --hash=sha256:627514fb30e7566b37be6900df26c2c78a030cc9e6211bda604d8181233bcdd4