Merge pull request #191 from mirceaulinic/develop

Release 2020.10.1

README.md

@@ -41,6 +41,12 @@ In brief, here are some benefits you can get by using *salt-sproxy*:
 - Reuse your existing extension modules, templates, Pillars, States, etc., you
   may have already developed in your environment, transparently.
 - You can run it locally, on your own computer.
+- You can use *salt-sproxy* to uniformly manage network devices, servers 
+  (either using regular Minions, or [SSH](
+  https://salt-sproxy.readthedocs.io/en/latest/ssh.html)), applications 
+  (e.g., Docker containers, VMWare ESXi clusters and vCenters, Marathon or 
+  Chronos clusters, etc.), and virtually anything that has a programmable 
+  interface.
 - Python programming made a breeze - might go well with the
   [ISalt](https://github.com/mirceaulinic/isalt) package.
 - Integrates easily with your existing Salt environment (if you have), by

README.rst

@@ -61,6 +61,12 @@ In brief, here are some benefits you can get by using *salt-sproxy*:
 - Reuse your existing extension modules, templates, Pillars, States, etc., you
   may have already developed in your environment, transparently.
 - You can run it locally, on your own computer.
+- You can use *salt-sproxy* to uniformly manage network devices, servers 
+  (either using regular Minions, or `SSH 
+  <https://salt-sproxy.readthedocs.io/en/latest/ssh.html>`_), applications 
+  (e.g., Docker containers, VMWare ESXi clusters and vCenters, Marathon or 
+  Chronos clusters, etc.), and virtually anything that has a programmable 
+  interface.
 - Python programming made a breeze - might go well with the
   `ISalt <https://github.com/mirceaulinic/isalt>`__ package.
 - Integrates easily with your existing Salt environment (if you have), by

salt_sproxy/scripts.py

@@ -33,7 +33,9 @@ def sapi_sproxy(
     '''
     Shortcut to invoke an arbitrary Salt function via sproxy.
     '''
-    kwargs.update({'function': fun, 'tgt': tgt, 'tgt_type': tgt_type, 'static': True})
+    kwargs.update(
+        {'salt_function': fun, 'tgt': tgt, 'tgt_type': tgt_type, 'static': True}
+    )
     kwargs = _prep_kwargs(kwargs, self.opts)
     log.debug('New kwargs:')
     log.debug(kwargs)
@@ -48,7 +50,9 @@ def sapi_sproxy_async(
     '''
     Shortcut to invoke an arbitrary Salt function via sproxy, asynchronously.
     '''
-    kwargs.update({'function': fun, 'tgt': tgt, 'tgt_type': tgt_type, 'static': True})
+    kwargs.update(
+        {'salt_function': fun, 'tgt': tgt, 'tgt_type': tgt_type, 'static': True}
+    )
     kwargs = _prep_kwargs(kwargs, self.opts)
     log.debug('New kwargs:')
     log.debug(kwargs)

setup.py

@@ -20,7 +20,7 @@
 
 setup(
     name=name,
-    version='2020.10.0',
+    version='2020.10.1',
     namespace_packages=['salt_sproxy'],
     packages=find_packages(),
     author='Mircea Ulinic',