Merge pull request #766 from v01d-gh/drop_pkg_resources

#765 Drop pkg_resources

Author: samuelhwilliams

.github/workflows/test.yml

@@ -13,11 +13,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-latest, macos-latest]
+        os: [ubuntu-24.04, windows-latest, macos-latest]
         python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
         exclude:
           - os: macos-latest
             python-version: 3.7
+          - os: ubuntu-24.04
+            python-version: 3.7
 
     runs-on: ${{ matrix.os }}
 

eel/__init__.py

@@ -18,14 +18,20 @@
 import pyparsing as pp
 import random as rnd
 import sys
-import pkg_resources as pkg
+import importlib_resources
 import socket
 import mimetypes
 
 
 mimetypes.add_type('application/javascript', '.js')
-_eel_js_file: str = pkg.resource_filename('eel', 'eel.js')
-_eel_js: str = open(_eel_js_file, encoding='utf-8').read()
+
+# https://setuptools.pypa.io/en/latest/pkg_resources.html
+#     Use of pkg_resources is deprecated in favor of importlib.resources
+# Migration guide: https://importlib-resources.readthedocs.io/en/latest/migration.html
+_eel_js_reference = importlib_resources.files('eel') / 'eel.js'
+with importlib_resources.as_file(_eel_js_reference) as _eel_js_path:
+    _eel_js: str = _eel_js_path.read_text(encoding='utf-8')
+
 _websockets: List[Tuple[Any, WebSocketT]] = []
 _call_return_values: Dict[Any, Any] = {}
 _call_return_callbacks: Dict[float, Tuple[Callable[..., Any], Optional[Callable[..., Any]]]] = {}

requirements-test.txt

@@ -8,3 +8,4 @@ webdriver_manager>=4.0.0,<5.0.0
 mypy>=1.0.0,<2.0.0
 pyinstaller
 types-setuptools
+importlib_resources>=1.3

requirements.txt

@@ -5,3 +5,4 @@ gevent-websocket<1.0.0
 greenlet>=1.0.0,<2.0.0
 pyparsing>=3.0.0,<4.0.0
 typing-extensions>=4.3.0
+importlib_resources>=1.3

setup.py

@@ -14,7 +14,7 @@
     package_data={
         'eel': ['eel.js', 'py.typed'],
     },
-    install_requires=['bottle', 'bottle-websocket', 'future', 'pyparsing', 'typing_extensions'],
+    install_requires=['bottle', 'bottle-websocket', 'future', 'pyparsing', 'typing_extensions', 'importlib_resources'],
     extras_require={
         "jinja2": ['jinja2>=2.10']
     },

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = typecheck,py{37,38,39,310,311,312}
+envlist = typecheck,py{37,38,39,310,311,312,313}
 
 [pytest]
 timeout = 30
@@ -12,6 +12,7 @@ python =
     3.10: py310
     3.11: py311
     3.12: py312
+    3.13: py313
 
 
 [testenv]