enpt - pypi Package Compare versions

Comparing version 1.1.2 to 1.1.3

CONTRIBUTING.rst

@@ -155,3 +155,3 @@ .. highlight:: shell
    feature to the list in README.rst.
-3. The merge request should work for Python 3.9, 3.10, 3.11 and 3.12. Check
+3. The merge request should work for Python 3.10, 3.11 and 3.12. Check
    https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/merge_requests
@@ -158,0 +158,0 @@ and make sure that the tests pass for all supported Python versions.

enpt/model/images/images_mapgeo.py

@@ -255,3 +255,5 @@ # -*- coding: utf-8 -*-
                                                self.meta.lat_UL_UR_LL_LR)),
-                CPUs=self.cfg.CPUs)
+                CPUs=self.cfg.CPUs,
+                progress=not self.cfg.disable_progress_bars,
+            )
             DP.fill_gaps()  # FIXME this will also be needed at other places
@@ -258,0 +260,0 @@ self._dem =\

enpt/model/images/images_sensorgeo.py

@@ -138,5 +138,7 @@ # -*- coding: utf-8 -*-
             self.logger.info('Pre-processing DEM for %s...' % self.detector_name)
-            DP = DEM_Processor(self.cfg.path_dem, enmapIm_cornerCoords=tuple(zip(self.detector_meta.lon_UL_UR_LL_LR,
-                                                                                 self.detector_meta.lat_UL_UR_LL_LR)),
-                               CPUs=self.cfg.CPUs)
+            DP = DEM_Processor(self.cfg.path_dem,
+                               enmapIm_cornerCoords=tuple(zip(self.detector_meta.lon_UL_UR_LL_LR,
+                                                              self.detector_meta.lat_UL_UR_LL_LR)),
+                               CPUs=self.cfg.CPUs,
+                               progress=not self.cfg.disable_progress_bars)
             DP.fill_gaps()  # FIXME this will also be needed at other places
@@ -237,3 +239,4 @@
             elevation = DEM_Processor(img2.cfg.path_dem,
-                                      enmapIm_cornerCoords=img2_cornerCoords).dem \
+                                      enmapIm_cornerCoords=img2_cornerCoords,
+                                      progress=not self.cfg.disable_progress_bars).dem \
                 if img2.cfg.path_dem else self.cfg.average_elevation
@@ -240,0 +243,0 @@

enpt/options/config.py

@@ -112,4 +112,3 @@ # -*- coding: utf-8 -*-
     blocksize=100,
-    vswir_overlap_algorithm='swir_only',
-    CPUs=16
+    vswir_overlap_algorithm='swir_only'
 )
@@ -131,4 +130,2 @@
     enable_ac=False,
-    ortho_resampAlg='bilinear',
-    CPUs=16
 )
@@ -196,3 +193,2 @@
     land_ac_alg='SICOR',
-    CPUs=32,
     ortho_resampAlg='bilinear',
@@ -199,0 +195,0 @@ vswir_overlap_algorithm='swir_only'

enpt/processors/dem_preprocessing/dem_preprocessing.py

@@ -51,6 +51,8 @@ # -*- coding: utf-8 -*-
                  enmapIm_cornerCoords: Tuple[Tuple[float, float]],
-                 CPUs: int = None):
-        self.dem = GeoArray(dem_path_geoarray)
+                 CPUs: int = None,
+                 progress: bool = False):
+        self.dem = GeoArray(dem_path_geoarray, progress=progress)
         self.enmapIm_cornerCoords = enmapIm_cornerCoords
         self.CPUs = CPUs or cpu_count()
+        self.progress = progress
 
@@ -115,3 +117,4 @@ self._set_nodata_if_not_provided()
                           geotransform=(np.floor(min(x_all)) - xres, xres, 0, np.ceil(max(y_all)) + yres, 0, -yres),
-                          projection=CRS(tgt_utm_epsg).to_wkt())
+                          projection=CRS(tgt_utm_epsg).to_wkt(),
+                          progress=False)
 
@@ -137,3 +140,3 @@ return cls(dem_gA, corner_coords_lonlat)
 
-        return GeoArray(data_sensorgeo)
+        return GeoArray(data_sensorgeo, progress=self.progress)
 
@@ -148,3 +151,4 @@ def get_dem_in_map_geometry(self,
         xmin, ymin, xmax, ymax = mapBounds
-        dem = GeoArray(self.dem.filePath)  # do not overwrite self.dem due to in-place re-projection below
+        dem = GeoArray(self.dem.filePath,
+                       progress=self.progress)  # do not overwrite self.dem due to in-place re-projection below
 
@@ -173,5 +177,6 @@ if not prj_equal(self.dem.prj, out_prj) or \
                 ),
-                nodata=dem.nodata
+                nodata=dem.nodata,
+                progress=self.progress
             )
         )
         return dem_mapgeo

enpt/processors/orthorectification/orthorectification.py

@@ -279,3 +279,3 @@ # -*- coding: utf-8 -*-
         enmap_ImageL1.logger.info('Computed common target extent of orthorectified image (xmin, ymin, xmax, ymax in '
-                                  'EPSG %s): %s' % (tgt_epsg, str(common_extent_prj)))
+                                  'EPSG %s): %s' % (tgt_epsg, tuple(float(x) for x in common_extent_prj)))
 
@@ -282,0 +282,0 @@ return common_extent_prj

enpt/version.py

@@ -30,4 +30,4 @@ # -*- coding: utf-8 -*-
 
-__version__ = '1.1.2'
-__versionalias__ = '20250929.01'
+__version__ = '1.1.3'
+__versionalias__ = '20251210.01'
 __author__ = 'Daniel Scheffler'

HISTORY.rst

@@ -5,2 +5,11 @@ =======
 
+1.1.3 (2025-12-10)
+------------------
+
+* !125: Fixed #143 (DEM preprocessing progress not muted if land_ac_alg='ISOFIT' and progress=False).
+* !127: Updated numba pinning to >=0.63 to fix SegmentationFaults that showed up on Linux in the context of EnSoMAP.
+* !128: Dropped Python 3.9 support due to end-of-life status.
+* !129: Pinned pytest-reporter-html1 to <0.9.5 to fix pip check.
+
+
 1.1.2 (2025-09-29)
@@ -7,0 +16,0 @@ ------------------

PKG-INFO

 Metadata-Version: 2.4
 Name: enpt
-Version: 1.1.2
+Version: 1.1.3
 Summary: EnMAP Processing Tool
@@ -18,7 +18,6 @@ Project-URL: Source code, https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT
 Classifier: Natural Language :: English
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Requires-Dist: acwater>=0.3.0
@@ -53,3 +52,3 @@ Requires-Dist: arosics>=1.0.0
 Requires-Dist: pytest-cov; extra == 'dev'
-Requires-Dist: pytest-reporter-html1; extra == 'dev'
+Requires-Dist: pytest-reporter-html1<0.9.5; extra == 'dev'
 Requires-Dist: sphinx-argparse; extra == 'dev'
@@ -68,3 +67,3 @@ Requires-Dist: sphinx-rtd-theme; extra == 'dev'
 Requires-Dist: pytest-cov; extra == 'test'
-Requires-Dist: pytest-reporter-html1; extra == 'test'
+Requires-Dist: pytest-reporter-html1<0.9.5; extra == 'test'
 Requires-Dist: urlchecker; extra == 'test'
@@ -71,0 +70,0 @@ Description-Content-Type: text/x-rst

pyproject.toml

@@ -53,3 +53,2 @@ # -*- coding: utf-8 -*-
     "Natural Language :: English",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
@@ -68,3 +67,3 @@ "Programming Language :: Python :: 3.11",
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dependencies = [
@@ -116,3 +115,3 @@ "acwater>=0.3.0",
     "pytest-cov",
-    "pytest-reporter-html1",
+    "pytest-reporter-html1<0.9.5",  # 0.9.5 requires docutils>=0.22 -> not yet supported by sphinx/sphinx_rtd_theme
     "urlchecker",
@@ -119,0 +118,0 @@ ]

Alert delta unavailable

Currently unable to show alert delta for PyPI packages.

Improved metrics

Lines of code

8880

0.07%

Worsened metrics

Total package byte prevSize

2056789

-0.39%