GridCalEngine 5.3.30__tar.gz → 5.3.32__tar.gz

{gridcalengine-5.3.30 → gridcalengine-5.3.32}/GridCalEngine/__version__.py

@@ -6,7 +6,7 @@ import datetime
 _current_year_ = datetime.datetime.now().year
 
 # do not forget to keep a three-number version!!!
-__GridCalEngine_VERSION__ = "5.3.30"
+__GridCalEngine_VERSION__ = "5.3.32"
 
 url = 'https://github.com/SanPen/GridCal'
 

{gridcalengine-5.3.30 → gridcalengine-5.3.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GridCalEngine
-Version: 5.3.30
+Version: 5.3.32
 Summary: GridCal is a Power Systems simulation program intended for professional use and research
 Home-page: https://github.com/SanPen/GridCal
 Author: Santiago Peñate Vera et. Al.

{gridcalengine-5.3.30 → gridcalengine-5.3.32}/setup.py

@@ -10,7 +10,11 @@ https://github.com/pypa/sampleproject
 """
 
 # Always prefer setuptools over distutils
+import sys
+import subprocess
+import importlib
 from setuptools import setup, find_packages
+from setuptools.command.install import install
 import os
 from GridCalEngine.__version__ import __GridCalEngine_VERSION__
 from GridCalEngine.Compilers.circuit_to_gslv import GSLV_RECOMMENDED_VERSION
@@ -82,15 +86,51 @@ dependencies = ['setuptools>=41.0.1',
                 "websockets",
                 "brotli",
                 "opencv-python>=4.10.0.84",
-
                 ]
 
-extras_require = {
-    'gch5 files': ["tables"],  # this is for h5 compatibility
-    'pygslv': ["pygslv>=" + GSLV_RECOMMENDED_VERSION]
-}
-# Arguments marked as "Required" below must be included for upload to PyPI.
-# Fields marked as "Optional" may be commented out.
+# Define a list of optional packages as dictionaries. Each dictionary
+# specifies the module name to import and the pip spec to install.
+optional_packages = [
+    {
+        "module": "pygslv",
+        "spec": f"pygslv>={GSLV_RECOMMENDED_VERSION}"
+    },
+    {
+        "module": "tables",
+        "spec": f"tables"
+    },
+    # Add more optional packages here as needed.
+    # For example:
+    # {
+    #     "module": "another_optional_module",
+    #     "spec": "another_optional_module>=1.2.3"
+    # },
+]
+
+
+def install_custom_deps():
+    # Run the normal installation procedure first.
+
+    # For each optional package, try to import, and if not present, attempt installation.
+    for dep in optional_packages:
+        module_name = dep["module"]
+        install_spec = dep["spec"]
+        try:
+            importlib.import_module(module_name)
+            print(f"Optional dependency '{module_name}' is already installed.")
+        except ImportError:
+            print(f"Optional dependency '{module_name}' not found. Attempting to install '{install_spec}'...")
+            try:
+                subprocess.check_call(
+                    [sys.executable, '-m', 'pip', 'install', install_spec]
+                )
+                print(f"Successfully installed '{module_name}'.")
+            except subprocess.CalledProcessError:
+                print(
+                    f"Warning: Installation of optional dependency '{module_name}' failed. Continuing without it.")
+
+
+
 
 setup(
     name='GridCalEngine',  # Required
@@ -112,6 +152,10 @@ setup(
     include_package_data=True,
     python_requires='>=3.8',
     install_requires=dependencies,
-    extras_require=extras_require,
     package_data=package_data,
+    # this attempts at installing the optional stuff without using the ridiculous pip optional notation
+
 )
+
+
+install_custom_deps()