Merge branch 'feature_pyside6_migration' into 'master'

Feature pyside6 migration

See merge request !17

.gitlab-ci.yml

@@ -19,7 +19,7 @@ stages:
 
 before_script:
 - uname -a
-- apt-get update && apt install -y libgl1-mesa-glx
+- apt-get update && apt install -y libgl1-mesa-glx libxkbcommon-x11-0 libegl1 libdbus-1-3
 - pip install -e .[dev]
 
 linting:

HISTORY.rst

@@ -28,3 +28,7 @@ History
 * Gui updated to PySide2
 * Pmw dependency dropped
 * Version number updated
+
+2024.4.0.0 (2024-02-01)
+------------------
+* Gui updated to PySide6

conda.recipe/meta.yaml

 package:
   name: mseedpeek
-  version: 2023.3.1.0
+  version: 2024.4.0.0
 
 source:
   path: ../
@@ -15,7 +15,7 @@ requirements:
     - pip
   run:
     - python >=3.9
-    - pyside2
+    - pyside6
 
 test:
   source_files:

mseedpeek/__init__.py

@@ -2,6 +2,6 @@
 
 """Top-level package for mseedpeek."""
 
-__author__ = """IRIS PASSCAL"""
+__author__ = """EPIC"""
 __email__ = 'software-support@passcal.nmt.edu'
-__version__ = '2023.3.1.0'
+__version__ = '2024.4.0.0'

mseedpeek/libtrace.py

@@ -125,7 +125,7 @@ import time
 
 SPACE = " "
 
-# VERSION = "2023.3.0.0"
+# VERSION = "2024.4.0.0"
 
 
 class futils:

mseedpeek/mseedpeek.py

@@ -130,6 +130,14 @@
 # Pmw dependency dropped
 # Version number updated
 # Run build trace to thread
+################################################################
+#
+# modification
+# version: 2024.4.0.0
+# author: Omid Hosseini
+#
+# GUI updated to PySide6
+# Version number updated
 """
 
 import sys
@@ -139,7 +147,7 @@ import itertools
 from getopt import getopt
 from glob import glob
 from operator import mod
-from PySide2.QtWidgets import (QApplication, QWidget, QTabWidget,
+from PySide6.QtWidgets import (QApplication, QWidget, QTabWidget,
                                QLineEdit, QVBoxLayout, QHBoxLayout,
                                QTextEdit, QGroupBox, QLabel,
                                QComboBox, QPushButton, QSizePolicy,
@@ -147,8 +155,8 @@ from PySide2.QtWidgets import (QApplication, QWidget, QTabWidget,
                                QSpacerItem, QStackedWidget, QFileDialog,
                                QMessageBox, QProgressDialog, QTreeWidget,
                                QTreeWidgetItem)
-from PySide2.QtCore import (Qt, QObject, Signal, QThread, QTimer, QEventLoop)
-from PySide2.QtGui import QColor
+from PySide6.QtCore import (Qt, QObject, Signal, QThread, QTimer, QEventLoop)
+from PySide6.QtGui import QColor
 
 from mseedpeek.libtrace import *
 from mseedpeek.mseedInfo import *
@@ -291,7 +299,7 @@ class MainWindow(QWidget):
         self.window_layout.addWidget(self.tabwidget)
         self.build_trace_headers()  # build widgets for Trace Headers tab
         self.window_layout.addWidget(self.infobar)
-        self.window_layout.setMargin(0)  # set spacing
+        self.window_layout.setContentsMargins(0, 0, 0, 0)  # set spacing
 
     def build_help(self):
         """
@@ -574,7 +582,7 @@ class MainWindow(QWidget):
         stations_layout = QHBoxLayout(self.stations_box)
         rbuttons_layout = QHBoxLayout(self.radio_box)
         flush_exit_layout = QHBoxLayout(self.flush_exit_box)
-        flush_exit_layout.setMargin(0)
+        flush_exit_layout.setContentsMargins(0, 0, 0, 0)
         flush_exit_layout.setSpacing(450)
         dir_trace_layout = QFormLayout(self.dir_trace_box)
 
@@ -1562,7 +1570,7 @@ class SliderBox(QGroupBox):
         self.jump_menu.insertItem(0, "0")
         label2 = QLabel("Block Number")
         self.slider = QSlider(Qt.Horizontal)
-        self.slider.setTickPosition(self.slider.NoTicks)
+        self.slider.setTickPosition(self.slider.tickPosition().NoTicks)
 
         # layouts
         main_layout = QVBoxLayout(self)

setup.py

@@ -29,7 +29,7 @@ setup(
             'mseedpeek=mseedpeek.mseedpeek:main',
         ],
     },
-    install_requires=['PySide2'],
+    install_requires=['PySide6'],
     setup_requires=[],
     extras_require={
         'dev': [
@@ -44,6 +44,6 @@ setup(
     name='mseedpeek',
     packages=find_packages(include=['mseedpeek']),
     url='https://git.passcal.nmt.edu/software_public/passoft/mseedpeek',
-    version='2023.3.1.0',
+    version='2024.4.0.0',
     zip_safe=False,
 )