Merge pull request #74 from ocefpaf/py310

Add py310 support

.github/workflows/deploy-docs.yml

@@ -9,6 +9,10 @@ on:
     types:
       - published
 
+defaults:
+  run:
+    shell: bash -l {0}
+
 jobs:
   build-docs:
     runs-on: ubuntu-latest
@@ -25,18 +29,16 @@ jobs:
         environment-file: false
 
     - name: Build environment
-      shell: bash -l {0}
       run: |
-        micromamba create --name TEST python=3.9 --file requirements.txt --file requirements-dev.txt --channel conda-forge
+        micromamba create --name TEST python=3 pip --file requirements-dev.txt --channel conda-forge
         micromamba activate TEST
-        python -m pip install -e . --no-deps --force-reinstall
+        python -m pip install -e .
 
     - name: Get the version
       id: get_version
       run: echo ::set-output name=VERSION::$(python setup.py --version)
 
     - name: Build documentation
-      shell: bash -l {0}
       run: |
         set -e
         micromamba activate TEST

.github/workflows/tests.yml

@@ -1,43 +1,49 @@
-name: tests
+name: Tests
 
 on:
-  push: null
-  pull_request: null
+  pull_request:
+  push:
+    branches: [master]
+
+defaults:
+  run:
+    shell: bash -l {0}
 
 jobs:
-  tests:
-    name: tests
-    runs-on: "ubuntu-latest"
+  run:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        os: [windows-latest, ubuntu-latest, macos-latest]
+      fail-fast: false
+
     steps:
       - name: cancel previous runs
-        uses: styfle/cancel-workflow-action@0.6.0
+        uses: styfle/cancel-workflow-action@0.10.0
         with:
           access_token: ${{ github.token }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: conda-incubator/setup-miniconda@v2
+      - name: Setup Micromamba
+        uses: mamba-org/provision-with-micromamba@main
         with:
-          python-version: 3.8
-          channels: conda-forge,defaults
-          channel-priority: strict
-          show-channel-urls: true
-
-      - name: configure conda and install code
-        shell: bash -l {0}
+         environment-file: false
+
+      - name: Python ${{ matrix.python-version }}
         run: |
-          conda config --set always_yes yes
-          conda config --add channels conda-forge
-          conda install --quiet pip
-
-          export GIT_FULL_HASH=`git rev-parse HEAD`
-          export CICLE_BUILD_URL="https://www.youtube.com/watch?v=R7qT-C-0ajI"
-          conda install --file requirements.txt --file requirements-dev.txt
+          micromamba create --name TEST python=${{ matrix.python-version }} pip --file requirements-dev.txt --channel conda-forge
+          micromamba activate TEST
           python -m pip install -e .
-
       - name: test
-        shell: bash -l {0}
         run: |
+          micromamba activate TEST
           coverage run -m pytest -vrsx test.py
+
+      - name: coverage
+        run: |
+          micromamba activate TEST
           coverage report -m
           codecov
+  

depfinder/inspection.py

@@ -36,7 +36,7 @@
 from collections import defaultdict
 from typing import Union
 
-from stdlib_list import stdlib_list
+from .stdliblist import builtin_modules
 
 from .utils import (
     AST_QUESTIONABLE,
@@ -46,10 +46,6 @@
 
 logger = logging.getLogger('depfinder')
 
-pyver = '%s.%s' % (sys.version_info.major, sys.version_info.minor)
-builtin_modules = stdlib_list(pyver)
-del pyver
-
 
 PACKAGE_NAME = None
 STRICT_CHECKING = False
@@ -59,7 +55,7 @@ def get_top_level_import_name(name, custom_namespaces=None):
     num_dot = name.count(".")
     custom_namespaces = custom_namespaces or []
 
-    if name in namespace_packages or name in custom_namespaces or name in stdlib_list():
+    if name in namespace_packages or name in custom_namespaces or name in builtin_modules:
         return name
     elif any(
         ((num_dot - nsp.count(".")) == 1) and name.startswith(nsp + ".")

depfinder/reports.py

@@ -37,16 +37,12 @@
 from functools import lru_cache
 
 import requests
-from stdlib_list import stdlib_list
 
+from .stdliblist import builtin_modules as _builtin_modules
 from .utils import SKETCHY_TYPES_TABLE
 
 logger = logging.getLogger('depfinder')
 
-pyver = '%s.%s' % (sys.version_info.major, sys.version_info.minor)
-_builtin_modules = stdlib_list(pyver)
-del pyver
-
 
 @lru_cache()
 def _import_map_num_letters():

depfinder/stdliblist.py

@@ -0,0 +1,11 @@
+import sys
+
+
+try:
+    from stdlib_list import stdlib_list
+    pyver = '%s.%s' % (sys.version_info.major, sys.version_info.minor)
+    builtin_modules = stdlib_list(pyver)
+    del pyver
+except ImportError:
+    # assuming py>=3.10
+    builtin_modules = list(set(list(sys.stdlib_module_names) + list(sys.builtin_module_names)))

depfinder/utils.py

@@ -7,13 +7,7 @@
 
 import requests
 import yaml
-from stdlib_list import stdlib_list
-
-logger = logging.getLogger('depfinder')
-
-pyver = '%s.%s' % (sys.version_info.major, sys.version_info.minor)
-builtin_modules = stdlib_list(pyver)
-del pyver
+from .stdliblist import builtin_modules
 
 
 SKETCHY_TYPES_TABLE = {}

requirements.txt

@@ -1,3 +1,3 @@
 pyyaml
-stdlib-list
+stdlib-list; python_version < "3.10"
 requests

test.py

@@ -105,9 +105,6 @@ def __init__(self):
     # Hit the fake packages code block in main.sanitize_deps()
     {'targets': {'required': ['numpy']},
      'code': 'from numpy import warnings as npwarn'},
-    # Test for nested namespace resolution in stdlib builtins
-    {'targets': {'builtin': ['concurrent.futures']},
-     'code': 'import concurrent.futures'},
 ]
 
 relative_imports = [
@@ -119,6 +116,27 @@ def __init__(self):
      'code': 'from ..bar import baz'},
 ]
 
+@pytest.fixture(scope='module')
+def using_stdlib_list():
+    try:
+        import stdlib_list
+        return True
+    except ImportError:
+        return False
+
+def test_nested_namespace_builtins(using_stdlib_list):
+    if using_stdlib_list:
+        expected = {'builtin': ['concurrent.futures']}
+    else:
+        expected = {'builtin': ['concurrent']}
+    code = 'import concurrent.futures'
+
+
+
+    test_object = Initter({'targets': expected, 'code': code})
+    imports = main.get_imported_libs(test_object.code)
+    assert imports.describe() == test_object.targets
+
 
 class Initter(object):
     def __init__(self, artifact):
@@ -336,8 +354,7 @@ def test_cli(path, req, capsys):
     if req is None:
         dependencies_file = join(dirname(dirname(depfinder.__file__)),
                                  'requirements.txt')
-        dependencies = set(
-            [dep for dep in open(dependencies_file, 'r').read().split('\n') if dep])
+        dependencies = set([dep for dep in open(dependencies_file, 'r').read().split('\n') if not dep.startswith("stdlib")])
     else:
         dependencies = req
     assert dependencies == set(eval(stdout).get('required', set()))
@@ -390,9 +407,9 @@ def test_get_top_level_import():
 
 
 def test_report_conda_forge_names_from_import_map():
-    m, f, c = parse_file(join(dirname(depfinder.__file__), 'inspection.py'))
+    m, f, c = parse_file(join(dirname(depfinder.__file__), 'utils.py'))
     report, import_to_artifact, import_to_pkg = report_conda_forge_names_from_import_map(c.total_imports)
-    assert report['required'] == {'stdlib-list'}
+    assert report['required'] == {'pyyaml', 'requests'}
 
 
 def test_report_conda_forge_names_from_import_map_ignore():
@@ -404,8 +421,9 @@ def test_report_conda_forge_names_from_import_map_ignore():
 
 def test_simple_import_search_conda_forge_import_map():
     path_to_source = dirname(depfinder.__file__)
+    expected_result = sorted(list({"pyyaml", "requests"}))
     report = simple_import_search_conda_forge_import_map(path_to_source)
-    assert report['required'] == sorted(list({"pyyaml", "stdlib-list", "requests"}))
+    assert report['required'] == expected_result
 
 
 @pytest.mark.parametrize('import_name, expected_result', [
@@ -431,8 +449,8 @@ def test_search_for_name(import_name, expected_result):
 def test_simple_import_to_pkg_map():
     path_to_source = dirname(depfinder.__file__)
     import_to_artifact = simple_import_to_pkg_map(path_to_source)
-    assert import_to_artifact == {'builtin': {},
-                                  'questionable': {'IPython.core.inputsplitter': {'ipython', 'autovizwidget'}},
+    expected_result = {'builtin': {},
+                                  'questionable': {'stdlib_list': {'stdlib-list'}, 'IPython.core.inputsplitter': {'ipython', 'autovizwidget'}},
                                   'questionable no match': {},
                                   'required': {'requests': {'apache-libcloud',
                                                             'arm_pyart',
@@ -441,6 +459,6 @@ def test_simple_import_to_pkg_map():
                                                             'google-api-core',
                                                             'google-cloud-bigquery-storage-core',
                                                             'requests'},
-                                               'stdlib_list': {'stdlib-list'},
                                                'yaml': {'google-cloud-bigquery-storage-core', 'pyyaml'}},
                                   'required no match': {}}
+    assert import_to_artifact == expected_result