shellfoundry 1.2.25__tar.gz → 1.2.26__tar.gz

{shellfoundry-1.2.25/shellfoundry.egg-info → shellfoundry-1.2.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: shellfoundry
-Version: 1.2.25
+Version: 1.2.26
 Summary: shellfoundry - Quali tool for creating, building and installing CloudShell shells
 Home-page: https://github.com/QualiSystems/shellfoundry
 Author: Quali

{shellfoundry-1.2.25 → shellfoundry-1.2.26}/shellfoundry/utilities/__init__.py

@@ -2,16 +2,9 @@
 # -*- coding: utf-8 -*-
 
 import json
-import ssl
 
 import pkg_resources
-
-try:
-    # Python 2.x version
-    from xmlrpclib import ProtocolError, ServerProxy
-except ImportError:
-    # Python 3.x version
-    from xmlrpc.client import ProtocolError, ServerProxy
+import requests
 
 try:
     from urllib import urlopen
@@ -43,9 +36,6 @@ class Index(object):
         self.url = url
 
 
-PyPI = Index("https://pypi.python.org/pypi/")
-
-
 def get_installed_version(package_name):
     return pkg_resources.get_distribution(package_name).version
 
@@ -74,20 +64,20 @@ def is_index_version_greater_than_current():
 
 def max_version_from_index():
     try:
-        ctx = ssl.SSLContext(protocol=ssl.PROTOCOL_SSLv23)
-        proxy = ServerProxy(PyPI.url, context=ctx)
-        releases = proxy.package_releases(PACKAGE_NAME)
-        max_version = max(releases)
-        return max_version
-    except ProtocolError as err:
-        raise ShellFoundryVersionException(
-            "Cannot retrieve latest shellfoundry version, "
-            "are you offline? Error: {}".format(err)
-        )
+        url = "https://pypi.org/pypi/{}/json".format(PACKAGE_NAME)
+        r = requests.get(url)
+        if r.status_code != requests.codes.ok:
+            raise ShellFoundryVersionException(
+                "Cannot retrieve latest shellfoundry version, " "are you offline?"
+            )
+        else:
+            content = json.loads(r.content)
+            max_version = content["info"]["version"]
+            return max_version
     except Exception as err:
         raise ShellFoundryVersionException(
-            "Unexpected error during shellfoundry version check. "
-            "Error: {}.".format(err)
+            "Cannot retrieve latest shellfoundry version, "
+            "are you offline? Error: {}".format(err.message)
         )
 
 

{shellfoundry-1.2.25 → shellfoundry-1.2.26}/shellfoundry/utilities/template_retriever.py

@@ -11,7 +11,11 @@ import click
 import requests
 import yaml
 from pkg_resources import parse_version
-from pkg_resources._vendor.packaging.version import Version
+
+try:
+    from pkg_resources._vendor.packaging.version import Version
+except ImportError:
+    from packaging.version import Version
 
 from .filters import CompositeFilter
 

{shellfoundry-1.2.25 → shellfoundry-1.2.26/shellfoundry.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: shellfoundry
-Version: 1.2.25
+Version: 1.2.26
 Summary: shellfoundry - Quali tool for creating, building and installing CloudShell shells
 Home-page: https://github.com/QualiSystems/shellfoundry
 Author: Quali

shellfoundry-1.2.26/version.txt

@@ -0,0 +1 @@
+1.2.26

shellfoundry-1.2.25/version.txt

@@ -1 +0,0 @@
-1.2.25