From b4a76b05e21e4473896205d9c6c44d253c589678 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Thu, 27 Jun 2024 10:21:21 -0400 Subject: [PATCH] python-3.12 --- CHANGELOG.rst | 1 + poetry.lock | 8 ++++---- pyproject.toml | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c98bfa3cd..5d382a007 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -12,6 +12,7 @@ Change Log - Had to update flake8 (from 5.0.4) to 7.1.0. - Had to update lower bound of Python version (from 3.8.0) to 3.8.1. - Had to update pyramid (from 1.10.4) to 2.0.2 (imp import not found). + - Had to update elasticsearch (from 7.13.4) to 7.17.9 (for snovault). 8.12.0 diff --git a/poetry.lock b/poetry.lock index 2dda7842a..0d899b621 100644 --- a/poetry.lock +++ b/poetry.lock @@ -887,14 +887,14 @@ tls = ["cryptography (>=1.3.4)", "idna (>=2.0.0)", "pyOpenSSL (>=17.5.0)"] [[package]] name = "elasticsearch" -version = "7.13.4" +version = "7.17.9" description = "Python client for Elasticsearch" category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4" files = [ - {file = "elasticsearch-7.13.4-py2.py3-none-any.whl", hash = "sha256:5920df0ab2630778680376d86bea349dc99860977eec9b6d2bd0860f337313f2"}, - {file = "elasticsearch-7.13.4.tar.gz", hash = "sha256:52dda85f76eeb85ec873bf9ffe0ba6849e544e591f66d4048a5e48016de268e0"}, + {file = "elasticsearch-7.17.9-py2.py3-none-any.whl", hash = "sha256:0e2454645dc00517dee4c6de3863411a9c5f1955d013c5fefa29123dadc92f98"}, + {file = "elasticsearch-7.17.9.tar.gz", hash = "sha256:66c4ece2adfe7cc120e2b6a6798a1fd5c777aecf82eec39bb95cef7cfc7ea2b3"}, ] [package.dependencies] @@ -2260,4 +2260,4 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"] [metadata] lock-version = "2.0" python-versions = ">=3.8.1,<3.13" -content-hash = "3c23000e46b93ddde7af38da7f60b63ef8876dda4f4fb0a7ace60dad33b047c8" +content-hash = "519b86ecab688d11860b1d223484f9a9b649815d2e50df743f157e0af400672a" diff --git a/pyproject.toml b/pyproject.toml index e4b15a174..aee5b8016 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dcicutils" -version = "8.12.0.1b2" # TODO: To become 8.13.0 +version = "8.12.0.1b3" # TODO: To become 8.13.0 description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources" authors = ["4DN-DCIC Team "] license = "MIT" @@ -43,7 +43,8 @@ boto3 = "^1.34.93" botocore = "^1.34.93" # The DCIC portals (cgap-portal and fourfront) are very particular about which ElasticSearch version. # This value is intentionally pinned and must not be changed casually. -elasticsearch = "7.13.4" +#elasticsearch = "7.13.4" +elasticsearch = "^7.17.9" appdirs = "^1.4.4" aws-requests-auth = ">=0.4.2,<1" chardet = "^5.2.0"