From d53a07b1803031894abdbf36bb8837485091df82 Mon Sep 17 00:00:00 2001
From: Omid Hosseini <ohosseini@passcal.nmt.edu>
Date: Fri, 12 Jan 2024 14:54:21 -0700
Subject: [PATCH] Feature pyside6 migration
---
.gitlab-ci.yml | 2 +-
HISTORY.rst | 4 ++++
conda.recipe/meta.yaml | 4 ++--
mseedpeek/__init__.py | 4 ++--
mseedpeek/libtrace.py | 2 +-
mseedpeek/mseedpeek.py | 20 ++++++++++++++------
setup.py | 4 ++--
7 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dae6f39..ec21e03 100644
--- a/.gitlab-ci.yml
+++ b/.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:
diff --git a/HISTORY.rst b/HISTORY.rst
index 6d97ddb..620b02f 100644
--- a/HISTORY.rst
+++ b/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
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
index 4278af9..1c25545 100644
--- a/conda.recipe/meta.yaml
+++ b/conda.recipe/meta.yaml
@@ -1,6 +1,6 @@
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:
diff --git a/mseedpeek/__init__.py b/mseedpeek/__init__.py
index 1c06f1d..61e14ca 100644
--- a/mseedpeek/__init__.py
+++ b/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'
diff --git a/mseedpeek/libtrace.py b/mseedpeek/libtrace.py
index 6c431ee..60f1c7e 100755
--- a/mseedpeek/libtrace.py
+++ b/mseedpeek/libtrace.py
@@ -125,7 +125,7 @@ import time
SPACE = " "
-# VERSION = "2023.3.0.0"
+# VERSION = "2024.4.0.0"
class futils:
diff --git a/mseedpeek/mseedpeek.py b/mseedpeek/mseedpeek.py
index 613ac0c..b86546a 100644
--- a/mseedpeek/mseedpeek.py
+++ b/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)
diff --git a/setup.py b/setup.py
index b9b080e..f8ccda7 100644
--- a/setup.py
+++ b/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,
)
--
GitLab