esa-snappy 1.0.9__tar.gz → 1.1.0__tar.gz

{esa_snappy-1.0.9 → esa_snappy-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: esa_snappy
-Version: 1.0.9
+Version: 1.1.0
 Summary: The Python part of the SNAP Java-Python bridge.
 Author: Olaf Danne, Norman Fomferra (Brockmann Consult GmbH)
 License: MIT
@@ -15,6 +15,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
 Classifier: Topic :: Scientific/Engineering
 Classifier: Typing :: Typed

{esa_snappy-1.0.9 → esa_snappy-1.1.0}/esa_snappy/snapista/graph.py

@@ -2,8 +2,6 @@ import os
 import subprocess
 import tempfile
 import platform
-import sysconfig
-import configparser
 import lxml.etree as etree
 from esa_snappy import GPF
 from xml.sax.saxutils import unescape
@@ -54,27 +52,8 @@ class Graph:
 
         return "Graph(wdir='{}')".format(self.wdir)
 
-
     @staticmethod
     def get_gpt_cmd():
-        """
-        Retrieves the path of the SNAP gpt command.
-
-        :return: SNAP gpt path
-        """
-        def get_snap_bin_path():
-            """
-            Retrieves the SNAP bin path from esa_snappy.ini.
-
-            :return: SNAP bin path
-            """
-            esa_snappy_package_path = sysconfig.get_paths()['purelib'] + os.sep + "esa_snappy"
-            esa_snappy_ini_file_path = esa_snappy_package_path + os.sep + "esa_snappy.ini"
-            esa_snappy_config = configparser.ConfigParser()
-            esa_snappy_config.read(esa_snappy_ini_file_path)
-
-            return esa_snappy_config['DEFAULT']['snap_home'] + os.sep + "bin"
-
 
         gpt_cmd = None
 
@@ -85,23 +64,13 @@ class Graph:
             path_split_char = ":"
             gpt_executable = "gpt"
 
-        # this may fail in case a wrong gpt is found on the path, as observed on a MacOS test machine,
-        # like this: https://github.com/kharvd/gpt-cli/issues/58
-        #
-        # for p in os.getenv("PATH").split(path_split_char):
-        #
-        #     if os.path.exists(os.path.join(p, gpt_executable)):
-        #
-        #         gpt_cmd = os.path.join(p, gpt_executable)
-        #
-        #         break
-
-        # better get it directly from esa_snappy.ini
-        if gpt_cmd == None:
-            # get SNAP bin path from esa_snappy.ini and try again:
-            snap_bin_path = get_snap_bin_path()
-            os.environ['PATH'] = snap_bin_path + path_split_char + os.environ['PATH']
-            gpt_cmd = os.path.join(snap_bin_path, gpt_executable)
+        for p in os.getenv("PATH").split(path_split_char):
+
+            if os.path.exists(os.path.join(p, gpt_executable)):
+
+                gpt_cmd = os.path.join(p, gpt_executable)
+
+                break
 
         return gpt_cmd
 

{esa_snappy-1.0.9 → esa_snappy-1.1.0}/esa_snappy/snappyutil.py

@@ -35,17 +35,10 @@ def _find_file(dir_path, jpy_whl_pat):
             if 'linux' in jpy_whl_pat and 'aarch64' in jpy_whl_pat and 'linux' in jpy_whl_filename:
                 if 'aarch64' in jpy_whl_filename:
                     return _get_file_in_dir(dir_path, jpy_whl_filename)
-            # Macos ARM 64 (Apple Silicon, version >= 11)
-            # whl pat: e.g. macosx-11.1-arm64; wheel filename: jpy-...-macosx_..._universal2.whl
-            if 'macosx' in jpy_whl_pat and 'arm64' in jpy_whl_pat:
-                if 'macosx' in jpy_whl_filename and 'universal2' in jpy_whl_filename:
+            # Macos
+            if 'macosx' in jpy_whl_pat and 'arm64' in jpy_whl_pat and 'macosx' in jpy_whl_filename:
+                if 'x86_64' in jpy_whl_filename or 'universal2' in jpy_whl_filename:
                     return _get_file_in_dir(dir_path, jpy_whl_filename)
-            # Macos X86 (Intel, version 10.4.7-)
-            # whl pat: e.g. macosx-10.9-x86_64; wheel filename: jpy-...-macosx_..._universal2.whl
-            if 'macosx' in jpy_whl_pat and 'x86_64' in jpy_whl_pat:
-                if 'macosx' in jpy_whl_filename and 'universal2' in jpy_whl_filename:
-                    return _get_file_in_dir(dir_path, jpy_whl_filename)
-
     return None
 
 

{esa_snappy-1.0.9 → esa_snappy-1.1.0}/esa_snappy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: esa_snappy
-Version: 1.0.9
+Version: 1.1.0
 Summary: The Python part of the SNAP Java-Python bridge.
 Author: Olaf Danne, Norman Fomferra (Brockmann Consult GmbH)
 License: MIT
@@ -15,6 +15,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
 Classifier: Topic :: Scientific/Engineering
 Classifier: Typing :: Typed

{esa_snappy-1.0.9 → esa_snappy-1.1.0}/esa_snappy.egg-info/SOURCES.txt

@@ -29,6 +29,10 @@ esa_snappy/lib/jpy-1.0.0-cp312-cp312-macosx_10_13_universal2.whl
 esa_snappy/lib/jpy-1.0.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl
 esa_snappy/lib/jpy-1.0.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
 esa_snappy/lib/jpy-1.0.0-cp312-cp312-win_amd64.whl
+esa_snappy/lib/jpy-1.0.0-cp313-cp313-macosx_10_13_universal2.whl
+esa_snappy/lib/jpy-1.0.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl
+esa_snappy/lib/jpy-1.0.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+esa_snappy/lib/jpy-1.0.0-cp313-cp313-win_amd64.whl
 esa_snappy/lib/jpy-1.0.0-cp39-cp39-macosx_12_0_universal2.whl
 esa_snappy/lib/jpy-1.0.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl
 esa_snappy/lib/jpy-1.0.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl

{esa_snappy-1.0.9 → esa_snappy-1.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "esa_snappy"
-version = "1.0.9"
+version = "1.1.0"
 authors = [
   { name="Olaf Danne, Norman Fomferra (Brockmann Consult GmbH)" },
 ]
@@ -26,6 +26,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Software Development",
     "Topic :: Scientific/Engineering",
     "Typing :: Typed",