Skip to content

Commit cb0ab55

Browse files
sebixaaronkaplan
authored andcommitted
Drop support for Python 3.8
it's EOL since 2024-10 and it's no longer in use by a supported plattform fixes #2616
1 parent 2f15e20 commit cb0ab55

File tree

8 files changed

+11
-14
lines changed

8 files changed

+11
-14
lines changed

.github/workflows/scripts/setup-full.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ sudo chown -R elasticsearch:elasticsearch /etc/default/elasticsearch
1515
sudo systemctl start elasticsearch
1616

1717
sudo apt update
18-
if [ $python_version == '3.8' ]; then
19-
# for pymssql there are no wheels for 3.8 https://github.com/certtools/intelmq/issues/2539
20-
DEBIAN_FRONTEND="noninteractive" sudo -E apt install -y build-essential freetds-dev libssl-dev libkrb5-dev
21-
fi
2218
# for psql (used below)
2319
DEBIAN_FRONTEND="noninteractive" sudo -E apt install -y postgresql-client
2420

.github/workflows/unittests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
21+
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
2222
type: ['full', 'basic']
2323

2424
services:

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Please refer to the [NEWS](NEWS.md) for a list of changes which have an affect o
1616
### Configuration
1717

1818
### Core
19+
- Drop support for Python 3.8 (fixes #2616, PR#2617 by Sebastian Wagner).
1920

2021
### Development
2122

NEWS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Please refer to the change log for a full list of changes.
1414
--------------------------------
1515

1616
### Requirements
17+
Python `>=3.9` is now required, which is available on all platforms supported by IntelMQ.
1718

1819
### Tools
1920

debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Build-Depends: debhelper (>= 4.1.16),
2525
python3-pytest-cov,
2626
findutils,
2727
sed
28-
X-Python3-Version: >= 3.7
28+
X-Python3-Version: >= 3.9
2929
Standards-Version: 3.9.6
3030
Homepage: https://github.com/certtools/intelmq/
3131

docs/admin/intro.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ system to preserve processed events.
1515

1616
## Base Requirements
1717

18-
The following instructions assume the following requirements. Python versions >= 3.7 are supported.
18+
The following instructions assume the following requirements. Python versions >= 3.9 are supported.
1919

2020
Supported and recommended operating systems are:
2121

intelmq/lib/mixins/stomp.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -379,12 +379,11 @@ def create_default_context(cls,
379379
cafile = _SYSTEM_DEFAULT_CA_MARKER
380380
ssl_context.load_verify_locations(cafile, capath, cadata)
381381

382-
if sys.version_info[:2] >= (3, 8):
383-
# Support for OpenSSL 1.1.1 keylog (copied from `Py>=3.8`):
384-
if hasattr(ssl_context, 'keylog_filename'):
385-
keylogfile = os.environ.get('SSLKEYLOGFILE')
386-
if keylogfile and not sys.flags.ignore_environment:
387-
ssl_context.keylog_filename = keylogfile
382+
# Support for OpenSSL 1.1.1 keylog:
383+
if hasattr(ssl_context, 'keylog_filename'):
384+
keylogfile = os.environ.get('SSLKEYLOGFILE')
385+
if keylogfile and not sys.flags.ignore_environment:
386+
ssl_context.keylog_filename = keylogfile
388387

389388
else:
390389
ssl_context = ssl.create_default_context(

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
version=__version__, # noqa: F821
5656
maintainer='Sebastian Wagner',
5757
maintainer_email='[email protected]',
58-
python_requires='>=3.8',
58+
python_requires='>=3.9',
5959
install_requires=REQUIRES,
6060
tests_require=TESTS_REQUIRES,
6161
test_suite='intelmq.tests',

0 commit comments

Comments
 (0)