Skip to content

Commit

Permalink
Merge pull request #1551 from nsano-rururu/upgrade_python313
Browse files Browse the repository at this point in the history
upgrade to Python 3.13
  • Loading branch information
jertel authored Oct 9, 2024
2 parents 3f9f79e + ddc0c39 commit 193c841
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions docs/source/running_elastalert.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
---------------------------
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
],
Expand All @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion tests/Dockerfile-test
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
project = elastalert
envlist = py312,docs
envlist = py313,docs
setupdir = ..

[testenv]
Expand Down

0 comments on commit 193c841

Please sign in to comment.