Merge branch 'master' into fs-fix-recursion

* master: Quilt3 v5.4.0 (#3798) Bump cryptography from 41.0.4 to 41.0.6 in /lambdas/es/indexer (#3804)
quiltdata · Nov 29, 2023 · 027b6fa · 027b6fa
2 parents 052d9e0 + 3773477
commit 027b6fa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/api/python/quilt3/VERSION b/api/python/quilt3/VERSION
@@ -1 +1 @@
-5.3.1
+5.4.0
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -14,12 +14,10 @@ Entries inside each section should be ordered by type:
 
 ## Catalog, Lambdas
 !-->
-# unreleased - YYYY-MM-DD
+# 5.4.0 - 2023-11-29
 ## Python API
 * [Added] `create_user()`, `delete_user()`, `set_role()` in `quilt3.admin` ([#3764](https://github.com/quiltdata/quilt/pull/3764))
 
-## CLI
-
 ## Catalog, Lambdas
 * [Fixed] Fixed file preview header layout ([#3454](https://github.com/quiltdata/quilt/pull/3454))
 * [Fixed] Fix getting custom styles and options for files listed in quilt_summarize.json ([#3485](https://github.com/quiltdata/quilt/pull/3485))

diff --git a/lambdas/es/indexer/requirements.txt b/lambdas/es/indexer/requirements.txt
@@ -6,7 +6,7 @@ certifi==2023.7.22
 cffi==1.15.1
 chardet==3.0.4
 charset-normalizer==2.0.12
-cryptography==41.0.4
+cryptography==41.0.6
 decorator==4.4.0
 docutils==0.15.2
 # This is the highest version that's less than our pinned ES version of 6.7