Ported to Python 3.9

Author: Rolf-Hempel

planetary_system_stacker/alignment_points.py

@@ -29,7 +29,7 @@
 from math import ceil
 from numpy import arange, amax, stack, amin, float32, uint8, zeros, sqrt, empty, int32, uint16
 from scipy import ndimage
-from skimage.feature import register_translation
+from skimage.registration import phase_cross_correlation
 from cv2 import meanStdDev, GaussianBlur
 
 from align_frames import AlignFrames
@@ -801,8 +801,11 @@ def compute_shift_alignment_point(self, frame_mono_blurred, frame_index, alignme
                 # explained above.
                 box_in_frame = frame_mono_blurred[y_low + dy:y_high + dy,
                                x_low + dx:x_high + dx]
-                shift_pixel, error, diffphase = register_translation(
-                    alignment_point['reference_box'], box_in_frame, 10, space='real')
+                # The following use of "phase_cross_correlation" replaces the original call to
+                # "register_translation" which seems not to be in the package anymore. If this
+                # replacement really works has not been tested.
+                shift_pixel, error, diffphase = phase_cross_correlation(
+                    alignment_point['reference_box'], box_in_frame, upsample_factor=10)
 
             # Use a simple phase shift computation (contained in module "miscellaneous").
             elif self.configuration.alignment_points_method == 'CrossCorrelation':

planetary_system_stacker/workflow.py

@@ -679,14 +679,14 @@ def execute_align_frames(self, y_low_opt, y_high_opt, x_low_opt, x_high_opt):
     def execute_set_roi(self, y_min, y_max, x_min, x_max):
 
         self.set_status_bar_processing_phase("setting the ROI")
-        if self.configuration.global_parameters_protocol_level > 0 and y_min != 0 or y_max != 0:
+        if self.configuration.global_parameters_protocol_level > 0 and (y_min != 0 or y_max != 0):
             Miscellaneous.protocol("+++ Start setting a ROI and computing a new reference frame +++",
                                    self.attached_log_file)
         self.my_timer.create_no_check('Setting ROI and new reference')
         self.align_frames.set_roi(y_min, y_max, x_min, x_max)
         self.my_timer.stop('Setting ROI and new reference')
 
-        if self.configuration.global_parameters_protocol_level > 1 and y_min != 0 or y_max != 0:
+        if self.configuration.global_parameters_protocol_level > 1 and (y_min != 0 or y_max != 0):
             Miscellaneous.protocol(
                 "           ROI, set by the user: " + str(y_min) + "<y<" + str(y_max) + ", " + str(
                     x_min) + "<x<" + str(x_max), self.attached_log_file,

setup_windows.py

@@ -17,10 +17,10 @@
     packages=setuptools.find_packages(),
     ext_modules=None,
     install_requires=[
-        'numpy == 1.18.4',
+        'numpy',
         'matplotlib',
         'psutil',
-        'PyQt5 >= 5.15',
+        'PyQt5',
         'scipy',
         'astropy',
         'scikit-image',
@@ -34,7 +34,7 @@
         # "Operating System :: OS Independent"
         "Operating System :: Microsoft :: Windows"
     ],
-    python_requires='>=3.5,  <3.7',
+    python_requires='>=3.5',
     entry_points={
         "console_scripts": [
         "PlanetarySystemStacker=planetary_system_stacker.planetary_system_stacker:main",