From f874aef2159633ec3ab5670e8d8fdc7613321b3d Mon Sep 17 00:00:00 2001 From: nsano-rururu Date: Thu, 10 Oct 2024 01:47:47 +0900 Subject: [PATCH 1/2] upgrade to Python 3.13 --- .readthedocs.yaml | 2 +- Dockerfile | 4 ++-- docs/source/running_elastalert.rst | 6 +++--- setup.py | 4 ++-- tests/Dockerfile-test | 2 +- tests/tox.ini | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 353451dd..4425ef9c 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -10,7 +10,7 @@ build: # Must stay at 22.04 until RTD adds support for 24.04 os: ubuntu-22.04 tools: - python: "3.12" + python: "3.13" # Build documentation in the docs/ directory with Sphinx sphinx: diff --git a/Dockerfile b/Dockerfile index 9ce0ce3b..38b937f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.12-slim as builder +FROM python:3.13-slim as builder LABEL description="ElastAlert 2 Official Image" LABEL maintainer="Jason Ertel" @@ -10,7 +10,7 @@ RUN mkdir -p /opt/elastalert && \ pip install setuptools wheel && \ python setup.py sdist bdist_wheel -FROM python:3.12-slim +FROM python:3.13-slim ARG GID=1000 ARG UID=1000 diff --git a/docs/source/running_elastalert.rst b/docs/source/running_elastalert.rst index 40de7f0d..3f5e6999 100644 --- a/docs/source/running_elastalert.rst +++ b/docs/source/running_elastalert.rst @@ -147,11 +147,11 @@ Requirements - Elasticsearch 7.x or 8.x, or OpenSearch 1.x or 2.x - ISO8601 or Unix timestamped data -- Python 3.12. Require OpenSSL 1.1.1 or newer. +- Python 3.13. Require OpenSSL 3.0.8 or newer. - pip -- Packages on Ubuntu 21.x: build-essential python3-pip python3.12 python3.12-dev libffi-dev libssl-dev +- Packages on Ubuntu 24.04: build-essential python3-pip python3.13 python3.13-dev libffi-dev libssl-dev -If you want to install python 3.12 on CentOS, please install python 3.12 from the source code after installing 'Development Tools'. +If you want to install python 3.13 on CentOS, please install python 3.13 from the source code after installing 'Development Tools'. Downloading and Configuring --------------------------- diff --git a/setup.py b/setup.py index 3edc662c..bcaab1c1 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ "Discussion Forum": "https://github.com/jertel/elastalert2/discussions", }, classifiers=[ - 'Programming Language :: Python :: 3.12', + 'Programming Language :: Python :: 3.13', 'License :: OSI Approved :: Apache Software License', 'Operating System :: OS Independent', ], @@ -31,7 +31,7 @@ 'elastalert=elastalert.elastalert:main']}, packages=find_packages(exclude=["tests"]), package_data={'elastalert': ['schema.yaml', 'es_mappings/**/*.json']}, - python_requires='>=3.12', + python_requires='>=3.13', install_requires=[ 'apscheduler>=3.10.4,<4.0', 'aws-requests-auth>=0.4.3', diff --git a/tests/Dockerfile-test b/tests/Dockerfile-test index e9cb57bd..1167aca6 100644 --- a/tests/Dockerfile-test +++ b/tests/Dockerfile-test @@ -1,4 +1,4 @@ -FROM python:3.12-slim +FROM python:3.13-slim RUN apt update && apt upgrade -y RUN apt install -y gcc libffi-dev diff --git a/tests/tox.ini b/tests/tox.ini index 79e33217..3e767b5a 100644 --- a/tests/tox.ini +++ b/tests/tox.ini @@ -1,6 +1,6 @@ [tox] project = elastalert -envlist = py312,docs +envlist = py313,docs setupdir = .. [testenv] From ddc0c3970d9b44089b119b63d296164ad7b9fca9 Mon Sep 17 00:00:00 2001 From: nsano-rururu Date: Thu, 10 Oct 2024 01:52:20 +0900 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a394dcbb..14aa3278 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - [Docs] Add missing documentation of the timestamp_field option - [#1544](https://github.com/jertel/elastalert2/pull/1544) - @apollolv - Add support for Kibana 8.14/8.15 for Kibana Discover - [#1547](https://github.com/jertel/elastalert2/pull/1547) - @nsano-rururu - Upgrade pylint 3.1.0 to 3.3.1, pytest 8.0.2 to 8.3.3, pytest-cov 4.1.0 to 5.0.0, pytest-xdist 3.5.0 to 3.6.1, sphinx 7.2.6 to 8.0.2, sphinx_rtd_theme 2.0.0 to 3.0.1, tox 4.13.0 to 4.21.2 - [#1550](https://github.com/jertel/elastalert2/pull/1550) - @nsano-rururu +- Upgrade to Python 3.13 - [#1551](https://github.com/jertel/elastalert2/pull/1551) - @nsano-rururu # 2.20.0