pymodaq 5.0.13__tar.gz → 5.0.15__tar.gz

{pymodaq-5.0.13 → pymodaq-5.0.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymodaq
-Version: 5.0.13
+Version: 5.0.15
 Summary: Modular Data Acquisition with Python
 Project-URL: Homepage, http://pymodaq.cnrs.fr
 Project-URL: Source, https://github.com/PyMoDAQ/PyMoDAQ
@@ -49,7 +49,7 @@ Requires-Dist: multipledispatch
 Requires-Dist: numpy<2.0.0
 Requires-Dist: packaging
 Requires-Dist: pint
-Requires-Dist: pyleco>0.3; python_version >= '3.8'
+Requires-Dist: pyleco<=0.4.2,>0.3; python_version >= '3.8'
 Requires-Dist: pymodaq-data>=5.0.18
 Requires-Dist: pymodaq-gui<5.0.23,>=5.0.17
 Requires-Dist: pymodaq-plugin-manager>=0.0.17

{pymodaq-5.0.13 → pymodaq-5.0.15}/pyproject.toml

@@ -49,7 +49,7 @@ dependencies = [
     "simple_pid",
     "toml",
     "qtconsole",
-    "pyleco>0.3; python_version>=\"3.8\"",
+    "pyleco>0.3, <=0.4.2; python_version>=\"3.8\"",
     "bayesian-optimization<2.0.0",
 ]
 

{pymodaq-5.0.13 → pymodaq-5.0.15}/src/pymodaq/dashboard.py

@@ -79,44 +79,19 @@ class PymodaqUpdateTableWidget(QTableWidget):
     '''
     def __init__(self):
         super().__init__()
-
-        self._checkboxes = []
-        self._package_versions = []
+        self._row = 0
 
     def setHorizontalHeaderLabels(self, labels):
         super().setHorizontalHeaderLabels(labels)
         self.setColumnCount(len(labels))
         
-    def append_row(self, checkbox, package, current_version, available_version):  
-        row = len(self._checkboxes)
-
-        self._checkboxes.append(checkbox)
-        self._package_versions.append(f'{package}=={available_version}')
-
-        checkbox_widget = QWidget()
-                        
-        checkbox.setChecked(True)
-        checkbox.setToolTip("Check to install update")
-
-        checkbox_layout = QtWidgets.QHBoxLayout()                
-        checkbox_layout.addWidget(checkbox)
-        checkbox_layout.setAlignment(Qt.AlignCenter)
-        checkbox_layout.setContentsMargins(0, 0, 0, 0)
-
-        checkbox_widget.setLayout(checkbox_layout)
+    def append_row(self, package, current_version, available_version):
+        # Add labels
+        self.setItem(self._row, 0, QTableWidgetItem(str(package)))
+        self.setItem(self._row, 1, QTableWidgetItem(str(current_version)))
+        self.setItem(self._row, 2, QTableWidgetItem(str(available_version)))
 
-        # Add the checkbox widget to the table
-        self.setCellWidget(row, 0, checkbox_widget)
-
-        # Add labels in the other columns
-        self.setItem(row, 1, QTableWidgetItem(str(package)))
-        self.setItem(row, 2, QTableWidgetItem(str(current_version)))
-        self.setItem(row, 3, QTableWidgetItem(str(available_version)))
-
-
-    def get_checked_data(self):
-    	checked = list(map(lambda c : c.isChecked(), self._checkboxes))
-    	return list(np.array(self._package_versions)[checked])
+        self._row += 1
 
     def sizeHint(self):
         self.resizeColumnsToContents()
@@ -1620,11 +1595,10 @@ class DashBoard(CustomApp):
             available_versions = [version_mod.parse(get_pypi_pymodaq(p)['version']) for p in packages]
             new_versions = np.greater(available_versions, current_versions)
             # Combine package and version information and select only the ones with a newer version available
-            
+
             
             packages_data = np.array(list(zip(packages, current_versions, available_versions)))[new_versions]
 
-            #TODO: Remove `or True`
             if len(packages_data) > 0:
                 #Create a QDialog window and different graphical components
                 dialog = QtWidgets.QDialog()
@@ -1632,43 +1606,27 @@ class DashBoard(CustomApp):
                 
                 vlayout = QtWidgets.QVBoxLayout()
 
-                message_label = QLabel("New versions of PyMoDAQ packages available!\nPlease select the ones you want to install:")
+                message_label = QLabel("New versions of PyMoDAQ packages available!\nUse your package manager to update.")
                 message_label.setAlignment(Qt.AlignCenter)
                 
 
                 table = PymodaqUpdateTableWidget()
                 table.setRowCount(len(packages_data)) 
-                table.setColumnCount(4) 
-                table.setHorizontalHeaderLabels(["Select", "Package", "Current version", "New version"])
+                table.setColumnCount(3)
+                table.setHorizontalHeaderLabels(["Package", "Current version", "New version"])
                      
                 for p in packages_data:
-                    table.append_row(QCheckBox(), p[0], p[1], p[2])
+                    table.append_row(p[0], p[1], p[2])
 
-                button = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
-                button.accepted.connect(dialog.accept)
-                button.rejected.connect(dialog.reject) 
 
                 # The vlayout contains the message, the table and the buttons                
                 # and is connected to the dialog window
                 vlayout.addWidget(message_label)
                 vlayout.addWidget(table)
-                vlayout.addWidget(button)
                 dialog.setLayout(vlayout)
 
                 ret = dialog.exec()
 
-                if ret == QDialog.Accepted:
-                    # If the update is accepted, the checked packages are extracted from the table
-                    # and send to the updater
-                    packages_to_update = table.get_checked_data()
-                    if len(packages_to_update) > 0:
-                        packages_to_update_str = ', '.join(packages_to_update)
-                        logger.info("Trying to update:")
-                        logger.info(f"\t {packages_to_update_str}")
-                        subprocess.Popen(['pymodaq_updater', '--wait', '--file', __file__] + packages_to_update, stdin=subprocess.PIPE)
-                        self.quit_fun()
-                        return True
-                    logger.info("Update found but no packages checked for update.")
             else:
                 if show:
                     msgBox = QtWidgets.QMessageBox()

pymodaq-5.0.13/src/pymodaq/updater.py

@@ -1,107 +0,0 @@
-import argparse
-import subprocess
-import sys
-import time
-import logging
-
-from pathlib import Path
-
-from pymodaq_utils.logger import set_logger, get_module_name
-
-logger = set_logger(get_module_name(__file__))
-logger.addHandler(logging.StreamHandler(sys.stdout))
-
-def wait_for_parent():
-	'''
-		A function to wait for its parent to terminate execution.
-
-		In order to achieve that, this process has to be started with
-		stdin replaced by a piped stream from its parent. When the
-		parent terminates, stdin will close and either return from read
-		or throw an exception. De facto creating a way to wait for its
-		parent's termination.
-
-		It then sleep for 2 seconds, to let the parent process complete
-		termination.
-
-		CAUTION: If the process was not started by piping stdin AND 
-		the --wait option is set, this function will hang forever.
-
-		We could use `psutil` or a similar lib to check for parent's process
-		existance with its pid. 
-	'''
-
-	logger.info("Waiting for parent process to stop.")
-	try:
-		sys.stdin.read()
-	except:
-		pass
-	logger.debug("Parent process closed stdin")
-	time.sleep(2)
-	logger.info("Parent process stopped.")
-
-def process_args():
-	'''
-		Declare arguments for updater.py, parse them and returns them in an object.
-		The arguments are:
-			--file <file> to request a python program to (re)start after update if needed (optional) 
-			--wait        to wait for the starting process to terminate before updating (optional, defaults to False)
-			packages      the package list to install/update (they should contain the version in a pip accepted format)
-	'''
-	parser = argparse.ArgumentParser(description='Update pymodaq using pip.')
-	parser.add_argument('--file', type=str,  help='the pymodaq script to restart after update')
-	parser.add_argument("--wait", action="store_true", help="enable waiting for pymodaq to finish mode (default is disabled).")
-	parser.add_argument('packages', type=str, nargs='+', help='package list')
-	return parser.parse_args()
-
-def restart_if_command_launch(args):
-	'''
-		Try to detect if this process if launched using the declared command (i.e. `pymodaq_updater`)
-		or using the script file (`updater.py`). If it uses the command, it restart the process to
-		force it to use the script file, thus preventing a locked file during update on windows systems.
-	'''
-	python_file_path = Path(__file__) # Should be the path to `updater.py`
-	started_path = Path(sys.argv[0])  # Either `updater.py` or `pymodaq_updater`
-	
-	# If they're different we'll restart using the script file
-	if started_path.absolute() != python_file_path.absolute():
-		logger.info("Started as pymodaq_updater, need to restart using python to prevent lock.")
-		# We HAVE to wait for this process to stop in the restarted process
-		new_args = ['--wait'] + sys.argv[1:]
-		if args.wait:
-			wait_for_parent()
-	
-		subprocess.Popen([sys.executable, str(python_file_path.absolute())] + new_args,  stdin=subprocess.PIPE)
-		sys.exit(0)
-
-def main():
-	args = process_args()
-	logger.info(f"Arguments processed: {args}")
-
-	restart_if_command_launch(args)
-
-	if args.wait:
-		wait_for_parent()
-
-	packages_str = ', '.join(args.packages)
-	logger.info(f'Updating packages: {packages_str}')
-	
-	with subprocess.Popen([sys.executable, '-m', 'pip', 'install'] + args.packages, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) as pip:
-		for line in pip.stdout:
-			# Can't decode as some characters are not valid and make the whole process fail
-			logger.info(line[:-1])
-	ret_code = pip.wait()
-	
-
-	if ret_code == 0:
-		logger.info(f'Succesfully updated {packages_str}')
-	else:
-		logger.error(f'Error while updating {packages_str}, pip returned {ret_code}')
-
-	if args.file is not None:
-		logger.info(f"Restarting {args.file} script after update.")
-		subprocess.Popen([sys.executable, args.file])
-
-
-if __name__ == "__main__":
-	main()