Upgrade to Python 3.10; Upgrade Sphinx to 4.2.0

CHANGELOG.md

@@ -19,6 +19,7 @@
 
 ## Other changes
 - [Docs] Add exposed metrics documentation - [#498](https://github.com/jertel/elastalert2/pull/498) - @thisisxgp
+- Upgrade to Python 3.10 and Sphinx 4.2.0 - [#501](https://github.com/jertel/elastalert2/pull/501) - @jertel
 
 # 2.2.2
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:slim-buster as builder
+FROM python:3-slim-buster as builder
 
 LABEL description="ElastAlert 2 Official Image"
 LABEL maintainer="Jason Ertel"
@@ -10,20 +10,21 @@ RUN mkdir -p /opt/elastalert && \
     pip install setuptools wheel && \
     python setup.py sdist bdist_wheel
 
-FROM python:slim-buster
+FROM python:3-slim-buster
 
 ARG GID=1000
 ARG UID=1000
 ARG USERNAME=elastalert
 
 COPY --from=builder /tmp/elastalert/dist/*.tar.gz /tmp/
 
-RUN apt-get update && apt-get -y upgrade && \
-    apt-get install -y jq curl && \
-    apt-get -y autoremove && \
+RUN apt update && apt -y upgrade && \
+    apt -y install jq curl gcc libffi-dev && \
     rm -rf /var/lib/apt/lists/* && \
     pip install /tmp/*.tar.gz && \
     rm -rf /tmp/* && \
+    apt -y remove gcc libffi-dev && \
+    apt -y autoremove && \
     mkdir -p /opt/elastalert && \
     echo "#!/bin/sh" >> /opt/elastalert/run.sh && \
     echo "set -e" >> /opt/elastalert/run.sh && \

requirements-dev.txt

@@ -1,15 +1,13 @@
 -r requirements.txt
-docutils<0.17
 flake8
 flake8-absolute-import
 m2r2
-pluggy>=0.12.0
 pre-commit
 pylint<2.10
 pytest==6.2.4
 pytest-cov==2.12.1
 pytest-xdist==2.3.0
 setuptools
-sphinx==4.1.2
+sphinx==4.2.0
 sphinx_rtd_theme
 tox==3.24.1

requirements.txt

@@ -20,6 +20,5 @@ stomp.py>=4.1.17
 texttable>=0.8.8
 statsd-tags==3.2.1.post1
 twilio>=6.0.0,<6.58
-tzlocal<3.0
 tencentcloud-sdk-python>=3.0.484
 jsonpointer>=2.1

setup.py

@@ -21,7 +21,7 @@
         "Discussion Forum": "https://github.com/jertel/elastalert2/discussions",
     },
     classifiers=[
-        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent',
     ],
@@ -55,7 +55,6 @@
         'twilio>=6.0.0,<6.58',
         'cffi>=1.11.5',
         'statsd-tags==3.2.1.post1',
-        'tzlocal<3.0',
         'tencentcloud-sdk-python>=3.0.484',
         'jsonpointer>=2.1'
     ]

tests/Dockerfile-test

@@ -1,8 +1,10 @@
 FROM python:3-slim-buster
 
 RUN apt update && apt upgrade -y
+RUN apt install -y gcc libffi-dev
 
 WORKDIR /home/elastalert
 
 ADD requirements*.txt ./
+
 RUN pip3 install -r requirements-dev.txt

tests/tox.ini

@@ -1,6 +1,6 @@
 [tox]
 project = elastalert
-envlist = py39,docs
+envlist = py310,docs
 setupdir = ..
 
 [testenv]