Merge branch 'master' into 8.x

untergeek · Apr 12, 2023 · 5220159 · 5220159
2 parents fae9259 + e13dbf3
commit 5220159
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/docs/Changelog.rst b/docs/Changelog.rst
@@ -3,6 +3,19 @@
 Changelog
 =========
 
+8.7.0 (12 April 2023)
+---------------------
+
+**Announcement**
+
+Apologies for the delayed release. I have had some personal matters that had me
+out of office for several weeks.
+
+**Changes**
+
+  * Bring up to date with Elasticsearch 8.7.0 Python client.
+  * Add ``mock`` to the list of modules for testing
+
 8.6.2.post1 (23 March 2023)
 ---------------------------
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -65,7 +65,7 @@
 
 intersphinx_mapping = {
 	'python': ('https://docs.python.org/3.11', None),
-	'elasticsearch8': ('https://elasticsearch-py.readthedocs.io/en/v8.6.2', None),
+	'elasticsearch8': ('https://elasticsearch-py.readthedocs.io/en/v8.7.0', None),
     'elastic-transport': ('https://elastic-transport-python.readthedocs.io/en/stable', None),
     'voluptuous': ('http://alecthomas.github.io/voluptuous/docs/_build/html', None),
     'click': ('https://click.palletsprojects.com/en/8.1.x', None),

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,4 +1,4 @@
-elasticsearch8==8.6.2
+elasticsearch8==8.7.0
 voluptuous>=0.13.1
 pyyaml==6.0.0
 pint>=0.19.2
diff --git a/es_client/version.py b/es_client/version.py
@@ -1,2 +1,2 @@
 """Release version"""
-__version__ = '8.6.2.post1'
+__version__ = '8.7.0'
diff --git a/pyproject.toml b/pyproject.toml
@@ -26,7 +26,7 @@ keywords = [
     "command-line"
 ]
 dependencies = [
-    "elasticsearch8==8.6.2",
+    "elasticsearch8==8.7.0",
     "click==8.1.3",
     "pyyaml==6.0.0",
     "voluptuous>=0.13.1",
@@ -39,6 +39,7 @@ test = [
     "requests",
     "pytest >=7.2.1",
     "pytest-cov",
+    "mock",
 ]
 doc = ["sphinx", "sphinx_rtd_theme"]
 
@@ -69,4 +70,4 @@ addopts = "-ra -q"
 testpaths = [
     "tests/unit",
     "tests/integration",
-]
+]