diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 080de7c263c5ab292b8aba499b5858b2c16bc68a..96f6eec8b8b9666e11411b4c3d034e6266738493 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,6 +1,6 @@ package: name: nexus-passoft - version: "2022.2.0.0" + version: "2022.2.1.0" source: path: ../ @@ -25,7 +25,7 @@ requirements: # err, basemap is getting more depricated, try cartopy - cartopy # - basemap - # - pyside6 + - pyside2 # test: # imports: diff --git a/nexus/ChannelSelectDialog.py b/nexus/ChannelSelectDialog.py index b68d0b7b9ff0c8a1809f1a63d3b12e21cf6b53f0..db9758b991f32ac3961b908be9bd38cfb5569e1c 100644 --- a/nexus/ChannelSelectDialog.py +++ b/nexus/ChannelSelectDialog.py @@ -8,11 +8,11 @@ IRIS/PASSCAL import sys import os -from PySide6.QtWidgets import (QDialog, +from PySide2.QtWidgets import (QDialog, QApplication, QTableWidgetItem, ) -from PySide6.QtUiTools import loadUiType +from PySide2.QtUiTools import loadUiType from .obspyImproved import utc_to_str diff --git a/nexus/NRLWizard.py b/nexus/NRLWizard.py index 61c84c62301142d34877f63b414ce0a288b33449..e0378a9a91c75443cd8ca13ef7f6d31e63ceebc4 100644 --- a/nexus/NRLWizard.py +++ b/nexus/NRLWizard.py @@ -5,7 +5,7 @@ Lloyd Carothers Qt Wizard for selecting responses from the IRIS NRL ''' -from PySide6 import QtCore, QtGui, QtWidgets +from PySide2 import QtCore, QtGui, QtWidgets from obspy.clients.nrl import NRL diff --git a/nexus/__init__.py b/nexus/__init__.py index a5f30f124119fb4c1032a035116f4842cfa91477..1f465e2c297a59b94f6005ec2ab5a11349252342 100644 --- a/nexus/__init__.py +++ b/nexus/__init__.py @@ -4,4 +4,4 @@ __author__ = """IRIS PASSCAL""" __email__ = 'software-support@passcal.nmt.edu' -__version__ = '2022.2.0.0' +__version__ = '2022.2.1.0' diff --git a/nexus/icons_rc.py b/nexus/icons_rc.py index 0fbda903b312d515a4a21b726aafa62530fb7ff0..68279c991212c0b45102fb86049481939df5e41c 100644 --- a/nexus/icons_rc.py +++ b/nexus/icons_rc.py @@ -3,7 +3,7 @@ # Created by: The Resource Compiler for Qt version 6.2.2 # WARNING! All changes made in this file will be lost! -from PySide6 import QtCore +from PySide2 import QtCore qt_resource_data = b"\ \x00\x00\x0b\xb3\ diff --git a/nexus/inv_model.py b/nexus/inv_model.py index d8549f19fde35dae3ced78f77338bd3ba6ebd192..f3bdf14957562fbf103a0f83e7f3d7426b69ab3f 100644 --- a/nexus/inv_model.py +++ b/nexus/inv_model.py @@ -6,7 +6,7 @@ Channel Widget model play """ import sys -from PySide6 import QtCore, QtGui, QtWidgets +from PySide2 import QtCore, QtGui, QtWidgets from obspy import Inventory, read_inventory diff --git a/nexus/inventorymodel.py b/nexus/inventorymodel.py index 3b1dbcfe33ebba52aa0c21e208fdeccacf87041a..c809af0f499eedd3ee5a9cff327789c8117d540e 100644 --- a/nexus/inventorymodel.py +++ b/nexus/inventorymodel.py @@ -8,7 +8,7 @@ Lloyd Carothers import sys -from PySide6 import QtCore, QtGui, QtWidgets +from PySide2 import QtCore, QtGui, QtWidgets import obspy class Node(object): diff --git a/nexus/nexus.py b/nexus/nexus.py index ed9f7e27d6ed64a4c76eba72a928ab8a4fa7a4cc..8f9a09f5cb70973961cac1cee767a746cb22d408 100755 --- a/nexus/nexus.py +++ b/nexus/nexus.py @@ -10,10 +10,10 @@ import os import sys import traceback -from PySide6 import QtCore, QtGui, QtWidgets -from PySide6.QtUiTools import loadUiType -from PySide6.QtWidgets import QMessageBox -from PySide6.QtCore import Qt +from PySide2 import QtCore, QtGui, QtWidgets +from PySide2.QtUiTools import loadUiType +from PySide2.QtWidgets import QMessageBox +from PySide2.QtCore import Qt from obspy import read_inventory from obspy.core.inventory import Network, Station, Equipment diff --git a/nexus_constructor/construct.yaml b/nexus_constructor/construct.yaml index 8bc1f435cfea5e950820682314193ef3cc0e62bb..a682578c857e97089e70f58070fcf7c9927d4dd2 100644 --- a/nexus_constructor/construct.yaml +++ b/nexus_constructor/construct.yaml @@ -1,5 +1,5 @@ name: nexus -version: 2022.2.0.0 +version: 2022.2.1.0 install_in_dependency_order: True diff --git a/setup.cfg b/setup.cfg index 1a63b95413a091c81a8bb367fefcc6042f9e7d66..6e797b26003695b017376d2c1fee62b819e5caf6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2022.2.0.0 +current_version = 2022.2.1.0 commit = True tag = True diff --git a/setup.py b/setup.py index 9fcd0274f6ea8c43375aa1fece574c104ef23d97..0fdb00928266fce9477d99def4656fad8050dd47 100644 --- a/setup.py +++ b/setup.py @@ -31,6 +31,7 @@ setup( }, install_requires=[ 'obspy>=1.3.0', + 'pyside2', ], python_requires='>=3.7', setup_requires = [], @@ -45,6 +46,7 @@ setup( 'coverage', 'Sphinx', 'twine', + 'cartopy', ] }, license="GNU General Public License v3", @@ -55,6 +57,6 @@ setup( packages=find_packages(include=['nexus']), test_suite='tests', url='https://git.passcal.nmt.edu/software_public/passoft/nexus', - version='2022.2.0.0', + version='2022.2.1.0', zip_safe=False, )