From 16789dea11b72212e9352b9d2e3563e12be183ce Mon Sep 17 00:00:00 2001 From: Aris Tritas Date: Tue, 2 Apr 2024 15:15:48 +0200 Subject: [PATCH] chore: remove typing-extensions from dependencies Since we only aim to support Python 3.9 and newer, typing-extensions isn't a requirement. --- journalpump.spec | 2 +- journalpump/types.py | 8 ++------ requirements.txt | 1 - setup.py | 1 - 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/journalpump.spec b/journalpump.spec index b41628f..1e8bb1e 100644 --- a/journalpump.spec +++ b/journalpump.spec @@ -6,7 +6,7 @@ Summary: Pump messages from systemd journal to Elasticsearch, Kafka, Logp License: ASL 2.0 Source0: journalpump-rpm-src.tar.gz Requires: python3-kafka, systemd-python3, python3-requests, python3-botocore, python3-google-api-client -Requires: python3-google-auth, python3-geoip2, python3-typing-extensions +Requires: python3-google-auth, python3-geoip2 Requires: python3-websockets, python3-aiohttp-socks, python3-snappy BuildRequires: python3-kafka, systemd-python3, python3-requests, python3-botocore, python3-google-api-client BuildRequires: python3-devel, python3-pytest, python3-pylint python3-responses diff --git a/journalpump/types.py b/journalpump/types.py index 38e4764..b8ebed6 100644 --- a/journalpump/types.py +++ b/journalpump/types.py @@ -1,11 +1,7 @@ """JournalPump internal types""" -import enum -import sys +from typing import Protocol -if sys.version_info >= (3, 8): - from typing import Protocol # pylint: disable=no-name-in-module -else: - from typing_extensions import Protocol +import enum class GeoIPProtocol(Protocol): diff --git a/requirements.txt b/requirements.txt index 29dcecf..1b55f5e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,5 +8,4 @@ google-api-python-client google-auth geoip2 https://github.com/systemd/python-systemd/zipball/master -typing-extensions google-re2 diff --git a/setup.py b/setup.py index 119b8c4..1fd4722 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,6 @@ "google-api-python-client", "google-auth", "geoip2", - "typing-extensions", ], dependency_links=[], package_data={},