Skip to content
Snippets Groups Projects
Commit e47bae5c authored by Maeva Pourpoint's avatar Maeva Pourpoint
Browse files

Merge branch 'pyside' into 'master'

Pyside

See merge request !14
parents 4edeb5a2 f3115a2c
No related branches found
No related tags found
1 merge request!14Pyside
Pipeline #2540 passed with stage
in 1 minute and 43 seconds
......@@ -18,6 +18,8 @@ stages:
- test
before_script:
- uname -a
- apt-get update && apt install -y libgl1-mesa-glx
- pip install -e .[dev]
linting:
......
......@@ -22,3 +22,9 @@ History
2022.1.0.0 (2022-01-11)
------------------
* New versioning scheme
2022.2.0.0 (2023-04-03)
------------------
* Gui updated to PySide2
* Pmw dependency dropped
* Version number updated
package:
name: mseedpeek
version: 2022.1.0.0
version: 2022.2.0.0
source:
path: ../
......@@ -11,11 +11,11 @@ build:
requirements:
host:
- python >=3.6
- python >=3.8
- pip
run:
- python >=3.6
- pmw
- python >=3.8
- pyside2
test:
source_files:
......
......@@ -4,4 +4,4 @@
__author__ = """IRIS PASSCAL"""
__email__ = 'software-support@passcal.nmt.edu'
__version__ = '2022.1.0.0'
__version__ = '2022.2.0.0'
This diff is collapsed.
mseedpeek/mseedpeek.py 100755 → 100644
This diff is collapsed.
......@@ -20,9 +20,9 @@ setup(
'Intended Audience :: Developers',
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
'Natural Language :: English',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
],
description="View mseed headers",
entry_points={
......@@ -30,7 +30,7 @@ setup(
'mseedpeek=mseedpeek.mseedpeek:main',
],
},
install_requires=['Pmw @ https://github.com/schrodinger/pmw-patched/archive/master.tar.gz'],
install_requires=['PySide2'],
setup_requires=[],
extras_require={
'dev': [
......@@ -45,6 +45,6 @@ setup(
name='mseedpeek',
packages=find_packages(include=['mseedpeek']),
url='https://git.passcal.nmt.edu/passoft/mseedpeek',
version='2022.1.0.0',
version='2022.2.0.0',
zip_safe=False,
)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment