python-clu 0.12.8__tar.gz → 0.12.11__tar.gz

{python_clu-0.12.8 → python_clu-0.12.11}/.bumpversion.toml

@@ -1,6 +1,6 @@
 
 [tool.bumpversion]
-current_version = "0.12.8"
+current_version = "0.12.11"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

{python_clu-0.12.8 → python_clu-0.12.11}/CHANGELOG.md

@@ -1,10 +1,88 @@
 # Changelog
 
 
-## 0.12.7:pre5+gf7f3ce2 [SNAPSHOT]
+## 0.12.10:pre1+g4e2fdbd [SNAPSHOT]
 
 ### Other
 
+* Ahhhh my home-brewed classifier didn’t work, booooo. [Alexander Böhn]
+
+
+## v0.12.10 (2025-05-25)
+
+### Other
+
+* Bumped version: 0.12.9 → 0.12.10. [Alexander Böhn]
+
+* [make] New changelog added. [Alexander Böhn]
+
+* Fixed `clu.naming.qualified_name_tuple(…)` to work for module objects. [Alexander Böhn]
+
+  … this involved special-casing the whole thing, but it was worth it,
+    as it just wasn’t fucking working for this entire case this whole
+    time, which is fucking embarrasing. Yes!
+
+* More requirement/REPL-import adjustments. [Alexander Böhn]
+
+* Code of Conduct clarification. [Alexander Böhn]
+
+* Classifier tidy-up. [Alexander Böhn]
+
+* Gentlemen prefer f-strings. [Alexander Böhn]
+
+* Updating straggling little info corners that didn’t get the memo. [Alexander Böhn]
+
+
+## v0.12.9 (2025-05-24)
+
+### Add
+
+* Added a `clu.predicates.pyqualname(…)` function. [Alexander Böhn]
+
+  … which of course does exactly what you think it does, in that it
+    privliges the “__qualname__” with what it returns for whatever
+    argument thing it is passed. Have fun you guys
+
+### Other
+
+* Bumped version: 0.12.8 → 0.12.9. [Alexander Böhn]
+
+* [make] New changelog added. [Alexander Böhn]
+
+* Removed (fortunately vestigial) Click package dependency. [Alexander Böhn]
+
+* Expanded “getdoc” codepath in `clu.repl.ansi.signature(…)` [Alexander Böhn]
+
+* Using new `clu.predicates.pyqualname(…)` in `clu.naming.qualified_name(…)` [Alexander Böhn]
+
+  … this closes Issue #14! Q.v. https://github.com/fish2000/CLU/issues/14
+  … An upcoming release will demonstrate this through the “clu-ansidocs”
+    command
+
+* Special-cased `filter(…)` call should be fastest. [Alexander Böhn]
+
+  … tests do indicate as such, it appears, actually, now that you mention
+
+* More updates, cleanup, and addenda in `clu.enums` [Alexander Böhn]
+
+* The `clu.enums.alias(…)` class is now itself `clu.abstract.Slotted` [Alexander Böhn]
+
+  … as in, that is now its metaclass. This makes probably such zero
+    difference in anything in the universe it shames me to have even
+    brought this much attention to it here and now, and I really do
+    apologize, I do, yes.
+
+* Refactored `clu.naming.isnative(…)` around an edge case. [Alexander Böhn]
+
+
+## v0.12.8 (2025-05-24)
+
+### Other
+
+* Bumped version: 0.12.7 → 0.12.8. [Alexander Böhn]
+
+* [make] New changelog added. [Alexander Böhn]
+
 * Fixes in `clu.naming.{qualified_import,main_module_mame}(…)` [Alexander Böhn]
 
   … “main_module_name(…)” was failing when called within bpython; now,

{python_clu-0.12.8 → python_clu-0.12.11}/CLASSIFIERS.txt

@@ -5,7 +5,6 @@ Topic :: Software Development
 Topic :: Software Development :: Testing
 Topic :: Utilities
 Operating System :: MacOS
-Operating System :: Microsoft :: Windows
 Operating System :: OS Independent
 Operating System :: POSIX
 Operating System :: Unix

{python_clu-0.12.8 → python_clu-0.12.11}/CODE_OF_CONDUCT.md

@@ -74,3 +74,10 @@ available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.ht
 
 For answers to common questions about this code of conduct, see
 https://www.contributor-covenant.org/faq
+
+## The Main Thing
+
+Do not be dicks. If you or people you happen to like are dicks, they will have to go
+be dickish elsewhere, and in exrtreme cases you’ll be reported to the FBI or perhaps
+shot at dawn through the lungs, to prevent you from being such dickhead morons.
+OK? OK.

{python_clu-0.12.8 → python_clu-0.12.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-clu
-Version: 0.12.8
+Version: 0.12.11
 Summary: Python-CLU: Common Lightweight Utilities
 Home-page: https://github.com/fish2000/clu
 Download-URL: https://github.com/fish2000/clu/zipball/master
@@ -24,7 +24,6 @@ Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Testing
 Classifier: Topic :: Utilities
 Classifier: Operating System :: MacOS
-Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
@@ -36,7 +35,6 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: build>=1.2.2
-Requires-Dist: Click>=7.0
 Requires-Dist: colorama>=0.4.0
 Requires-Dist: dataclasses>=0.6; python_version < "3.7"
 Requires-Dist: dbx-stopwatch>=1.6

python_clu-0.12.11/clu/__version__.py

@@ -0,0 +1 @@
+__version__ = '0.12.11'

{python_clu-0.12.8 → python_clu-0.12.11}/clu/api/__init__.py

@@ -2,7 +2,6 @@
 from __future__ import print_function
 
 import abc
-import click
 import sys
 
 abstract = abc.abstractmethod
@@ -39,19 +38,6 @@ class CommandBase(ModuleBase):
 class Command(CommandBase[Module]):
     commandstr = "command" # …a reserved word?
 
-class CLUI(click.MultiCommand):
-    
-    def iter_commands(self, context):
-        modules = modules_for_appname_and_appspace(consts.APPNAME, API_APPSPACE)
-        yield from (module.commandname for module in modules)
-    
-    def list_commands(self, context):
-        return list(self.iter_commands(context))
-    
-    def get_command(self, context, key):
-        dotpath = dotpath_join(consts.APPNAME, API_APPSPACE, key)
-        return dotpath
-
 # Assign the modules’ `__all__` and `__dir__` using the exporter:
 __all__, __dir__ = exporter.all_and_dir()
 
@@ -60,17 +46,11 @@ def test():
     from clu.testing.utils import inline
     
     @inline
-    def test_one():
+    def test_command_imports():
         """ Command import test """
         from clu.commands import Command as command
         assert command
     
-    @inline
-    def test_two():
-        """ Sanity-check CLUI """
-        clui = CLUI()
-        assert clui
-    
     return inline.test(100)
 
 if __name__ == '__main__':

{python_clu-0.12.8 → python_clu-0.12.11}/clu/enums.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 
+import clu.abstract
+
 from clu.constants.polyfills import Enum, EnumMeta # type: ignore
 from clu.exporting import Exporter
 
@@ -9,10 +11,10 @@ export = exporter.decorator()
     
 # Dunder and sunder name constants for the alias dict:
 DUNDER = '__aliases__'
-SUNDER = '_aliases_'
+MIFFLIN = SUNDER = '_aliases_'
 
 @export
-class alias(object):
+class alias(clu.abstract.BaseDescriptor, metaclass=clu.abstract.Slotted):
     
     __slots__ = ('name', 'aliased')
     
@@ -65,7 +67,7 @@ class alias(object):
         return self.member_for_value(cls, self.aliased)
     
     def __set_name__(self, cls, name):
-        """ Register the alias within the __aliases__ dict in
+        """ Register the alias within the `__aliases__` dict in
             the class (if it has one).
             
             N.B. This only gets called on Python 3.6+
@@ -102,26 +104,26 @@ class alias(object):
 class AliasingEnumMeta(EnumMeta):
     
     def __new__(metacls, name, bases, attributes, **kwargs):
-        """ Ensure __aliases__ is a dictionary attribute on the new class.
+        """ Ensure `__aliases__` is a dictionary attribute on the new class.
             
             It is not strictly necessary to make this class an ancestor to
             your enums in order to use the `alias(…)` descriptor function,
             as defined above – if you do, the enums you define with it will
-            conveniently furnish the __aliases__ dictionary, which is like
-            the normal enum __members__ directory only with aliases. Yes.
+            conveniently furnish the `__aliases__` dictionary, which is like
+            the normal enum `__members__` directory only with aliases. Yes.
         """
         
         if '__aliases__' not in attributes:
             attributes['__aliases__'] = {}
         
-        return super(AliasingEnumMeta, metacls).__new__(metacls, name,
-                                                                 bases,
-                                                                 attributes,
-                                                               **kwargs)
+        return super().__new__(metacls, name,
+                                        bases,
+                                        attributes,
+                                      **kwargs)
 
 @export
 class AliasingEnum(Enum, metaclass=AliasingEnumMeta):
-    """ An Enum subclass intermediate, suitable for subclassing
+    """ An `Enum` subclass intermediate, suitable for subclassing
         itself, that uses `AliasingEnumMeta` as its metaclass.
         
         …Thus, any member aliases that one makes in concrete
@@ -132,4 +134,4 @@ class AliasingEnum(Enum, metaclass=AliasingEnumMeta):
     pass
 
 # Assign the modules’ `__all__` and `__dir__` using the exporter:
-__all__, __dir__ = exporter.all_and_dir()
+__all__, __dir__ = exporter.all_and_dir('DUNDER', 'MIFFLIN', 'SUNDER')

{python_clu-0.12.8 → python_clu-0.12.11}/clu/naming.py

@@ -32,7 +32,7 @@ def determine_module(thing, name=None):
     import pickle
     return pickle.whichmodule(thing, name) # type: ignore
 
-"""
+__doc__ = """
 NAME AND MODULE SEARCH FUNCTIONS: the “nameof(…)” and “moduleof(…)”
 functions each search through, in order:
   
@@ -177,12 +177,26 @@ def isnative(thing):
     """ isnative(thing) → boolean predicate, True if `thing`
         comes from a native-compiled (“extension”) module.
     """
-    module = moduleof(thing)
-    if module == 'builtins':
+    # Grab the name of the module of the thing:
+    module_name = moduleof(thing)
+    
+    # Not native:
+    if module_name == 'builtins':
         return False
-    return isnativemodule(
-           importlib.import_module(
-                            module))
+    
+    try:
+        # 99.99999999% of the time this should work
+        module = importlib.import_module(module_name)
+    except ModuleNotFoundError as error:
+        # This error indicates a native module, strangely:
+        if """named 'bin'""" in str(error):
+            return True
+    else:
+        # Delegate deciding about the module:
+        return isnativemodule(module)
+    
+    # We couldn’t figure this one out – so no false positives:
+    return False
 
 @export
 def isinspectable(thing):
@@ -235,7 +249,7 @@ def dotpath_split(dotpath):
 
 @export
 def qualified_import(qualified):
-    """ Import a qualified thing-name.
+    """ Import a thing based on its full thing-name.
         e.g. 'instakit.processors.halftone.FloydSteinberg'
     """
     if QUALIFIER not in qualified:
@@ -253,16 +267,29 @@ def qualified_name_tuple(thing):
     """ Get the thing-name and module/package name for a class or module.
         e.g. ('FloydSteinberg', 'instakit.processors.halftone')
     """
-    return nameof(thing), moduleof(thing)
+    from clu.predicates import pyqualname, pyname
+    from clu.typology import ismodule
+    
+    # Special case for figuring out module names:
+    if ismodule(thing):
+        putative = pyname(thing)
+        if QUALIFIER in putative:
+            partition = putative.rpartition(QUALIFIER)
+            return partition[-1:][0], partition[:-1][0]
+        else:
+            return putative, ''
+    
+    return pyqualname(thing) or nameof(thing), \
+                              moduleof(thing)
 
 @export
 def qualified_name(thing):
-    """ Get a qualified thing-name for a thing.
+    """ Get a full thing-name for a thing.
         e.g. 'instakit.processors.halftone.FloydSteinberg'
     """
     thing_name, module_name = qualified_name_tuple(thing)
-    qualname = dotpath_join(module_name, thing_name)
-    return qualname
+    fullname = dotpath_join(module_name, thing_name)
+    return fullname
 
 @export
 def dotpath_to_prefix(dotpath, sep='-', end='-'):

{python_clu-0.12.8 → python_clu-0.12.11}/clu/predicates.py

@@ -292,6 +292,7 @@ uncallable      = negate(callable) # type: ignore
 hoist           = lambda thing: uncallable(thing) and wrap_value(thing) or thing
 
 pyname          = lambda thing: pyattr(thing, 'name', 'qualname')
+pyqualname      = lambda thing: pyattr(thing, 'qualname', 'name')
 pymodule        = lambda thing: pyattr(thing, 'module', 'package')
 
 the_expandables = (tuple, list, set, frozenset,
@@ -435,7 +436,7 @@ def tuplize(*items):
 def uniquify(*items):
     """ uniquify(*items) → Return a generator yielding a unique set of all non-`None` arguments """
     seen = set() # type: set
-    for item in filter(isnotnone, items):
+    for item in filter(None, items):
         if item not in seen:
             seen.add(item)
             yield item
@@ -583,8 +584,9 @@ export(true_function,   name='true_function',   doc="true_function() → A funct
 export(false_function,  name='false_function',  doc="false_function() → A function that always returns False")
 export(uncallable,      name='uncallable',      doc="uncallable(thing) → boolean predicate, shortcut for `not callable(thing)`")
 export(hoist,           name='hoist',           doc="hoist(thing) → if “thing” isn’t already callable, turn it into a lambda that returns it as a value (using “wrap_value(…)”).")
-export(pyname,          name='pyname',          doc="pyname(thing) → Return either `__qualname__` or `__name__` from a given `thing`")
-export(pymodule,        name='pymodule',        doc="pymodule(thing) → Return either `__module__` or `__package__` from a given `thing`")
+export(pyname,          name='pyname',          doc="pyname(thing) → Return either `__qualname__` or `__name__` (in that order) from a given `thing`")
+export(pyqualname,      name='pyqualname',      doc="pyqualname(thing) → Return either `__name__` or `__qualname__` (in that order) from a given `thing`")
+export(pymodule,        name='pymodule',        doc="pymodule(thing) → Return either `__module__` or `__package__` (in that order) from a given `thing`")
 
 export(isexpandable,    name='isexpandable',    doc="isexpandable(thing) → boolean predicate, True if `thing` can be `*expanded`")
 export(isnormative,     name='isnormative',     doc="isnormative(thing) → boolean predicate, True if `thing` is a string-like or bytes-like iterable")

{python_clu-0.12.8 → python_clu-0.12.11}/clu/repl/ansi.py

@@ -493,12 +493,11 @@ def signature(thing):
     """
     try:
         return nameof(thing) + str(inspect.signature(thing))
-    except ValueError as exc:
-        if 'no signature found' in str(exc):
-            doc = inspect.getdoc(thing)
-            if doc:
-                return arrow_re.sub(arrow_sb,
-                                    doc.splitlines()[0].strip())
+    except (TypeError, ValueError):
+        doc = inspect.getdoc(thing)
+        if doc:
+            return arrow_re.sub(arrow_sb,
+                                doc.splitlines()[0].strip())
     return None
 
 @export

{python_clu-0.12.8 → python_clu-0.12.11}/clu/scripts/repl.py

@@ -76,16 +76,13 @@ GLOBALS = globals()
 starmods = ('clu.repl.ansi',
             'clu.repl.columnize',
             'clu.repl.modules',
-            'clu.constants.enums',
-            'clu.constants.data',
-            'clu.application',
             'clu.config.abc',
             'clu.config.env',
             'clu.config.keymap',
             'clu.config.proxy',
-            'clu.dicts', 'clu.enums', 'clu.exporting',
+            'clu.dicts', 'clu.exporting',
             'clu.importing', 'clu.naming', 'clu.predicates', 'clu.typology',
-            'clu.fs.abc', 'clu.fs.filesystem', 'clu.fs.misc', 'clu.repr',
+            'clu.fs.filesystem', 'clu.fs.misc',
             'clu.scripts.treeline',
             'clu.typespace.namespace',
             'clu.testing.utils')
@@ -94,15 +91,20 @@ mods = ('clu',
         'clu.all',
         'clu.abstract',
         'clu.constants.consts',
+        'clu.constants.data',
+        'clu.constants.enums',
         'clu.constants.polyfills',
         'clu.config.codecs',
         'clu.config.ns',
         'clu.csv',
+        'clu.enums',
+        'clu.fs.abc',
         'clu.fs.appdirectories',
         'clu.keyvalue',
         'clu.mathematics',
         'clu.dispatch', 'clu.sanitizer', 'clu.fs.pypath',
         'clu.extending', 'clu.shelving.redat',
+        'clu.repr',
         'clu.scripts.ansicolors',
         'clu.scripts.treeline',
         'clu.stdio',
@@ -113,7 +115,7 @@ mods = ('clu',
         'datetime', 'functools', 'importlib', 'inspect',
         'itertools', 'math', 'operator', 'pathlib',
         'pickle', 'six', 'shutil', 'sysconfig', 'weakref',
-        'numpy', 'more_itertools', 'colorama',
+        'numpy', 'colorama',
         'xerox', 'zict')
 
 # “Star-import” all starmods – this is equivalent to doing:

{python_clu-0.12.8 → python_clu-0.12.11}/python_clu.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-clu
-Version: 0.12.8
+Version: 0.12.11
 Summary: Python-CLU: Common Lightweight Utilities
 Home-page: https://github.com/fish2000/clu
 Download-URL: https://github.com/fish2000/clu/zipball/master
@@ -24,7 +24,6 @@ Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Testing
 Classifier: Topic :: Utilities
 Classifier: Operating System :: MacOS
-Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
@@ -36,7 +35,6 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: build>=1.2.2
-Requires-Dist: Click>=7.0
 Requires-Dist: colorama>=0.4.0
 Requires-Dist: dataclasses>=0.6; python_version < "3.7"
 Requires-Dist: dbx-stopwatch>=1.6

{python_clu-0.12.8 → python_clu-0.12.11}/python_clu.egg-info/requires.txt

@@ -1,5 +1,4 @@
 build>=1.2.2
-Click>=7.0
 colorama>=0.4.0
 dbx-stopwatch>=1.6
 humanize>=1.0.0

{python_clu-0.12.8 → python_clu-0.12.11}/requirements/dev.txt

@@ -11,7 +11,6 @@ coverage>=5.0.0
 curtsies>=0.3.1
 cython>=0.29.14
 gfm>=0.0.2
-greenlet>=0.4.0
 ipython>=7.10.0
 jedi>=0.16.0
 lmdb>=0.8.0

{python_clu-0.12.8 → python_clu-0.12.11}/requirements/install.txt

@@ -1,5 +1,4 @@
 build>=1.2.2
-Click>=7.0
 colorama>=0.4.0
 dataclasses>=0.6; python_version < '3.7'
 dbx-stopwatch>=1.6

{python_clu-0.12.8 → python_clu-0.12.11}/setup.py

@@ -23,13 +23,12 @@
 #    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
 #    SOFTWARE.
 #
-''' CLU - Common Lightweight Utilities, or Command-Line Utilities (your pick) '''
+''' CLU - Common Lightweight Utilities '''
 
 from __future__ import print_function
 from setuptools import setup, find_packages
 
-import os
-import sys
+import sys, os, io
 import sysconfig
 
 # CONSTANTS
@@ -40,11 +39,9 @@ AUTHOR_USER = 'fish2000'
 GITHUB = 'github.com'
 GMAIL = 'gmail.com'
 
-AUTHOR_EMAIL = '%s@%s' % (AUTHOR_USER, GMAIL)
-PROJECT_GH_URL = 'https://%s/%s/%s' % (GITHUB,
-                                       AUTHOR_USER,
-                                       PROJECT_NAME)
-PROJECT_DL_URL = '%s/zipball/master' % PROJECT_GH_URL
+AUTHOR_EMAIL = f'{AUTHOR_USER}@{GMAIL}'
+PROJECT_GH_URL = f'https://{GITHUB}/{AUTHOR_USER}/{PROJECT_NAME}'
+PROJECT_DL_URL = f'{PROJECT_GH_URL}/zipball/master'
 
 KEYWORDS = ('command',
             'utilities', PROJECT_NAME,
@@ -69,15 +66,14 @@ ENTRY_POINTS = {
 }
 
 def project_content(*filenames):
-    import io
     filepath = os.path.join(CWD, *filenames)
     if not os.path.isfile(filepath):
-        raise IOError("""File %s doesn't exist""" % filepath)
+        raise IOError(f"File {filepath} doesn't exist")
     out = ''
     with io.open(filepath, 'r') as handle:
         out += handle.read()
     if not out:
-        raise ValueError("""File %s couldn't be read""" % os.path.sep.join(filenames))
+        raise ValueError(f"File {filepath} couldn't be read")
     return out.strip()
 
 # PROJECT VERSION & METADATA
@@ -88,7 +84,7 @@ try:
             '__version__.py')).read(),
             '__version__.py', 'exec'))
 except:
-    __version__ = '0.12.8'
+    __version__ = '0.12.11'
 
 # PROJECT DESCRIPTION
 LONG_DESCRIPTION = project_content('ABOUT.md')

python_clu-0.12.8/clu/__version__.py

@@ -1 +0,0 @@
-__version__ = '0.12.8'