cli2 3.3.24__tar.gz → 3.3.25__tar.gz

{cli2-3.3.24/cli2.egg-info → cli2-3.3.25}/PKG-INFO

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

{cli2-3.3.24 → cli2-3.3.25}/cli2/client.py

@@ -675,13 +675,12 @@ class ModelGroup(Group):
             )
         )
 
+        url_list_methods = ['find', 'get', 'delete', 'create']
         if cls.url_list:
-            self.cmd(cls.find)
-            self.cmd(cls.get)
-            self.cmd(cls.delete)
-            self.cmd(cls.create)
+            for name in url_list_methods:
+                self.cmd(getattr(cls, name))
 
-        self.load_cls(cls, exclude=['find', 'get', 'delete', 'create'])
+        self.load_cls(cls, exclude=url_list_methods)
 
 
 class ModelMetaclass(type):

{cli2-3.3.24 → cli2-3.3.25}/cli2/group.py

@@ -183,6 +183,8 @@ class Group(EntryPoint, dict):
         """
         exclude = exclude or []
         for name, method in cls.__dict__.items():
+            if name in exclude:
+                continue
             wrapped_method = getattr(method, '__func__', None)
             if hasattr(wrapped_method, 'cli2'):
                 self.cmd(wrapped_method)

{cli2-3.3.24 → cli2-3.3.25}/cli2/test_client.py

@@ -52,6 +52,23 @@ async def test_client_cli(client_class, httpx_mock):
     await client_class.cli['testmodel']['find'].async_call()
 
 
+@pytest.mark.asyncio
+async def test_client_cli_override(client_class, httpx_mock):
+    class Client(client_class):
+        def __init__(self, *args, **kwargs):
+            self.test = 'bar'
+            super().__init__(*args, **kwargs)
+
+    class TestModel(Client.Model):
+        url_list = '{client.test}/foo'
+
+        @classmethod
+        @cli2.cmd
+        async def find(cls, foo):
+            return cls.url_list
+    assert await Client.cli['testmodel']['find'].async_call('bar') == 'bar/foo'
+
+
 def test_client_model(client_class):
     assert issubclass(client_class.Model, cli2.Model)
     assert client_class.Model._client_class == client_class

{cli2-3.3.24 → cli2-3.3.25}/cli2/test_group.py

@@ -224,8 +224,13 @@ def test_load_cls():
         @cli2.cmd
         def test2(self):
             pass
+
+        @cli2.cmd
+        def exclude(self):
+            pass
     group = Group()
-    group.load_cls(Foo)
+    group.load_cls(Foo, exclude=['exclude'])
     assert 'bar' not in group
     assert 'test' in group
     assert 'test2' in group
+    assert 'exclude' not in group

{cli2-3.3.24 → cli2-3.3.25/cli2.egg-info}/PKG-INFO

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

{cli2-3.3.24 → cli2-3.3.25}/setup.py

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