From 887185b4f77595ccb74758792b6114ece0b1f3be Mon Sep 17 00:00:00 2001 From: aschroed Date: Thu, 3 Aug 2023 12:27:11 -0400 Subject: [PATCH 1/5] adding suggested enum values to bcc for muscle cells --- CHANGELOG.rst | 5 +++++ pyproject.toml | 2 +- src/encoded/schemas/biosample_cell_culture.json | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 42fdeb61cf..9bd8f2324d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,11 @@ fourfront Change Log ---------- +6.1.1 +===== + +* add muscle cell values to bcc suggested enums + 6.1.0 ===== * Fix for MIME type ordering in renderers.py (differs between cgap and fourfront). diff --git a/pyproject.toml b/pyproject.toml index e83a198412..33035a84bd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [tool.poetry] # Note: Various modules refer to this system as "encoded", not "fourfront". name = "encoded" -version = "6.1.0" +version = "6.1.1" description = "4DN-DCIC Fourfront" authors = ["4DN-DCIC Team "] license = "MIT" diff --git a/src/encoded/schemas/biosample_cell_culture.json b/src/encoded/schemas/biosample_cell_culture.json index 4036c3c4c3..a15e4a24e6 100644 --- a/src/encoded/schemas/biosample_cell_culture.json +++ b/src/encoded/schemas/biosample_cell_culture.json @@ -144,6 +144,9 @@ "hepatoblast", "hepatocyte", "mesoderm", + "muscle cell", + "muscle precursor cell", + "myoblast", "neural progenitor cell", "neuronal stem cell", "pancreatic endoderm", From 5fb00be909122b0c460f364e65ce09d7caf3bc34 Mon Sep 17 00:00:00 2001 From: William Ronchetti Date: Thu, 3 Aug 2023 12:31:06 -0400 Subject: [PATCH 2/5] add purge fix --- src/encoded/project/authentication.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/encoded/project/authentication.py b/src/encoded/project/authentication.py index 48d0f51f99..24cea131d1 100644 --- a/src/encoded/project/authentication.py +++ b/src/encoded/project/authentication.py @@ -10,7 +10,7 @@ def login(self, context, request, *, samesite): return super().login(context, request, samesite=samesite) def namespaced_authentication_policy_authenticated_userid(self, namespaced_authentication_policy, request, set_user_info_property): - set_user_info_property = False + set_user_info_property = True return super().namespaced_authentication_policy_authenticated_userid(namespaced_authentication_policy, request, set_user_info_property) def note_auth0_authentication_policy_unauthenticated_userid(self, auth0_authentication_policy, request, email, id_token): From f61af6b9b2ef3f01c2be51ee6f1c9d1b937a5a45 Mon Sep 17 00:00:00 2001 From: William Ronchetti Date: Thu, 3 Aug 2023 12:39:38 -0400 Subject: [PATCH 3/5] changelog entry --- CHANGELOG.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9bd8f2324d..3e1430e63a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,6 +10,8 @@ Change Log ===== * add muscle cell values to bcc suggested enums +* Repair user_info resolution bug + 6.1.0 ===== From f71f11466232fbee2195dc8885dbe08ff324ab60 Mon Sep 17 00:00:00 2001 From: aschroed Date: Thu, 3 Aug 2023 12:50:32 -0400 Subject: [PATCH 4/5] update changelog with PR --- CHANGELOG.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 3e1430e63a..6f6babd4f5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,6 +9,8 @@ Change Log 6.1.1 ===== +`suggested enums and purge fix `_ + * add muscle cell values to bcc suggested enums * Repair user_info resolution bug From 543d926a8007410d73b221ca8e07a6a8c840984c Mon Sep 17 00:00:00 2001 From: William Ronchetti Date: Thu, 3 Aug 2023 13:20:25 -0400 Subject: [PATCH 5/5] lock working snovault --- poetry.lock | 8 ++++---- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/poetry.lock b/poetry.lock index 59aadac269..161a3a4dc0 100644 --- a/poetry.lock +++ b/poetry.lock @@ -940,14 +940,14 @@ tox = ["tox"] [[package]] name = "dcicsnovault" -version = "9.1.0" +version = "9.1.1" description = "Storage support for 4DN Data Portals." category = "main" optional = false python-versions = ">=3.8.1,<3.10" files = [ - {file = "dcicsnovault-9.1.0-py3-none-any.whl", hash = "sha256:e21558f5c9152f120ca4eca67d2846a4668b6fc915b070fbba35436d258460f3"}, - {file = "dcicsnovault-9.1.0.tar.gz", hash = "sha256:d703b893719ec5c35d390ad4e986066acbc250ad5dcb5f4e09621e33156a2066"}, + {file = "dcicsnovault-9.1.1-py3-none-any.whl", hash = "sha256:6b9b7958a9b3a19d42a6efb0c817fdc661789dbfbf0607e80e66d9e90aee5449"}, + {file = "dcicsnovault-9.1.1.tar.gz", hash = "sha256:33c6996682d08417254fa499965d4f19fee2e1a8ffdda50e3cb14fcab84ad456"}, ] [package.dependencies] @@ -3652,4 +3652,4 @@ test = ["zope.testing"] [metadata] lock-version = "2.0" python-versions = ">=3.8.1,<3.10" -content-hash = "4bb05401124ce15c450a6e05b44864f37d66f2a01210560ab9811f23d15f4ece" +content-hash = "181f301e70f9786d5b7caabfe299eadf8980ba71c8568ccb728a569802f05465" diff --git a/pyproject.toml b/pyproject.toml index 33035a84bd..772f4f4bf1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,7 +47,7 @@ colorama = "0.3.3" # we get odd 'pyo3_runtime.PanicException: Python API call failed' error on import # of cryptography.hazmat.bindings._rust in cryptography package. 2023-04-21. cryptography = "39.0.2" -dcicsnovault = "^9.1.0" +dcicsnovault = "^9.1.1" dcicutils = "^7.5.0" elasticsearch = "7.13.4" elasticsearch-dsl = "^7.0.0" # TODO: port code from cgap-portal to get rid of uses