esa-snappy 1.0.9__cp39-none-any.whl → 1.1.0__cp39-none-any.whl

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/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.dist-info → esa_snappy-1.1.0.dist-info}/METADATA

@@ -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.dist-info → esa_snappy-1.1.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 esa_snappy/__init__.py,sha256=3CiPjht9jUE9ID15hfTsYkHo5_V9RTfV6vLrMFmCGWU,15253
-esa_snappy/snappyutil.py,sha256=ptJFjqJDB0rt-hm_u63ICFTXZkxPM-rXJR3-djuiH6w,14061
+esa_snappy/snappyutil.py,sha256=gPA7kCDhNCT3-feZzSKzpeJaY9KFgAUquVv6iyPtVvU,13577
 esa_snappy/examples/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 esa_snappy/examples/snappy_bmaths.py,sha256=kKmdFpLoLdYi0vYgdtQmegr_jBQpGeEUVr8jIo51q-4,1854
 esa_snappy/examples/snappy_flh.py,sha256=3QgEIE-qUYwX8MGPWmGgFEXTJ0sY7tNwUK46GpvkIiU,1610
@@ -14,7 +14,7 @@ esa_snappy/lib/jpy-1.0.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.
 esa_snappy/lib/jpy-1.0.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl,sha256=nPANBkNHRfyfJayf7RHQpdJDxrlgbAWNq_URmffR520,391227
 esa_snappy/lib/jpy-1.0.0-cp39-cp39-win_amd64.whl,sha256=R4d5H1Nq2CDVwiev07PLuQgIRD5CEAB0smoLq9_V14w,124091
 esa_snappy/snapista/__init__.py,sha256=UoFdyRO7zKbvdzCK9PeRb2EgChNPso3DbwypPztG0cw,230
-esa_snappy/snapista/graph.py,sha256=b7xenwLuK1GNWTnx4kkVRtL8NW1y5FhseULRrUogUQo,16490
+esa_snappy/snapista/graph.py,sha256=YFbC5fgF53NDexKpirVNSjiJsKAx_tIn3y1BqjpRdTo,15202
 esa_snappy/snapista/graph_io.py,sha256=tk5lUG9Wg6PtGeJTO7fi8Wvm-kagbvAdlowTdAKWSn4,377
 esa_snappy/snapista/operator.py,sha256=hgWbu-fAc-DVcYD7TnWwlWpLsp_4pnKU92SzNqVS1Dw,3356
 esa_snappy/snapista/operatorparams.py,sha256=_tBMtg5ndV1VeuuZ6Iv103Gcsh_hi_yOmwXhovK-YHY,1381
@@ -108,8 +108,8 @@ esa_snappy/tests/__init__.py,sha256=F4oR5lxuvk4xsRSJ65fkZPrsrfPD8fNVbhSuAyHox7Q,
 esa_snappy/tests/test_snappy_mem.py,sha256=5UeN4A5-kgV534eRforf6OqO0UbqcTbREeRVvUqeU9A,971
 esa_snappy/tests/test_snappy_perf.py,sha256=W1nlzDzvmbhDNc4ma4u5m4qRjEjLIU-gCbKzLkHdIwM,1710
 esa_snappy/tests/test_snappy_product.py,sha256=zCPMOTQ3zoRN0OLLMy7NsHd7YuZnsa2loYGcD9Ehf3A,3564
-esa_snappy-1.0.9.dist-info/licenses/LICENSE,sha256=WhZlPzkdURd2lAAvpQrjy1tIXgkmxrKFS45OPs2PxPM,1105
-esa_snappy-1.0.9.dist-info/METADATA,sha256=cYg9aueRfYuITyh1P2-lCJaobknQomcsR-LnOQkD6rA,2493
-esa_snappy-1.0.9.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-esa_snappy-1.0.9.dist-info/top_level.txt,sha256=Rp5J9LQi3dYksBH5aChaVvqyd0FecQA5byHcDTal2vk,11
-esa_snappy-1.0.9.dist-info/RECORD,,
+esa_snappy-1.1.0.dist-info/licenses/LICENSE,sha256=WhZlPzkdURd2lAAvpQrjy1tIXgkmxrKFS45OPs2PxPM,1105
+esa_snappy-1.1.0.dist-info/METADATA,sha256=AMBLiATmd817J96BwL7eJHg_akoaZ0yYjetxiLM7qRw,2545
+esa_snappy-1.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+esa_snappy-1.1.0.dist-info/top_level.txt,sha256=Rp5J9LQi3dYksBH5aChaVvqyd0FecQA5byHcDTal2vk,11
+esa_snappy-1.1.0.dist-info/RECORD,,

{esa_snappy-1.0.9.dist-info → esa_snappy-1.1.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any