Merge pull request #105 from 2bndy5/replace-pkg_resources

addresses #103

Author: jepler

.github/workflows/build.yml

@@ -16,14 +16,14 @@ jobs:
         GITHUB_CONTEXT: ${{ toJson(github) }}
       run: echo "$GITHUB_CONTEXT"
     - name: Set up Python 3.7
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v5
       with:
         python-version: 3.7
     - name: Versions
       run: |
         python3 --version
     - name: Checkout Current Repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Install requirements
       run: |
         sudo apt-get update

.github/workflows/release.yml

@@ -13,9 +13,9 @@ jobs:
   upload-pypi:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v5
       with:
         python-version: '3.7'
     - name: Install dependencies

circuitpython_build_tools/scripts/build_bundles.py

@@ -26,7 +26,6 @@
 import os
 import os.path
 import re
-import shlex
 import shutil
 import subprocess
 import sys
@@ -37,7 +36,11 @@
 from circuitpython_build_tools import build
 from circuitpython_build_tools import target_versions
 
-import pkg_resources
+if sys.version_info < (3, 8):
+    import importlib_metadata
+else:
+    import importlib.metadata as importlib_metadata
+
 
 BLINKA_LIBRARIES = [
     "adafruit-blinka",
@@ -244,10 +247,10 @@ def build_bundles(filename_prefix, output_directory, library_location, library_d
 
     libs = _find_libraries(os.path.abspath(library_location), library_depth)
 
-    pkg = pkg_resources.get_distribution("circuitpython-build-tools")
-    build_tools_version = "devel"
-    if pkg:
-        build_tools_version = pkg.version
+    try:
+        build_tools_version = importlib_metadata.version("circuitpython-build-tools")
+    except importlib_metadata.PackageNotFoundError:
+        build_tools_version = "devel"
 
     build_tools_fn = "z-build_tools_version-{}.ignore".format(
         build_tools_version)
@@ -267,13 +270,8 @@ def build_bundles(filename_prefix, output_directory, library_location, library_d
     if "mpy" not in ignore:
         os.makedirs("build_deps", exist_ok=True)
         for version in target_versions.VERSIONS:
-            # Use prebuilt mpy-cross on Travis, otherwise build our own.
-            if "TRAVIS" in os.environ:
-                mpy_cross = pkg_resources.resource_filename(
-                    target_versions.__name__, "data/mpy-cross-" + version["name"])
-            else:
-                mpy_cross = "build_deps/mpy-cross-" + version["name"] + (".exe" * (os.name == "nt"))
-                build.mpy_cross(mpy_cross, version["tag"])
+            mpy_cross = "build_deps/mpy-cross-" + version["name"] + (".exe" * (os.name == "nt"))
+            build.mpy_cross(mpy_cross, version["tag"])
             zip_filename = os.path.join(output_directory,
                 filename_prefix + '-{TAG}-mpy-{VERSION}.zip'.format(
                     TAG=version["name"],

requirements.txt

@@ -3,3 +3,4 @@ requests
 semver
 wheel
 tomli; python_version < "3.11"
+importlib_metadata; python_version < "3.8"