diff --git a/.gitignore b/.gitignore index 650c9f7698a72c796809c4ca08ef4a8e9b46f85c..7ecefce38b83b0804b2c40793107eef09229d3c9 100644 --- a/.gitignore +++ b/.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 diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 58d9d3577ecfc9f89195afc173982c3b69b3f35e..d5eb44dad7279da0f39163a399f34a19bb01f303 100644 --- a/CONTRIBUTING.rst +++ b/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:: diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 84ad25bc2b66d1e5c1d915437560febbd8e065d9..080de7c263c5ab292b8aba499b5858b2c16bc68a 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,6 +1,6 @@ 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.' diff --git a/nexus/__init__.py b/nexus/__init__.py index 1431e2c84417b0d10a50e5d6d2f9b7777378b5fe..a5f30f124119fb4c1032a035116f4842cfa91477 100644 --- a/nexus/__init__.py +++ b/nexus/__init__.py @@ -4,4 +4,4 @@ __author__ = """IRIS PASSCAL""" __email__ = 'software-support@passcal.nmt.edu' -__version__ = '2021.204' +__version__ = '2022.2.0.0' diff --git a/nexus/inv_model.py b/nexus/inv_model.py index 5ef734c3a30bd30990e1955fff1c7dd93004133a..d8549f19fde35dae3ced78f77338bd3ba6ebd192 100644 --- a/nexus/inv_model.py +++ b/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 diff --git a/nexus/inventorymodel.py b/nexus/inventorymodel.py index 851f9b00c147fb29ed9c5d87ce5b9dc95165144f..3b1dbcfe33ebba52aa0c21e208fdeccacf87041a 100644 --- a/nexus/inventorymodel.py +++ b/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): diff --git a/nexus_constructor/construct.yaml b/nexus_constructor/construct.yaml index e894a8cf80c79c21af93e88cc1e4640e9a921602..8bc1f435cfea5e950820682314193ef3cc0e62bb 100644 --- a/nexus_constructor/construct.yaml +++ b/nexus_constructor/construct.yaml @@ -1,10 +1,9 @@ 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/ diff --git a/setup.cfg b/setup.cfg index 96f1818f81463c363e838a253c12a4214d131877..1a63b95413a091c81a8bb367fefcc6042f9e7d66 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2018.149 +current_version = 2022.2.0.0 commit = True tag = True diff --git a/setup.py b/setup.py index 4a16c2e8cff7c4f87a5d36683d90fee018bc2d4a..9fcd0274f6ea8c43375aa1fece574c104ef23d97 100644 --- a/setup.py +++ b/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, )