Merge pull request #7 from mirceaulinic/fix-sproxy-path

Correct salt-sproxy import path and release 2020.3.1
mirceaulinic · Jul 3, 2020 · 8a49e24 · 8a49e24
2 parents 7162bec + d133575
commit 8a49e24
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/README.rst b/README.rst
@@ -237,8 +237,6 @@ Example:
 Using ISalt in conjunction with Salt Super Proxy (Master side)
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-.. versionadded:: 2020.3.0
-
 .. note::
 
     This option requires salt-sproxy to be installed in the same environment as
@@ -281,7 +279,7 @@ You can also get into the *sproxy* mode by default, by setting the value
 ``role: sproxy`` into the ISalt configuration file (see also the next 
 paragraph).
 
-.. seealso::
+.. important::
 
     Check also the `salt-sproxy documentation 
     <https://salt-sproxy.readthedocs.io/en/latest/>`__ for more usage 

diff --git a/isalt/scripts.py b/isalt/scripts.py
@@ -302,7 +302,7 @@ def main():
             if saltenv not in __opts__.get('file_roots', {}):
                 __opts__['file_roots'] = {saltenv: []}
             file_roots = __opts__['file_roots'][saltenv]
-            sproxy_path = salt_sproxy.__path__._path[0]
+            sproxy_path = salt_sproxy.__path__[0]
             if sproxy_path not in file_roots:
                 file_roots.append(sproxy_path)
                 __opts__['file_roots'][saltenv] = file_roots

diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
 
 setup(
     name='isalt',
-    version='2020.1.0',
+    version='2020.3.1',
     namespace_packages=['isalt'],
     packages=find_packages(),
     author='Mircea Ulinic',