Merge branch 'pyside6' into 'master'

Pyside6

See merge request !11

.gitignore

@@ -5,3 +5,23 @@
 __pycache__
 .DS_Store
 
+# Ignore JetBrain Idea subfolder
+.idea
+
+# Ignore VS vscode subfolder
+.vscode
+
+# Distribution / packaging
+bin/
+build/
+develop-eggs/
+dist/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
\ No newline at end of file

CONTRIBUTING.rst

@@ -15,7 +15,7 @@ Types of Contributions
 Report Bugs
 ~~~~~~~~~~~
 
-Report bugs at https://git.passcal.nmt.edu/passoft/nexus/issues.
+Report bugs at https://git.passcal.nmt.edu/software_public/passoft/nexus/issues
 
 If you are reporting a bug, please include:
 
@@ -61,7 +61,7 @@ Ready to contribute? Here's how to set up `nexus` for local development.
 
 1. Cone the `nexus` repo::
 
-    $ git clone https://git.passcal.nmt.edu/passoft/nexus.git
+    $ git clone https://git.passcal.nmt.edu/software_public/passoft/nexus.git
 
 3. Install your local copy::
 

conda-recipe/meta.yaml

 package:
   name: nexus-passoft
-  version: "2022.006"
+  version: "2022.2.0.0"
 
 source:
   path: ../
@@ -15,25 +15,25 @@ build:
 
 requirements:
   build:
-    - python >=3.6
+    - python >=3.7
     - pip
 
   run:
-    - python >=3.6
-    - obspy
+    - python >=3.7
+    - obspy >=1.3.0
     # needs basemap or cartopy. Cartopy has heavy deps like hdf4 and 5, so basemap for now.
     # err, basemap is getting more depricated, try cartopy
     - cartopy
     # - basemap
     # - pyside6
 
-test:
-  imports:
-    - nexus.nexus
+# test:
+#   imports:
+#     - nexus.nexus
 
 about:
   home: https://www.passcal.nmt.edu/content/software-resources
-  dev_url: https://git.passcal.nmt.edu/software_public/passoft/nexus
+  dev_url: https://git.passcal.nmt.edu/software_public/passoft/nexus.git
   license: GPLv3
   license_file: LICENSE
   summary: 'Create and edit FDSN StationXML seismic meta-data format.'

nexus/__init__.py

@@ -4,4 +4,4 @@
 
 __author__ = """IRIS PASSCAL"""
 __email__ = 'software-support@passcal.nmt.edu'
-__version__ = '2021.204'
+__version__ = '2022.2.0.0'

nexus/inv_model.py

@@ -6,7 +6,7 @@ Channel Widget model play
 """
 import sys
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PySide6 import QtCore, QtGui, QtWidgets
 from obspy import Inventory, read_inventory
 
 

nexus/inventorymodel.py

@@ -8,7 +8,7 @@ Lloyd Carothers
 
 import sys
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PySide6 import QtCore, QtGui, QtWidgets
 import obspy
 
 class Node(object):

nexus_constructor/construct.yaml

 name: nexus
-version: 2019.219.a
+version: 2022.2.0.0
 
 install_in_dependency_order: True
 
 channels:
-  - file:///Users/lloyd/miniconda3/conda-bld
   - https://conda.anaconda.org/conda-forge
   - http://repo.anaconda.com/pkgs/main/
 

setup.cfg

 [bumpversion]
-current_version = 2018.149
+current_version = 2022.2.0.0
 commit = True
 tag = True
 

setup.py

@@ -13,8 +13,8 @@ with open('HISTORY.rst') as history_file:
 
 
 setup(
-    author="Lloyd Carothers",
-    author_email='lloyd@passcal.nmt.edu',
+    author="IRIS PASSCAL",
+    author_email='software-support@passcal.nmt.edu',
     classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Science/Research',
@@ -30,10 +30,9 @@ setup(
         ],
     },
     install_requires=[
-        'obspy>=1.1.1',
-        'PySide6>=6',
+        'obspy>=1.3.0',
         ],
-    python_requires='>=3.6',
+    python_requires='>=3.7',
     setup_requires = [],
     extras_require={
         'dev': [
@@ -55,7 +54,7 @@ setup(
     name='nexus',
     packages=find_packages(include=['nexus']),
     test_suite='tests',
-    url='https://git.passcal.nmt.edu/passoft/nexus',
-    version='2019.165.a',
+    url='https://git.passcal.nmt.edu/software_public/passoft/nexus',
+    version='2022.2.0.0',
     zip_safe=False,
 )