shellfoundry 1.2.27__tar.gz → 1.2.29__tar.gz

{shellfoundry-1.2.27/shellfoundry.egg-info → shellfoundry-1.2.29}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: shellfoundry
-Version: 1.2.27
+Version: 1.2.29
 Summary: shellfoundry - Quali tool for creating, building and installing CloudShell shells
 Home-page: https://github.com/QualiSystems/shellfoundry
 Author: Quali
@@ -8,11 +8,14 @@ Author-email: info@quali.com
 License: Apache Software License 2.0
 Keywords: shellfoundry sandbox cloud virtualization vcenter cmp cloudshell quali command-line cli
 Classifier: Development Status :: 5 - Production/Stable
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries
 Classifier: License :: OSI Approved :: Apache Software License
-Requires-Python: >=2.7
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests
@@ -25,7 +28,19 @@ Requires-Dist: colorama
 Requires-Dist: giturlparse.py
 Requires-Dist: ruamel.yaml
 Requires-Dist: cryptography
-Requires-Dist: setuptools; python_version >= "3.12"
+Requires-Dist: packaging
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 shellfoundry
 ============

{shellfoundry-1.2.27 → shellfoundry-1.2.29}/requirements.txt

@@ -8,4 +8,4 @@ colorama
 giturlparse.py
 ruamel.yaml
 cryptography
-setuptools; python_version >= '3.12'
+packaging

{shellfoundry-1.2.27 → shellfoundry-1.2.29}/setup.py

@@ -41,11 +41,14 @@ setup(
     "vcenter cmp cloudshell quali command-line cli",
     classifiers=[
         "Development Status :: 5 - Production/Stable",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Topic :: Software Development :: Libraries",
         "License :: OSI Approved :: Apache Software License",
     ],
-    python_requires=">=2.7",
+    python_requires=">=3.8",
     test_suite="tests",
 )

{shellfoundry-1.2.27 → shellfoundry-1.2.29}/shellfoundry/bootstrap.py

@@ -1,8 +1,9 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
+import importlib.metadata
+
 import click
-import pkg_resources
 
 from shellfoundry.commands.config_command import ConfigCommandExecutor
 from shellfoundry.commands.delete_command import DeleteCommandExecutor
@@ -27,9 +28,7 @@ def cli():
 @cli.command()
 def version():
     """Displays the shellfoundry version."""
-    click.echo(
-        "shellfoundry version " + pkg_resources.get_distribution("shellfoundry").version
-    )
+    click.echo("shellfoundry version " + importlib.metadata.version("shellfoundry"))
 
 
 @cli.command()  # noqa: A001

{shellfoundry-1.2.27 → shellfoundry-1.2.29}/shellfoundry/commands/new_command.py

@@ -8,7 +8,7 @@ from io import open
 
 import click
 from cloudshell.rest.exceptions import FeatureUnavailable
-from pkg_resources import parse_version
+from packaging.version import parse as parse_version
 from requests.exceptions import SSLError
 
 from ..exceptions import FatalError

{shellfoundry-1.2.27 → shellfoundry-1.2.29}/shellfoundry/utilities/__init__.py

@@ -1,9 +1,9 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
+import importlib.metadata
 import json
 
-import pkg_resources
 import requests
 
 try:
@@ -16,7 +16,7 @@ try:
 except ImportError:
     from urllib2 import HTTPError, URLError
 
-from distutils.version import StrictVersion
+from packaging.version import Version
 
 from shellfoundry import PACKAGE_NAME
 from shellfoundry.exceptions import ShellFoundryVersionException
@@ -37,15 +37,15 @@ class Index(object):
 
 
 def get_installed_version(package_name):
-    return pkg_resources.get_distribution(package_name).version
+    return importlib.metadata.version(package_name)
 
 
 def is_index_version_greater_than_current():
     MAJOR_INDEX = 0
 
     installed, index = (
-        StrictVersion(get_installed_version(PACKAGE_NAME)),
-        StrictVersion(max_version_from_index()),
+        Version(get_installed_version(PACKAGE_NAME)),
+        Version(max_version_from_index()),
     )
     is_major_release = False
 
@@ -53,7 +53,7 @@ def is_index_version_greater_than_current():
     if (
         is_greater_version
         and get_index_of_biggest_component_between_two_versions(
-            index.version, installed.version
+            index.release, installed.release
         )
         == MAJOR_INDEX
     ):

{shellfoundry-1.2.27 → shellfoundry-1.2.29}/shellfoundry/utilities/shell_package_installer.py

@@ -216,10 +216,23 @@ class ShellPackageInstaller(object):
             )
 
     def _parse_installation_error(self, base_message, error):
+        error_str = str(error)
+        cs_message = error_str  # Default to full error string
+
         try:
-            cs_message = json.loads(str(error))["Message"]
-        except Exception:
-            cs_message = ""
+            # Check if it's a PackagingRestApiError with embedded JSON response
+            if "response:" in error_str:
+                # Extract JSON part after "response: "
+                json_start = error_str.find("response:") + len("response:")
+                json_str = error_str[json_start:].strip().rstrip("')")
+                cs_message = json.loads(json_str)["Message"]
+            else:
+                # Try to parse the error string directly as JSON
+                cs_message = json.loads(error_str)["Message"]
+        except (json.JSONDecodeError, KeyError, ValueError):
+            # If JSON parsing fails, keep the full error string
+            pass
+
         return "{}. CloudShell responded with: '{}'".format(base_message, cs_message)
 
     def _increase_pbar(self, pbar, time_wait):

{shellfoundry-1.2.27 → shellfoundry-1.2.29}/shellfoundry/utilities/standards/standards_versions.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
-from pkg_resources import parse_version
+from packaging.version import parse as parse_version
 
 
 class StandardVersionsFactory(object):

{shellfoundry-1.2.27 → shellfoundry-1.2.29}/shellfoundry/utilities/template_retriever.py

@@ -10,12 +10,8 @@ from threading import RLock, Thread
 import click
 import requests
 import yaml
-from pkg_resources import parse_version
-
-try:
-    from pkg_resources._vendor.packaging.version import Version
-except ImportError:
-    from packaging.version import Version
+from packaging.version import Version
+from packaging.version import parse as parse_version
 
 from .filters import CompositeFilter
 

{shellfoundry-1.2.27 → shellfoundry-1.2.29}/shellfoundry/utilities/template_versions.py

@@ -10,10 +10,10 @@ NAME_PLACEHOLDER = "name"
 
 
 def is_version(vstr):
-    from distutils.version import StrictVersion
+    from packaging.version import Version
 
     try:
-        StrictVersion(vstr)
+        Version(vstr)
         return True
     except Exception:
         return False

{shellfoundry-1.2.27 → shellfoundry-1.2.29/shellfoundry.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: shellfoundry
-Version: 1.2.27
+Version: 1.2.29
 Summary: shellfoundry - Quali tool for creating, building and installing CloudShell shells
 Home-page: https://github.com/QualiSystems/shellfoundry
 Author: Quali
@@ -8,11 +8,14 @@ Author-email: info@quali.com
 License: Apache Software License 2.0
 Keywords: shellfoundry sandbox cloud virtualization vcenter cmp cloudshell quali command-line cli
 Classifier: Development Status :: 5 - Production/Stable
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries
 Classifier: License :: OSI Approved :: Apache Software License
-Requires-Python: >=2.7
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests
@@ -25,7 +28,19 @@ Requires-Dist: colorama
 Requires-Dist: giturlparse.py
 Requires-Dist: ruamel.yaml
 Requires-Dist: cryptography
-Requires-Dist: setuptools; python_version >= "3.12"
+Requires-Dist: packaging
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 shellfoundry
 ============

{shellfoundry-1.2.27 → shellfoundry-1.2.29}/shellfoundry.egg-info/requires.txt

@@ -8,6 +8,4 @@ colorama
 giturlparse.py
 ruamel.yaml
 cryptography
-
-[:python_version >= "3.12"]
-setuptools
+packaging

{shellfoundry-1.2.27 → shellfoundry-1.2.29}/tests/test_bootstrap.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 import traceback
 import unittest
-from unittest.mock import MagicMock, patch
+from unittest.mock import patch
 
 from click.testing import CliRunner
 
@@ -29,11 +29,9 @@ class TestBootstrap(unittest.TestCase):
     def tearDown(self):
         pass
 
-    @patch("shellfoundry.bootstrap.pkg_resources")
-    def test_version(self, test_dist):
-        obj = MagicMock()
-        obj.version = "shellfoundry_version"
-        test_dist.get_distribution = MagicMock(return_value=obj)
+    @patch("importlib.metadata.version")
+    def test_version(self, version_mock):
+        version_mock.return_value = "shellfoundry_version"
         result = self.runner.invoke(version)
 
         assert result.exit_code == 0

shellfoundry-1.2.29/version.txt

@@ -0,0 +1 @@
+1.2.29

shellfoundry-1.2.27/version.txt

@@ -1 +0,0 @@
-1.2.27