Merge branch 'master' into 8.x

elastic · Feb 1, 2023 · e44d4a7 · e44d4a7
2 parents 56971c1 + a13a7b3
commit e44d4a7
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 38 deletions.
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -0,0 +1,21 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+   configuration: docs/conf.py
+
+python:
+  install:
+    - method: pip
+      path: .
diff --git a/docs/Changelog.rst b/docs/Changelog.rst
@@ -241,23 +241,6 @@ This release-candidate is a *major* refactoring of the Curator code to work with
   * Use `urllib3` 1.26.5 or higher #1610 (tsaarni) — This dependency is now fully handled by the
     ``elasticsearch7`` module and not a separate ``urllib3`` import.
 
-5.8.5 (* * *)
--------------
-
-**Announcement**
-
-  * As mentioned in 5.8.4's release notes, `boto3` deprecates support for
-    Python 2.7, and now so does Curator.
-
-**New**
-
-  * Add filter by size feature. #1612 (IndraGunawan)
-  * Update Elasticsearch client to 7.14.0
-
-**Security Fixes**
-
-  * Use `urllib3` 1.26.5 or higher #1610 (tsaarni)
-
 5.8.4 (27 April 2021)
 ---------------------
 

diff --git a/docs/actionclasses.rst b/docs/actionclasses.rst
@@ -27,80 +27,80 @@ Action Classes
 
 Alias
 -----
-.. autoclass:: curator.actions.Alias
+.. autoclass:: curator.actions.alias.Alias
    :members:
 
 Allocation
 ----------
-.. autoclass:: curator.actions.Allocation
+.. autoclass:: curator.actions.allocation.Allocation
   :members:
 
 Close
 -----
-.. autoclass:: curator.actions.Close
+.. autoclass:: curator.actions.close.Close
   :members:
 
 ClusterRouting
 --------------
-.. autoclass:: curator.actions.ClusterRouting
+.. autoclass:: curator.actions.cluster_routing.ClusterRouting
   :members:
 
 CreateIndex
 --------------
-.. autoclass:: curator.actions.CreateIndex
+.. autoclass:: curator.actions.create_index.CreateIndex
   :members:
 
 DeleteIndices
 -------------
-.. autoclass:: curator.actions.DeleteIndices
+.. autoclass:: curator.actions.delete_indices.DeleteIndices
    :members:
 
 DeleteSnapshots
 ---------------
-.. autoclass:: curator.actions.DeleteSnapshots
+.. autoclass:: curator.actions.snapshot.DeleteSnapshots
   :members:
 
 ForceMerge
 ----------
-.. autoclass:: curator.actions.ForceMerge
+.. autoclass:: curator.actions.forcemerge.ForceMerge
   :members:
 
 IndexSettings
 --------------
-.. autoclass:: curator.actions.IndexSettings
+.. autoclass:: curator.actions.index_settings.IndexSettings
   :members:
 
 Open
 ----
-.. autoclass:: curator.actions.Open
+.. autoclass:: curator.actions.open.Open
    :members:
 
 Reindex
 --------
-.. autoclass:: curator.actions.Reindex
+.. autoclass:: curator.actions.reindex.Reindex
   :members:
 
 Replicas
 --------
-.. autoclass:: curator.actions.Replicas
+.. autoclass:: curator.actions.replicas.Replicas
   :members:
 
 Restore
 --------
-.. autoclass:: curator.actions.Restore
+.. autoclass:: curator.actions.snapshot.Restore
   :members:
 
 Rollover
 --------
-.. autoclass:: curator.actions.Rollover
+.. autoclass:: curator.actions.rollover.Rollover
   :members:
 
 Shrink
 --------
-.. autoclass:: curator.actions.Shrink
+.. autoclass:: curator.actions.shrink.Shrink
   :members:
 
 Snapshot
 --------
-.. autoclass:: curator.actions.Snapshot
+.. autoclass:: curator.actions.snapshot.Snapshot
   :members:
diff --git a/docs/conf.py b/docs/conf.py
@@ -54,7 +54,7 @@ def get_version():
 
 intersphinx_mapping = {
 	'python': ('https://docs.python.org/3.11', None),
-	'elasticsearch': ('http://elasticsearch-py.readthedocs.io/en/8.6.1', None),
+	'elasticsearch8': ('https://elasticsearch-py.readthedocs.io/en/v8.6.1', None)
 }
 
 autoclass_content = "both"
@@ -156,7 +156,7 @@ def get_version():
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+# html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.

diff --git a/docs/index.rst b/docs/index.rst
@@ -17,7 +17,7 @@ Compatibility
 -------------
 
 The Elasticsearch Curator Python API is compatible with Elasticsearch version 8.x,
-and supports Python versions 3.8, and 3.9, officially.
+and supports Python versions 3.8, 3.9, 3.10, and 3.11 officially.
 
 Installation
 ------------
@@ -66,7 +66,7 @@ logger logs requests to the server in JSON format as pretty-printed ``curl``
 commands that you can execute from the command line. The ``elasticsearch.trace``
 logger is not inherited from the base logger and must be activated separately.
 
-.. _logging library: http://docs.python.org/3.6/library/logging.html
+.. _logging library: http://docs.python.org/3.11/library/logging.html
 
 Contents
 --------
@@ -84,7 +84,7 @@ Contents
 License
 -------
 
-Copyright (c) 2012–2023 Elasticsearch <http://www.elastic.co>
+Copyright (c) 2011–2023 Elasticsearch <http://www.elastic.co>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.