pyflyby 1.10.0__tar.gz → 1.10.1__tar.gz

{pyflyby-1.10.0 → pyflyby-1.10.1}/.github/workflows/lint.yml

@@ -17,7 +17,6 @@ jobs:
         # https://mesonbuild.com/meson-python/how-to-guides/editable-installs.html#build-dependencies
         # for details.
         pip install meson-python meson ninja pybind11>=2.10.4
-        pip install setuptools wheel # needed for epydoc
         pip install --no-build-isolation -ve . --group lint
     - name: Mypy
       run: |

{pyflyby-1.10.0 → pyflyby-1.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyflyby
-Version: 1.10.0
+Version: 1.10.1
 Summary: pyflyby - Python development productivity tools, in particular automatic import management
 Author-Email: Karl Chen <quarl@8166.clguba.z.quarl.org>
 License-Expression: MIT
@@ -20,9 +20,7 @@ Requires-Dist: six
 Requires-Dist: tomli; python_version < "3.11"
 Requires-Dist: typing_extensions>=4.6; python_version < "3.12"
 Requires-Dist: prompt_toolkit
-Requires-Dist: epydoc
-Requires-Dist: wheel
-Requires-Dist: appdirs
+Requires-Dist: platformdirs
 Provides-Extra: test
 Requires-Dist: build; extra == "test"
 Requires-Dist: coverage; extra == "test"
@@ -38,6 +36,9 @@ Requires-Dist: pytest-cov; extra == "test"
 Requires-Dist: pytest-json-report; extra == "test"
 Requires-Dist: pytest<=8; extra == "test"
 Requires-Dist: requests; extra == "test"
+Requires-Dist: epydoc; extra == "test"
+Requires-Dist: wheel; extra == "test"
+Requires-Dist: setuptools; extra == "test"
 Description-Content-Type: text/x-rst
 
 #########

{pyflyby-1.10.0 → pyflyby-1.10.1}/doc/conf.py

@@ -45,7 +45,7 @@ autodoc_default_options = {
 
 autodoc_mock_imports = [
     "pyflyby._fast_iter_modules",
-    "appdirs",
+    "platformdirs",
     "prompt_toolkit",
 ]
 

{pyflyby-1.10.0 → pyflyby-1.10.1}/lib/python/pyflyby/_interactive.py

@@ -1724,14 +1724,14 @@ class AutoImporter:
                     return __original__.fget(completer) + [completer.python_matcher]
 
         @self._advise(completer.global_matches)
-        def global_matches_with_autoimport(name):
+        def global_matches_with_autoimport(name, *args, **kwargs):
             old_global_namespace = completer.global_namespace
             completer.global_namespace = NamespaceWithPotentialImports(
                 old_global_namespace,
                 ip=self._ip
             )
             try:
-                return self._safe_call(__original__, name)
+                return self._safe_call(__original__, name, *args, **kwargs)
             finally:
                 completer.global_namespace = old_global_namespace
 

{pyflyby-1.10.0 → pyflyby-1.10.1}/lib/python/pyflyby/_modules.py

@@ -4,7 +4,6 @@
 
 from __future__ import annotations
 
-import appdirs
 import ast
 from   functools                import cached_property, total_ordering
 import hashlib
@@ -14,6 +13,7 @@ import json
 import os
 import pathlib
 import pkgutil
+import platformdirs
 import textwrap
 
 from   pyflyby._fast_iter_modules \
@@ -45,7 +45,7 @@ def rebuild_import_cache():
     The cache is deleted before calling _fast_iter_modules, which repopulates the cache.
     """
     for path in pathlib.Path(
-        appdirs.user_cache_dir(appname='pyflyby', appauthor=False)
+        platformdirs.user_cache_dir(appname='pyflyby', appauthor=False)
     ).iterdir():
         _remove_import_cache_dir(path)
     _fast_iter_modules()
@@ -596,7 +596,7 @@ def _cached_module_finder(
         package or not)
     """
     cache_dir = pathlib.Path(
-        appdirs.user_cache_dir(appname='pyflyby', appauthor=False)
+        platformdirs.user_cache_dir(appname='pyflyby', appauthor=False)
     ) / hashlib.sha256(str(importer.path).encode()).hexdigest()
     cache_file = cache_dir / str(os.stat(importer.path).st_mtime_ns)
 

{pyflyby-1.10.0 → pyflyby-1.10.1}/lib/python/pyflyby/_version.py

@@ -4,4 +4,4 @@
 # http://creativecommons.org/publicdomain/zero/1.0/
 
 
-__version__ = "1.10.0"
+__version__ = "1.10.1"

{pyflyby-1.10.0 → pyflyby-1.10.1}/meson.build

@@ -1,7 +1,7 @@
 project(
   'pyflyby',
   'cpp',
-  version: '1.10.0',
+  version: '1.10.1',
   default_options: 'cpp_std=c++17'
 )
 

{pyflyby-1.10.0 → pyflyby-1.10.1}/pyproject.toml

@@ -30,9 +30,7 @@ dependencies = [
     "tomli; python_version<'3.11'",
     "typing_extensions>=4.6; python_version<'3.12'",
     'prompt_toolkit',
-    'epydoc',
-    'wheel', # required by epydoc, but not listed as a dependency
-    'appdirs',
+    'platformdirs',
 ]
 [project.urls]
 Homepage = "https://pypi.org/project/pyflyby/"
@@ -59,6 +57,9 @@ test = [
     'pytest-json-report',
     'pytest<=8',
     'requests',
+    'epydoc',
+    'wheel', # required by epydoc, but not listed as a dependency
+    'setuptools', # required by epydoc, but not listed as a dependency
 ]
 
 [dependency-groups]

{pyflyby-1.10.0 → pyflyby-1.10.1}/tests/test_modules.py

@@ -3,22 +3,20 @@
 # License for THIS FILE ONLY: CC0 Public Domain Dedication
 # http://creativecommons.org/publicdomain/zero/1.0/
 
-
-
-
-from unittest import mock
-import pathlib
 import hashlib
 import logging.handlers
+import pathlib
+from   pkgutil                  import iter_modules
 from   pyflyby._file            import Filename
 from   pyflyby._idents          import DottedIdentifier
 from   pyflyby._log             import logger
-from   pyflyby._modules         import ModuleHandle, _fast_iter_modules, _iter_file_finder_modules
-from   pkgutil                  import iter_modules
+from   pyflyby._modules         import (ModuleHandle, _fast_iter_modules,
+                                        _iter_file_finder_modules)
 import re
 import subprocess
 import sys
 from   textwrap                 import dedent
+from   unittest                 import mock
 
 import pytest
 
@@ -125,7 +123,7 @@ def test_fast_iter_modules():
     assert fast == slow
 
 
-@mock.patch("appdirs.user_cache_dir")
+@mock.patch("platformdirs.user_cache_dir")
 def test_import_cache(mock_user_cache_dir, tmp_path):
     """Test that the import cache is built when iterating modules.