cli2 4.0.5__tar.gz → 4.0.7__tar.gz

{cli2-4.0.5/cli2.egg-info → cli2-4.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cli2
-Version: 4.0.5
+Version: 4.0.7
 Summary: image:: https://yourlabs.io/oss/cli2/badges/master/pipeline.svg
 Home-page: https://yourlabs.io/oss/cli2
 Author: James Pic

{cli2-4.0.5 → cli2-4.0.7}/cli2/cli.py

@@ -308,6 +308,8 @@ class Group(EntryPoint, dict):
         for name in dir(obj):
             if name.startswith('_'):
                 continue
+            if not callable(getattr(type(obj), name)):
+                continue
             self.load_method(obj, getattr(obj, name))
 
     def load_method(self, obj, method):

{cli2-4.0.5 → cli2-4.0.7}/cli2/client.py

@@ -956,6 +956,8 @@ class ClientMetaclass(type):
                 self=dict(factory=lambda: cls())
             ),
         )
+        if new_kwargs := getattr(cls, 'cli2', None):
+            cli_kwargs.update(new_kwargs)
         cli_kwargs.update(cls.__dict__.get('cli_kwargs', dict()))
         cls.cli = Group(**cli_kwargs)
         cls.cli.load(cls)
@@ -1204,6 +1206,20 @@ class Client(metaclass=ClientMetaclass):
 
         List of keys to mask in logging, ie.: ``['password', 'secret']``
 
+    .. py:attribute:: cli
+
+        Generated :py:class:`~cli2.cli.Group` for this client.
+
+    .. py:attribute:: cli2
+
+        Dict of overrides for the generated :py:class:`~cli2.cli.Group`.
+        Example:
+
+        .. code-block:: python
+
+            class YourClient(cli2.Client):
+                cli2 = dict(cmdclass=YourCommandClass)
+
     .. py:attribute:: debug
 
         Enforce full logging: quiet requests are logged, masking does not

{cli2-4.0.5 → cli2-4.0.7/cli2.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cli2
-Version: 4.0.5
+Version: 4.0.7
 Summary: image:: https://yourlabs.io/oss/cli2/badges/master/pipeline.svg
 Home-page: https://yourlabs.io/oss/cli2
 Author: James Pic

{cli2-4.0.5 → cli2-4.0.7}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup
 
 setup(
     name='cli2',
-    version='4.0.5',
+    version='4.0.7',
     setup_requires='setupmeta',
     install_requires=[
         'docstring_parser',

{cli2-4.0.5 → cli2-4.0.7}/tests/test_client.py

@@ -1135,3 +1135,13 @@ async def test_client_token_apply(client_class, httpx_mock):
     await client.client_reset()
     assert client.token == 2
     assert client.client.token == 2
+
+
+def test_client_kwargs(client_class):
+    class TestCmd(cli2.Command):
+        pass
+
+    class TestClient(client_class):
+        cli2 = dict(cmdclass=TestCmd)
+
+    assert TestClient.cli.cmdclass == TestCmd

{cli2-4.0.5 → cli2-4.0.7}/tests/test_group.py

@@ -1,4 +1,5 @@
 import cli2
+import functools
 import cli2.test
 
 
@@ -188,9 +189,12 @@ def test_overrides():
 
 
 def test_load():
-    import cli2
+    class BarMetaclass(type):
+        @property
+        def fails3(self):
+            raise Exception('fails')
 
-    class Bar:
+    class Bar(metaclass=BarMetaclass):
         @cli2.cmd
         def test(self):
             pass
@@ -212,6 +216,14 @@ def test_load():
         def exclude(self):
             pass
 
+        @property
+        def fails(self):
+            raise Exception('Loading should not eval properties')
+
+        @functools.cached_property
+        def fails2(self):
+            raise Exception('Loading should not eval properties')
+
     group = cli2.Group()
     group.load(Foo)
     assert list(group.keys()) == ['help', 'test', 'classmeth', 'test2']