Merge branch '8.x' into 8.0

Author: untergeek

Dockerfile

@@ -23,7 +23,7 @@ RUN /bin/sh alpine4docker.sh
 RUN pip3 install .
 
 # Build (or rather Freeze) Curator
-RUN python3 setup.py build_exe
+RUN cxfreeze build
 
 # Rename 'build/exe.{system().lower()}-{machine()}-{MAJOR}.{MINOR}' to curator_build
 RUN python3 post4docker.py

curator/_version.py

@@ -1,3 +1,3 @@
 """Curator Version"""
 
-__version__ = '8.0.19'
+__version__ = '8.0.20'

curator/cli.py

@@ -172,7 +172,7 @@ def process_action(client, action_def, dry_run=False):
                 'list_obj', client, search_pattern=ptrn, include_hidden=hidn
             )
         action_def.list_obj.iterate_filters({'filters': action_def.filters})
-        logger.debug('Pre Instantiation Action kwargs: %s', mykwargs)
+        logger.debug(f'Pre Instantiation Action kwargs: {mykwargs}')
         action_def.instantiate('action_cls', action_def.list_obj, **mykwargs)
     # Do the action
     if dry_run:

docs/Changelog.rst

@@ -3,6 +3,32 @@
 Changelog
 =========
 
+(8.0.20) (21 March 2025)
+------------------------
+
+**Patch Release**
+
+There are no code changes in this release.
+
+A package maintainer at Debian raised an issue with the now
+outdated ``cx_Freeze`` dependency in ``setup.py``. As ``cx_Freeze`` is now only
+used in the Docker build, ``setup.py`` has been removed to avoid the unneeded
+dependency. Docker and package builds were tested to ensure that the changes work
+as expected before this release.
+
+**Changes**
+
+  * Move ``cx_Freeze`` configuration from ``setup.py`` to ``pyproject.toml``.
+    The configuration will be read during the Docker image build but not otherwise
+    result in ``cx_Freeze`` being a dependency.
+  * Change how ``cx_Freeze`` is invoked in ``Dockerfile``, removing the need for
+    ``setup.py``.
+  * Remove ``setup.py`` as it is no longer needed for package building.
+  * Use ``es_client==8.17.4`` which fixes a logging issue.
+  * Fix copyright dates in ``docs/index.rst``
+  * Update asciidoc files to reflect the new version numbers.
+
+
 (8.0.19) (5 March 2025)
 -----------------------
 

docs/asciidoc/index.asciidoc

@@ -1,10 +1,10 @@
-:curator_version: 8.0.19
+:curator_version: 8.0.20
 :curator_major: 8
 :curator_doc_tree: 8.0
-:es_py_version: 8.17.1
+:es_py_version: 8.17.2
 :es_doc_tree: 8.17
 :stack_doc_tree: 8.17
-:pybuild_ver: 3.12.2
+:pybuild_ver: 3.12.9
 :copyright_years: 2011-2025
 :ref:  http://www.elastic.co/guide/en/elasticsearch/reference/{es_doc_tree}
 :esref: http://www.elastic.co/guide/en/elasticsearch/reference/{stack_doc_tree}

docs/index.rst

@@ -31,7 +31,7 @@ Contents
 License
 =======
 
-Copyright (c) 2011–2023 Elasticsearch <http://www.elastic.co>
+Copyright (c) 2011–2025 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.

docs/reference/configfile.md

@@ -49,7 +49,7 @@ logging:
 
 It is a YAML configuration file.  The two root keys must be `elasticsearch` and `logging`.  The subkeys of each of these will be described here.
 
-There are other keys available for the `client` subkey of the `elasticsearch` root key, many of which are listed [here](https://es-client.readthedocs.io/en/latest/defaults.md). The most commonly used ones (listed above) are described as follows:
+There are other keys available for the `client` subkey of the `elasticsearch` root key, many of which are listed [here](https://es-client.readthedocs.io/en/latest/defaults.html). The most commonly used ones (listed above) are described as follows:
 
 ## hosts [hosts]
 

pyproject.toml

@@ -29,7 +29,7 @@ keywords = [
     'index-expiry'
 ]
 dependencies = [
-    "es_client==8.17.2"
+    "es_client==8.17.4"
 ]
 
 [project.optional-dependencies]
@@ -139,3 +139,14 @@ testpaths = [
 [tool.distutils.build_exe]
 excludes = ["tcltk", "tkinter", "unittest"]
 zip_include_packages = ["certifi"]
+
+[tool.cxfreeze]
+executables = [
+    {script="run_curator.py", target_name="curator"},
+    {script="run_singleton.py", target_name="curator_cli"},
+    {script="run_es_repo_mgr.py", target_name="es_repo_mgr"},
+]
+
+[tool.cxfreeze.build_exe]
+excludes = ["tcltk", "tkinter", "unittest"]
+zip_include_packages = ["certifi"]