Refactor pkg_resources -> importlib (#39)

* pkg_resources -> importlib

* drop setuptools requirement from CI

* update trove classifiers

* fix line too long

* fix import sort

* disutils -> packaging

* actually... just drop support for redispy 2.x

Author: AlecRosenbaum

.github/workflows/test.yml

@@ -42,7 +42,6 @@ jobs:
     - name: Install Python dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install setuptools
         pip install flake8 flake8-docstrings flake8-polyfill pep8 pep8-naming isort
         pip install --no-deps -r requirements.txt
         pip install -r requirements_test.txt

limitlion/running_counter.py

@@ -1,13 +1,6 @@
 import itertools
 import time
 from collections import namedtuple
-from distutils.version import LooseVersion
-
-import pkg_resources
-
-REDIS_PY_VERSION = pkg_resources.get_distribution("redis").version
-IS_REDIS_PY_2 = LooseVersion(REDIS_PY_VERSION) < LooseVersion("3")
-
 
 BucketCount = namedtuple('BucketCount', ['bucket', 'count'])
 
@@ -204,10 +197,7 @@ def inc(self, increment=1, name=None):
         pipeline.expire(bucket_key, expire)
         if self.group_name is not None:
             group_key = self._group_key()
-            if IS_REDIS_PY_2:
-                pipeline.zadd(group_key, name, now)
-            else:
-                pipeline.zadd(group_key, {name: now})
+            pipeline.zadd(group_key, {name: now})
             pipeline.expire(group_key, expire)
             # Trim zset to keys used within window so
             # it doesn't grow uncapped.

limitlion/throttle.py

@@ -1,8 +1,7 @@
 """Token bucket throttle backed by Redis."""
 
 import time
-
-import pkg_resources
+from importlib import resources
 
 KEY_FORMAT = 'throttle:{}'
 
@@ -105,9 +104,9 @@ def throttle_configure(redis_instance, testing=False):
     global redis, throttle_script
     redis = redis_instance
 
-    lua_script = pkg_resources.resource_string(
-        __name__, 'throttle.lua'
-    ).decode()
+    lua_script = (
+        resources.files(__package__).joinpath('throttle.lua').read_text()
+    )
 
     # Modify scripts when testing so time can be frozen
     if testing:

setup.py

@@ -22,8 +22,10 @@
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
     packages=[