pyflyby 1.10.1__cp311-cp311-manylinux_2_24_x86_64.whl → 1.10.2__cp311-cp311-manylinux_2_24_x86_64.whl

pyflyby/_cmdline.py

@@ -27,6 +27,10 @@ else:
     from tomllib import loads
 
 
+class ConfigurationError(Exception):
+    """Exception class indicating a configuration error."""
+
+
 def hfmt(s):
     return dedent(s).strip()
 
@@ -232,26 +236,17 @@ def parse_args(addopts=None, import_format_params=False, modify_action_params=Fa
                              only if it is necessary to prevent exceeding the
                              width (by default 79).
                          '''))
-        def uniform_callback(option, opt_str, value, parser):
-            parser.values.separate_from_imports = False
-            parser.values.from_spaces           = 3
-            parser.values.align_imports         = '32'
-        group.add_option('--uniform', '-u', action="callback",
-                         callback=uniform_callback,
+        group.add_option('--uniform', '-u', action="store_true",
                          help=hfmt('''
                              (Default) Shortcut for --no-separate-from-imports
                              --from-spaces=3 --align-imports=32.'''))
-        def unaligned_callback(option, opt_str, value, parser):
-            parser.values.separate_from_imports = True
-            parser.values.from_spaces           = 1
-            parser.values.align_imports         = '0'
-        group.add_option('--unaligned', '-n', action="callback",
-                         callback=unaligned_callback,
+        group.add_option('--unaligned', '-n', action="store_true",
                          help=hfmt('''
                              Shortcut for --separate-from-imports
                              --from-spaces=1 --align-imports=0.'''))
 
         parser.add_option_group(group)
+
     if addopts is not None:
         addopts(parser)
     # This is the only way to provide a default value for an option with a
@@ -260,7 +255,22 @@ def parse_args(addopts=None, import_format_params=False, modify_action_params=Fa
         args = ["--symlinks=error"] + sys.argv[1:]
     else:
         args = None
+
     options, args = parser.parse_args(args=args)
+
+    # Set these manually rather than in a callback option because callback
+    # options don't get triggered by OptionParser.set_default (which is
+    # used when setting values via pyproject.toml)
+    if getattr(options, "unaligned", False):
+        parser.values.separate_from_imports = True
+        parser.values.from_spaces = 1
+        parser.values.align_imports = '0'
+
+    if getattr(options, "uniform", False):
+        parser.values.separate_from_imports = False
+        parser.values.from_spaces = 3
+        parser.values.align_imports = '32'
+
     if import_format_params:
         align_imports_args = [int(x.strip())
                               for x in options.align_imports.split(",")]
@@ -380,14 +390,35 @@ class Modifier(object):
 
 
 def process_actions(filenames:List[str], actions, modify_function,
-                    reraise_exceptions=()):
+                    reraise_exceptions=(), exclude=()):
+
+    if not isinstance(exclude, (list, tuple)):
+        raise ConfigurationError(
+            "Exclusions must be a list of filenames/patterns to exclude."
+        )
+
     errors = []
     def on_error_filename_arg(arg):
         print("%s: bad filename %s" % (sys.argv[0], arg), file=sys.stderr)
         errors.append("%s: bad filename" % (arg,))
-    filenames = filename_args(filenames, on_error=on_error_filename_arg)
+    filename_objs = filename_args(filenames, on_error=on_error_filename_arg)
     exit_code = 0
-    for filename in filenames:
+    for filename in filename_objs:
+
+        # Log any matching exclusion patterns before ignoring, if applicable
+        matching_excludes = []
+        for pattern in exclude:
+            if Path(str(filename)).match(str(pattern)):
+                matching_excludes.append(pattern)
+        if any(matching_excludes):
+            msg = f"{filename} matches exclusion pattern"
+            if len(matching_excludes) == 1:
+                msg += f": {matching_excludes[0]}"
+            else:
+                msg += f"s: {matching_excludes}"
+            logger.info(msg)
+            continue
+
         try:
             m = Modifier(modify_function, filename)
             for action in actions:
@@ -533,16 +564,28 @@ symlink_callbacks = {
     'replace': symlink_replace,
 }
 
-def _get_pyproj_toml_config():
-    """
-    Try to find current project pyproject.toml
+def _get_pyproj_toml_file():
+    """Try to find the location of the current project pyproject.toml
     in cwd or parents directories.
+
+    If no pyproject.toml can be found, None is returned.
     """
     cwd = Path(os.getcwd())
 
     for pth in [cwd] + list(cwd.parents):
         pyproj_toml = pth /'pyproject.toml'
         if pyproj_toml.exists() and pyproj_toml.is_file():
-            return loads(pyproj_toml.read_text())
+            return pyproj_toml
 
     return None
+
+def _get_pyproj_toml_config():
+    """Return the toml contents of the current pyproject.toml.
+
+    If no pyproject.toml can be found in cwd or parent directories,
+    None is returned.
+    """
+    pyproject_toml = _get_pyproj_toml_file()
+    if pyproject_toml is not None:
+        return loads(pyproject_toml.read_text())
+    return None

pyflyby/_modules.py

@@ -595,6 +595,12 @@ def _cached_module_finder(
         Tuples containing (prefix+module name, a bool indicating whether the module is a
         package or not)
     """
+    if os.environ.get("PYFLYBY_DISABLE_CACHE", "0") == "1":
+        modules = _iter_file_finder_modules(importer, SUFFIXES)
+        for module, ispkg in modules:
+            yield prefix + module, ispkg
+        return
+
     cache_dir = pathlib.Path(
         platformdirs.user_cache_dir(appname='pyflyby', appauthor=False)
     ) / hashlib.sha256(str(importer.path).encode()).hexdigest()
@@ -610,7 +616,7 @@ def _cached_module_finder(
         for path in cache_dir.iterdir():
             _remove_import_cache_dir(path)
 
-        if os.environ.get("PYFLYBY_SUPPRESS_CACHE_REBUILD_LOGS", 0) != "1":
+        if os.environ.get("PYFLYBY_SUPPRESS_CACHE_REBUILD_LOGS", "1") != "1":
             logger.info(f"Rebuilding cache for {_format_path(importer.path)}...")
 
         modules = _iter_file_finder_modules(importer, SUFFIXES)

pyflyby/_version.py

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

{pyflyby-1.10.1.data → pyflyby-1.10.2.data}/scripts/tidy-imports

@@ -85,6 +85,8 @@ def _addopts(parser):
                         default=True, action='store_false',
                         help=hfmt('''
                             Don't canonicalize imports.'''))
+    parser.add_option('--exclude', type='string', dest='exclude',
+                        action='append', help=hfmt('Files to exclude from formatting.'))
 
 
     def transform_callback(option, opt_str, value, group):
@@ -156,7 +158,12 @@ def main() -> None:
             cannonical_imports = sorted_imports
         return cannonical_imports
 
-    process_actions(args, options.actions, modify)
+    cmdline_exclude = getattr(options, "exclude")
+    process_actions(
+        args,
+        options.actions, modify,
+        exclude=default_config.get('tidy-imports', {}).get('exclude', []) + (cmdline_exclude if cmdline_exclude else [])
+    )
 
 
 if __name__ == '__main__':

{pyflyby-1.10.1.dist-info → pyflyby-1.10.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyflyby
-Version: 1.10.1
+Version: 1.10.2
 Summary: pyflyby - Python development productivity tools, in particular automatic import management
 Author-Email: Karl Chen <quarl@8166.clguba.z.quarl.org>
 License-Expression: MIT
@@ -210,6 +210,7 @@ For example:
 
    Replace /tmp/foo.py? [y/N]
 
+To exclude a file, use `--exclude <pattern>`.
 
 Quick start: import libraries
 =============================
@@ -481,21 +482,37 @@ Per-Project configuration of tidy-imports
 =========================================
 
 You can configure Pyflyby on a per-repository basis by using the
-`[tool.pyflyby]` section of `pyproject.toml` files. Pyflyby will look in current
-working directory and all it's parent until it find a `pyproject.toml` file from
+``[tool.pyflyby]`` section of ``pyproject.toml`` files. Pyflyby will look in current
+working directory and all it's parent until it find a ``pyproject.toml`` file from
 which it will load the defaults.
 
 
 Most of the long command line flags default values can be configured in this
-section. Simply use the long form option name by replacing dashes `-` by
-underscore `_`. For long option that have the form `--xxx` and `--no-xxx`, you
-can assign a boolean to `xxx`. For example::
+section. Simply use the long form option name by replacing dashes ``-`` by
+underscore ``_``. For long option that have the form ``--xxx`` and ``--no-xxx``, you
+can assign a boolean to ``xxx``. For example::
+
+.. code:: toml
 
     [tool.pyflyby]
     add_missing=true
     from_spaces=7
     remove_unused=false
 
+To exclude files from ``tidy-imports``, add an exclusion pattern to
+``tool.pyflyby.tidy-imports.exclude``:
+
+.. code:: toml
+
+    [tool.pyflyby.tidy-imports]
+    exclude = [
+        "foo.py",
+        "baz/*.py"
+    ]
+
+Exclusions are assumed to be relative to the project root if a ``pyproject.toml`` exists, unless an
+absolute path is specified. Consult the documentation for ``pathlib.Path.match`` for information about
+valid exclusion patterns.
 
 Emacs support
 =============

{pyflyby-1.10.1.dist-info → pyflyby-1.10.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
 pyflyby/__init__.py,sha256=sfTZU9wfNQPpgciMJg8lgtu_YagJflnoB-kjnI33css,2918
 pyflyby/__main__.py,sha256=F_so6X2LPdGUrTWjYvRaTOHHXxCmTGPsp5KcX-Vl6Eo,190
 pyflyby/_autoimp.py,sha256=X_4H74AzGM3gQdYoJ2yCu2p56jfWg15NeAQmF6xIu3c,87748
-pyflyby/_cmdline.py,sha256=a8gNW8M2Pd60UVQcXeb9xyBDB8bM0sq5DFYYzXuzCHk,20890
+pyflyby/_cmdline.py,sha256=r4zoGCu9jPE-ZaHmi5PZZiHWR5W7nwEfWSnH0IzpvDo,22123
 pyflyby/_comms.py,sha256=Q3JTbNqkHUw49laMQkFbqCs0FxDy6mi9V2glwdbwfEI,8249
 pyflyby/_dbg.py,sha256=JIyRXYctfmRIqkuBX6Q247q7abWllTeh5i7SxDF_9lc,47023
 pyflyby/_docxref.py,sha256=teYGqDJauLrw6g5mVyXRIl9-q6WuyGjjEj4M8RIkTCU,14117
 pyflyby/_dynimp.py,sha256=y0_RFYAAXOEr8-DYkGfYyFF6z_jkyHZYQXTm40Z54_s,4319
-pyflyby/_fast_iter_modules.cpython-311-x86_64-linux-gnu.so,sha256=XDzuglLvJfVsvvmWAxb6gmsAnGwhSKjDj_QnCjVupDQ,410776
+pyflyby/_fast_iter_modules.cpython-311-x86_64-linux-gnu.so,sha256=z8OxuTFgo4xI9g6BX2FEcFAw8OfRbF3G4NAcItDatV8,410816
 pyflyby/_file.py,sha256=ooM0StVzbhcpcvJGcsx-asXfe7QG0xfs_N-xUpTaqrQ,24449
 pyflyby/_flags.py,sha256=ln-jkzTAiImrC6VB9ENlfjtlIAJp-b50wgWexfFAURw,7201
 pyflyby/_format.py,sha256=GQu6QwFnVJkqEUlru6eZUpEq8Ym14vcwT7KfUrTdXx4,7038
@@ -19,13 +19,13 @@ pyflyby/_importstmt.py,sha256=GM4TDdgzuikvtOjGeJ8F7cVI-noTjRjbqj0REt642t4,23794
 pyflyby/_interactive.py,sha256=nyjsM6QaTqhXJDZ153JoQANmAS2hE5bwMbkrOTFFmg8,83743
 pyflyby/_livepatch.py,sha256=4PRwpGwYEKqrwsON-ko7H_skZjcZhHCzepsjjfyOots,29450
 pyflyby/_log.py,sha256=1OcdfahDeT8zP55ZuFE60VreYubTw9VGS2xHUXrZbhg,2860
-pyflyby/_modules.py,sha256=A27seV6hvDOFyL1vGJH_urnPY9Z6qgrp1RE-hk8mFLw,22893
+pyflyby/_modules.py,sha256=NApMrLgZy_c0dW_tBhTFgx6Fck8-Efnv84WHp07xxUs,23114
 pyflyby/_parse.py,sha256=UI_PrzegGblOtgGuqZqZ1mYaABSTeVCKrUAaEnPYcEc,49300
 pyflyby/_py.py,sha256=gJ8gngAy0u1yfV8bgey4qsMV8-ZOr_wzCOaGVIUvEQk,80264
 pyflyby/_saveframe.py,sha256=pqWvgAYjIxotNvNxIlSS3hrOOITWkfoz6rifnHUgSUA,45992
 pyflyby/_saveframe_reader.py,sha256=8VDN3W13Tb2D_L7QFdR7u9VwPuNxA8AeRsgzajY-dWI,18548
 pyflyby/_util.py,sha256=I_sYNeJ7buzCAYXTef4nmQ_lWZR5EXZOL3bJoeY6QuQ,13840
-pyflyby/_version.py,sha256=8LHnQQli2xOE9W-IPROE_wivflxsgdYdIhZ3N_Se6ng,160
+pyflyby/_version.py,sha256=6beMANZvsfS6NqU1ICCKtP2LOFrEV_zWKmcHNPW36L0,160
 pyflyby/autoimport.py,sha256=GsdvaAmsVepkrR9vHtRkdXVrAqQoCG1OrOxUVOkuFc0,487
 pyflyby/importdb.py,sha256=ClY6LeBuWcPGuia3S05JDlbQQyl79D3QoGy_ciUWSDk,494
 pyflyby/etc/pyflyby/canonical.py,sha256=AEkiB4K19Pw4eKCns5dhnFXMmOJnRuwmly9RYihUwXM,270
@@ -37,19 +37,19 @@ pyflyby/etc/pyflyby/std.py,sha256=pDFU6DDwZZLYD4itkimTI0fljsp4C4EO8fj5_wW21Vo,17
 pyflyby/libexec/pyflyby/colordiff,sha256=TqnG5jATcv9qU2HTuq2mQmb9m_jAjUfNQ4VIUnu5cK8,949
 pyflyby/libexec/pyflyby/diff-colorize,sha256=S6wfKHEafQ9DFqiDvnnd70lrS71n1r1Tm9o2-FwxFgQ,5578
 pyflyby/share/emacs/site-lisp/pyflyby.el,sha256=iKXqFc7kAweJ_TwQUhV3G-SxABme_Idk-iCwzLTmbbY,4122
-pyflyby-1.10.1.data/scripts/collect-exports,sha256=AqGNj2BuIK8RpqLCZJ5Rokqj1Kk4nJYcw9aKFkb96OI,2863
-pyflyby-1.10.1.data/scripts/collect-imports,sha256=8is1rLKRq-1mnyx3pDD7uBKEZt9C1sE1kWlyqpm2YaA,2141
-pyflyby-1.10.1.data/scripts/find-import,sha256=_EmUDFQXCv_2tx79OyWBzdTKm_d8umVW7RY06jspYCE,932
-pyflyby-1.10.1.data/scripts/list-bad-xrefs,sha256=57krqCqA63LIt6C0YGbE_F4eZYYr5F8qE-eg_DNMgRc,1027
-pyflyby-1.10.1.data/scripts/prune-broken-imports,sha256=Wt2G8jTrVQKexUjqblrL5TXQfgRH3edctYukIBNZUVU,861
-pyflyby-1.10.1.data/scripts/pyflyby-diff,sha256=TqnG5jATcv9qU2HTuq2mQmb9m_jAjUfNQ4VIUnu5cK8,949
-pyflyby-1.10.1.data/scripts/reformat-imports,sha256=PIT4kqE_1HenKvtDSpmyH386Ht5HvT1JlWjSb5mja8w,690
-pyflyby-1.10.1.data/scripts/replace-star-imports,sha256=7P8KbCX4K5cc6F-TT4KfGVeWkI0KWK38be8IRRyZfU8,913
-pyflyby-1.10.1.data/scripts/saveframe,sha256=bqU58kNDConm51zTpM3J37c-uhlDo-Uj8fOQ-rnYhwM,12074
-pyflyby-1.10.1.data/scripts/tidy-imports,sha256=OcI1ghA0hn6JPkL7U-8I57db5HvP2P0jsmNsMZhHr_A,6686
-pyflyby-1.10.1.data/scripts/transform-imports,sha256=IAMZTrHsZO5aRwF1exXGPhfL6UawUzJZmSl87K65elY,1450
-pyflyby-1.10.1.dist-info/METADATA,sha256=U67-2QqjcCEeXYsoBGwD50HDIArLDwjIPKFoOUtNZag,17628
-pyflyby-1.10.1.dist-info/WHEEL,sha256=e-oFlY3eLJQVVkSrz9ixwUyvzXafqjrUD6YYCD18aKo,99
-pyflyby-1.10.1.dist-info/entry_points.txt,sha256=aGXu4O2RcVf2hy1daq-edciSegKffMs7GDat7G-2p3k,70
-pyflyby-1.10.1.dist-info/RECORD,,
-pyflyby-1.10.1.dist-info/licenses/LICENSE.txt,sha256=cSDlWua5QEFNdBRChGEKcS_5ABQ2220A3OkP10Q9RA0,1188
+pyflyby-1.10.2.data/scripts/collect-exports,sha256=AqGNj2BuIK8RpqLCZJ5Rokqj1Kk4nJYcw9aKFkb96OI,2863
+pyflyby-1.10.2.data/scripts/collect-imports,sha256=8is1rLKRq-1mnyx3pDD7uBKEZt9C1sE1kWlyqpm2YaA,2141
+pyflyby-1.10.2.data/scripts/find-import,sha256=_EmUDFQXCv_2tx79OyWBzdTKm_d8umVW7RY06jspYCE,932
+pyflyby-1.10.2.data/scripts/list-bad-xrefs,sha256=57krqCqA63LIt6C0YGbE_F4eZYYr5F8qE-eg_DNMgRc,1027
+pyflyby-1.10.2.data/scripts/prune-broken-imports,sha256=Wt2G8jTrVQKexUjqblrL5TXQfgRH3edctYukIBNZUVU,861
+pyflyby-1.10.2.data/scripts/pyflyby-diff,sha256=TqnG5jATcv9qU2HTuq2mQmb9m_jAjUfNQ4VIUnu5cK8,949
+pyflyby-1.10.2.data/scripts/reformat-imports,sha256=PIT4kqE_1HenKvtDSpmyH386Ht5HvT1JlWjSb5mja8w,690
+pyflyby-1.10.2.data/scripts/replace-star-imports,sha256=7P8KbCX4K5cc6F-TT4KfGVeWkI0KWK38be8IRRyZfU8,913
+pyflyby-1.10.2.data/scripts/saveframe,sha256=bqU58kNDConm51zTpM3J37c-uhlDo-Uj8fOQ-rnYhwM,12074
+pyflyby-1.10.2.data/scripts/tidy-imports,sha256=HmODd58QhWn6fap6-S5ohBy-qsLbnDnQa0uyYg5fNws,7035
+pyflyby-1.10.2.data/scripts/transform-imports,sha256=IAMZTrHsZO5aRwF1exXGPhfL6UawUzJZmSl87K65elY,1450
+pyflyby-1.10.2.dist-info/METADATA,sha256=eAR1Ak0wg2qWvezeEcq4SD4_DpAz4yBurG5nWZDT5iE,18151
+pyflyby-1.10.2.dist-info/WHEEL,sha256=e-oFlY3eLJQVVkSrz9ixwUyvzXafqjrUD6YYCD18aKo,99
+pyflyby-1.10.2.dist-info/entry_points.txt,sha256=aGXu4O2RcVf2hy1daq-edciSegKffMs7GDat7G-2p3k,70
+pyflyby-1.10.2.dist-info/RECORD,,
+pyflyby-1.10.2.dist-info/licenses/LICENSE.txt,sha256=cSDlWua5QEFNdBRChGEKcS_5ABQ2220A3OkP10Q9RA0,1188