python-clu 0.12.21__tar.gz → 0.12.23__tar.gz

{python_clu-0.12.21 → python_clu-0.12.23}/.bumpversion.toml

@@ -1,6 +1,6 @@
 
 [tool.bumpversion]
-current_version = "0.12.21"
+current_version = "0.12.23"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"
@@ -29,4 +29,15 @@ replace = """__version__ = '{new_version}'"""
 [[tool.bumpversion.files]]
 filename = "clu/__version__.py"
 search = """__version__ = '{current_version}'"""
-replace = """__version__ = '{new_version}'"""
+replace = """__version__ = '{new_version}'"""
+
+[[tool.bumpversion.files]]
+filename = "CITATION.cff"
+search = """version: {current_version}"""
+replace = """version: {new_version}"""
+
+[[tool.bumpversion.files]]
+filename = "CITATION.cff"
+search = """date-released: \\d{{4}}"""
+replace = """date-released: {now:%Y}"""
+regex = true

{python_clu-0.12.21 → python_clu-0.12.23}/CHANGELOG.md

@@ -1,7 +1,45 @@
 # Changelog
 
 
-## 0.12.20 [release]
+## v0.12.22 (2026-08-18)
+
+### Bump
+
+* Bumped version: 0.12.21 → 0.12.22. [Alexander Böhn]
+
+### Add
+
+* Added additional TOML file validation to `noxfile` … right now we’re just running “.bumpversion.toml” through it all,   but it’s nice to have. You know, for the future. Yes! [Alexander Böhn]
+
+* Added a `CITATION.cff` file, and rearranged imports in `clu.dicts` [Alexander Böhn]
+
+  … the “CITATION.cff” file goes with “orcid.org”; see also:
+    - https://orcid.org/0009-0007-9645-1744
+
+  … and the “clu.dicts” reshuffle was because I was for some reason
+    at one point paranoid about needing, for some reason, to be able
+    to import “clu.dicts” within “clu.predicates” or “clu.typology”.
+    That isn’t necessary, and it’s time to stop writing “defensive code”
+    around this for no reason, yeah? Yeah!
+
+### Remove
+
+* Removed py.test legacy config file … this ensures it uses the config stuff in “pyproject.toml” [Alexander Böhn]
+
+### Other
+
+* [make] Changelog updated @ 02e3900. [Alexander Böhn]
+
+* Assuaging the whinging by the latest py.test version. [Alexander Böhn]
+
+* Cleaner logic for short-circuting in `clu.config.keymap.Flat` … Kind of a nothingburger, but I’ll likely spread this notion   around, because it assuages my OCD. [Alexander Böhn]
+
+
+## v0.12.21 (2025-11-26)
+
+### Bump
+
+* Bumped version: 0.12.20 → 0.12.21. [Alexander Böhn]
 
 ### New
 
@@ -46,6 +84,8 @@
 
 ### Other
 
+* [make] Changelog updated @ 46e4b9a. [Alexander Böhn]
+
 * Working around enhanced rigorousness (?!) in `pickle.whichmodule(…)` [Alexander Böhn]
 
   … like WTF, so forever you would call this random module function –

python_clu-0.12.23/CITATION.cff

@@ -0,0 +1,10 @@
+cff-version: 1.2.0
+message: "If you use this software, please cite it as below."
+authors:
+- family-names: "Böhn"
+  given-names: "Alexander"
+  orcid: "https://orcid.org/0009-0007-9645-1744"
+title: "CLU"
+version: 0.12.23
+date-released: 2026
+url: "https://github.com/fish2000/CLU"

{python_clu-0.12.21 → python_clu-0.12.23}/MANIFEST.in

@@ -11,6 +11,7 @@ include appveyor.yml
 include codecov.yml
 
 include ABOUT.md
+include CITATION.cff
 include CHANGELOG.md
 include CLASSIFIERS.txt
 include CLU_Treatment.md

{python_clu-0.12.21 → python_clu-0.12.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-clu
-Version: 0.12.21
+Version: 0.12.23
 Summary: Python-CLU: Common Lightweight Utilities
 Home-page: https://github.com/fish2000/clu
 Download-URL: https://github.com/fish2000/clu/zipball/master

python_clu-0.12.23/clu/__version__.py

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

{python_clu-0.12.21 → python_clu-0.12.23}/clu/config/keymap.py

@@ -142,10 +142,8 @@ class Flat(FrozenFlat, abc.KeyMap):
             mapping, or over only those key/value pairs in the mapping whose
             keys match the specified namespace values.
         """
-        if unprefixed:
-            return super().items(unprefixed=True)
-        if not namespaces:
-            return super().items()
+        if unprefixed or not namespaces:
+            return super().items(unprefixed=unprefixed)
         return ((key, value) for key, value in self.dictionary.items() \
                 if any(ns.namespace_matches(key, namespace) for namespace in namespaces))
     

{python_clu-0.12.21 → python_clu-0.12.23}/clu/dicts.py

@@ -14,8 +14,18 @@ import sys
 
 from clu.constants.consts import STRINGPAIR, WHITESPACE, NoDefault
 from clu.config.abc import FlatOrderedSet as FOSet
-from clu.naming import qualified_name
-from clu.typology import iterlen
+from clu.naming import isbuiltin, nameof, qualified_name
+from clu.typespace.namespace import isnamespace
+
+from clu.predicates import (haspyattr, or_none,
+                            getitem, finditem, try_items,
+                            item_search, item_across,
+                            tuplize, typeof)
+
+from clu.typology import (iterlen, subclasscheck,
+                          ismapping, isstring,
+                          isset, issequence)
+
 from clu.exporting import Exporter
 
 exporter = Exporter(path=__file__)
@@ -115,12 +125,14 @@ class ChainRepr(Repr):
     
     def subrepr(self, thing, level):
         """ An internal “core” repr helper method. """
-        from clu.typology import ismapping
-        
         # For mappings, go down another level:
         if ischainmap(thing) or ismapping(thing):
             return self.repr1(thing, level - 1)
         
+        # for sequences, use “seqrepr(…)”:
+        if isset(thing) or issequence(thing):
+            return self.repr1(tuplize(thing), level - 1)
+        
         # For everything else, defer to the type:
         return repr(thing)
     
@@ -137,17 +149,29 @@ class ChainRepr(Repr):
             item = STRINGPAIR.format(key, self.subrepr(mapping[key], level))
             return f"{{ {item} }}"
         
-        # Format all items:
+        # Pair all key-values off into individual items:
         items = tuple(STRINGPAIR.format(key, self.subrepr(mapping[key], level)) \
                                     for key in mapping.keys())
         
+        # Format the item list as a sequence
+        return self.seqrepr(items, level)
+    
+    def seqrepr(self, sequence, level):
+        """ The internal method for “core” repr production of
+            any and all sequence data
+        """
+        if len(sequence) == 0:
+            return "[]"
+        elif len(sequence) == 1:
+            return f"'{sequence[0]}'"
+        
         # Compute indentation levels:
         ts = "    " * (int(self.maxlevel - level) + 1)
         ls = "    " * (int(self.maxlevel - level) + 0)
-        total = (f",\n{ts}").join(items)
+        total = (f",\n{ts}").join(sequence)
         
         # Return the formatted map contents:
-        return f"{{ \n{ts}{total}\n{ls}}}"
+        return f"[[ \n{ts}{total}\n{ls}]]"
     
     def toprepr(self, chainmap, level):
         """ The “top-level” ChainMap-specific repr method –
@@ -155,7 +179,6 @@ class ChainRepr(Repr):
             that comprise the ChainMap instance, and dispatch
             sub-repr method calls accordingly.
         """
-        from clu.naming import isbuiltin, nameof
         from clu.testing.utils import multiple
         
         # Typename and map item counts:
@@ -243,6 +266,24 @@ class ChainRepr(Repr):
     def repr_FrozenNested(self, mapping, level):
         return self.primerepr(mapping, level)
     
+    def repr_set(self, sequence, level):
+        return self.seqrepr(tuplize(sequence), level)
+    
+    def repr_frozenset(self, sequence, level):
+        return self.seqrepr(tuplize(sequence), level)
+    
+    def repr_list(self, sequence, level):
+        return self.seqrepr(sequence, level)
+    
+    def repr_tuple(self, sequence, level):
+        return self.seqrepr(sequence, level)
+    
+    def repr_generator(self, sequence, level):
+        return self.seqrepr(tuplize(sequence), level)
+    
+    def repr_FlatOrderedSet(self, sequence, level):
+        return self.seqrepr(tuplize(sequence.things), level)
+    
     def shortrepr(self, thing):
         """ Return the “short” repr of a chainmap instance –
             all whitespace will be condensed to single spaces
@@ -321,7 +362,6 @@ class ChainMap(collections.abc.MutableMapping,
         raise KeyError(key)
     
     def __getitem__(self, key):
-        from clu.predicates import try_items
         try:
             return try_items(key, *self.maps)
         except KeyError:
@@ -354,7 +394,6 @@ class ChainMap(collections.abc.MutableMapping,
         """
         if default is NoDefault:
             return self[key]
-        from clu.predicates import getitem
         return getitem(self, key, default=default)
     
     def mapchain(self):
@@ -439,7 +478,6 @@ class ChainMap(collections.abc.MutableMapping,
             containing an item by the specified name, may optionally
             be passsed in as well.
         """
-        from clu.predicates import finditem
         if default is NoDefault:
             return finditem(itx, *self.maps) or { itx : self.__missing__(itx) }
         return finditem(itx, *self.maps, default=default)
@@ -517,7 +555,6 @@ class ChainMapPlusPlus(ChainMap):
     
     def getall(self, key, default=NoDefault):
         """ Return all values for a key. """
-        from clu.predicates import item_across
         if default is NoDefault:
             return item_across(key, *self.dicts) or self.__missing__(key)
         return item_across(key, *self.dicts, default=default)
@@ -550,7 +587,6 @@ def ischainmap(thing):
         focus on. I didn’t want to disappoint. Now I miss everybody,
         is it still light outside?
     """
-    from clu.typology import subclasscheck
     return subclasscheck(thing, (ChainMap, collections.ChainMap))
 
 # DICT FUNCTIONS: dictionary-merging
@@ -623,7 +659,6 @@ def merge_two(one, two, *, cls=dict, **overrides):
         
         Based on this docopt example source: https://git.io/fjCZ6
     """
-    from clu.predicates import typeof, item_search
     cls = typeof(cls or one)
     zero = dict(overrides)
     keys = tuple(frozenset(zero.keys()) | frozenset(one.keys()) | frozenset(two.keys()))
@@ -635,7 +670,6 @@ def merge_as(*dicts, cls=dict, **overrides):
     """ Merge all dictionary arguments into a new instance of the specified class,
         passing all additional keyword arguments to the class constructor as overrides
     """
-    from clu.predicates import typeof, item_search
     cls = typeof(cls or (dicts and dicts[0] or dict))
     dicts = [dict(overrides), *dicts]
     keyset = set()
@@ -658,9 +692,6 @@ def merge(*dicts, **overrides):
 @export
 def asdict(thing): # pragma: no cover
     """ asdict(thing) → returns either thing, thing.__dict__, or dict(thing) as necessary """
-    from clu.predicates import haspyattr, or_none, typeof
-    from clu.typology import ismapping
-    from clu.typespace.namespace import isnamespace
     if typeof(thing) is thing:
         return thing
     if isnamespace(thing):
@@ -697,7 +728,6 @@ def test():
     from clu.constants.consts import TEST_PATH
     from clu.constants.data import XDGS
     from clu.fs.filesystem import Directory
-    from clu.predicates import try_items
     from clu.testing.utils import inline
     import os
     

{python_clu-0.12.21 → python_clu-0.12.23}/noxfile.py

@@ -8,7 +8,6 @@ sys.path.append(os.path.dirname(__file__))
 # Recycle, reduce, reuse:
 nox.options.reuse_existing_virtualenvs = True
 nox.options.stop_on_first_error = True
-# nox.options.keywords = tuple()
 
 # Skip manifest check if we’re not running in a Git repo:
 from clu.version.git_version import are_we_gitted
@@ -20,10 +19,13 @@ def checkmanifest(session):
     session.run('python', '-m', 'check_manifest', '-v')
 
 @nox.session
-def checkpyproject(session):
+@nox.parametrize('tomls', (
+    nox.param('.bumpversion.toml',  id='bumpversion'),
+    nox.param('pyproject.toml',     id='pyproject')))
+def checkpyproject(session, tomls):
     """ Validate CLU’s pyproject.toml """
     session.install("-r", "requirements/nox/pyproject.txt")
-    session.run('validate-pyproject', '--verbose', 'pyproject.toml')
+    session.run('validate-pyproject', '--verbose', tomls)
 
 @nox.session
 @nox.parametrize('module', (

{python_clu-0.12.21 → python_clu-0.12.23}/python_clu.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-clu
-Version: 0.12.21
+Version: 0.12.23
 Summary: Python-CLU: Common Lightweight Utilities
 Home-page: https://github.com/fish2000/clu
 Download-URL: https://github.com/fish2000/clu/zipball/master

{python_clu-0.12.21 → python_clu-0.12.23}/python_clu.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@
 .travis.yml
 ABOUT.md
 CHANGELOG.md
+CITATION.cff
 CLASSIFIERS.txt
 CLU_Treatment.md
 CODE_OF_CONDUCT.md
@@ -20,7 +21,6 @@ conftest.py
 mypy.ini
 noxfile.py
 pyproject.toml
-pytest.ini
 pytype.cfg
 setup.py
 tox.ini

{python_clu-0.12.21 → python_clu-0.12.23}/setup.py

@@ -84,7 +84,7 @@ try:
             '__version__.py')).read(),
             '__version__.py', 'exec'))
 except:
-    __version__ = '0.12.21'
+    __version__ = '0.12.23'
 
 # PROJECT DESCRIPTION
 LONG_DESCRIPTION = project_content('ABOUT.md')

{python_clu-0.12.21 → python_clu-0.12.23}/tests/test_fs_abc.py

@@ -25,7 +25,7 @@ class TestFsMisc(object):
         assert Directory in TypeLocker.types.values()
         assert TemporaryFileWrapper in TypeLocker.types.values()
     
-    @pytest.mark.parametrize('tmp', filter(os.path.exists, tmps))
+    @pytest.mark.parametrize('tmp', tuple(filter(os.path.exists, tmps)))
     def test_BaseFSName_concrete_subclass(self, consts,
                                                 temporarydir,
                                                 tmp):

{python_clu-0.12.21 → python_clu-0.12.23}/tests/test_fs_appdirectories.py

@@ -30,7 +30,7 @@ class TestFsAppdirectories(object):
             'version'   : "1.2.4"
         }
     
-    @pytest.mark.parametrize('system', System.unixes())
+    @pytest.mark.parametrize('system', tuple(System.unixes()))
     def test_yes_version_no_author(self, arbitrary,
                                          system,
                                          consts,
@@ -60,7 +60,7 @@ class TestFsAppdirectories(object):
         assert str(appdirs.version_info) == str(VersionInfo(appversion))
         assert str(appdirs) == repr(appdirs)
     
-    @pytest.mark.parametrize('system', System.unixes())
+    @pytest.mark.parametrize('system', tuple(System.unixes()))
     def test_yes_version_yes_author(self, arbitrary,
                                           system,
                                           consts,
@@ -96,7 +96,7 @@ class TestFsAppdirectories(object):
         assert str(appdirs.version_info) == str(VersionInfo(appversion))
         assert str(appdirs) == repr(appdirs)
     
-    @pytest.mark.parametrize('system', System.unixes())
+    @pytest.mark.parametrize('system', tuple(System.unixes()))
     def test_no_version_no_author(self, arbitrary,
                                         system,
                                         consts,
@@ -124,7 +124,7 @@ class TestFsAppdirectories(object):
         assert appdirs.version_info     == None
         assert str(appdirs) == repr(appdirs)
     
-    @pytest.mark.parametrize('system', System.unixes())
+    @pytest.mark.parametrize('system', tuple(System.unixes()))
     def test_no_version_yes_author(self, arbitrary,
                                          system,
                                          consts,
@@ -157,7 +157,7 @@ class TestFsAppdirectories(object):
         assert appdirs.version_info     == None
         assert str(appdirs) == repr(appdirs)
     
-    @pytest.mark.parametrize('system', System.unixes())
+    @pytest.mark.parametrize('system', tuple(System.unixes()))
     def test_clu_appdirs_versioned(self, system,
                                          consts,
                                          environment,
@@ -186,7 +186,7 @@ class TestFsAppdirectories(object):
         
         assert appdirs is clu_appdirs(system=system)
     
-    @pytest.mark.parametrize('system', System.unixes())
+    @pytest.mark.parametrize('system', tuple(System.unixes()))
     def test_clu_appdirs_unversioned(self, system,
                                            consts,
                                            environment):

python_clu-0.12.21/clu/__version__.py

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

python_clu-0.12.21/pytest.ini

@@ -1,5 +0,0 @@
-[pytest]
-
-## Delete “$TMPDIR/pytest-of-$USER” at the end of a pytest run -
-## Q.v. “clu.testing.pytest”, “clu.testing.hooks”, and ‘conftest.py’:
-# delete_temps = true