diff --git a/.gitignore b/.gitignore index 6489da6..681cbdc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ *__pycache__ ~* .DS_Store +build +*.egg-info diff --git a/ismrmrdviewer/__main__.py b/ismrmrdviewer/__main__.py index 7433c8a..29806d6 100644 --- a/ismrmrdviewer/__main__.py +++ b/ismrmrdviewer/__main__.py @@ -1,11 +1,11 @@ #!/usr/bin/env python -from PySide2 import QtCore +from PySide6 import QtCore import ismrmrdviewer.ui as ui import sys import logging import argparse -from PySide2 import QtWidgets +from PySide6 import QtWidgets def main(): diff --git a/ismrmrdviewer/ui/FileWidget.py b/ismrmrdviewer/ui/FileWidget.py index 38ee173..6c4e275 100644 --- a/ismrmrdviewer/ui/FileWidget.py +++ b/ismrmrdviewer/ui/FileWidget.py @@ -1,9 +1,9 @@ import ismrmrd -from PySide2 import QtWidgets -from PySide2.QtCore import Qt -from PySide2.QtGui import QGuiApplication, QCursor +from PySide6 import QtWidgets +from PySide6.QtCore import Qt +from PySide6.QtGui import QGuiApplication, QCursor from ismrmrdviewer.viewer import HeaderViewer, ImageViewer, AcquisitionViewer, WaveformViewer diff --git a/ismrmrdviewer/ui/MainWindow.py b/ismrmrdviewer/ui/MainWindow.py index cb53919..44bd78f 100644 --- a/ismrmrdviewer/ui/MainWindow.py +++ b/ismrmrdviewer/ui/MainWindow.py @@ -1,9 +1,9 @@ import os import logging -from PySide2 import QtCore -from PySide2 import QtWidgets -from PySide2.QtCore import Signal, Slot +from PySide6 import QtCore +from PySide6 import QtWidgets +from PySide6.QtCore import Signal, Slot from .FileWidget import FileWidget diff --git a/ismrmrdviewer/viewer/AcquisitionViewer.py b/ismrmrdviewer/viewer/AcquisitionViewer.py index 971b3fa..3e1d96c 100644 --- a/ismrmrdviewer/viewer/AcquisitionViewer.py +++ b/ismrmrdviewer/viewer/AcquisitionViewer.py @@ -1,7 +1,7 @@ import logging -from PySide2 import QtWidgets, QtCore, QtGui -from PySide2.QtCore import Qt +from PySide6 import QtWidgets, QtCore, QtGui +from PySide6.QtCore import Qt import numpy as np import matplotlib as mpl diff --git a/ismrmrdviewer/viewer/HeaderViewer.py b/ismrmrdviewer/viewer/HeaderViewer.py index 4b950c4..2f770ee 100644 --- a/ismrmrdviewer/viewer/HeaderViewer.py +++ b/ismrmrdviewer/viewer/HeaderViewer.py @@ -1,7 +1,7 @@ import logging import xml.etree.ElementTree as ET -from PySide2 import QtWidgets, QtCore +from PySide6 import QtWidgets, QtCore class HeaderViewer(QtWidgets.QTreeWidget): diff --git a/ismrmrdviewer/viewer/ImageViewer.py b/ismrmrdviewer/viewer/ImageViewer.py index 721fffc..209468b 100644 --- a/ismrmrdviewer/viewer/ImageViewer.py +++ b/ismrmrdviewer/viewer/ImageViewer.py @@ -4,7 +4,7 @@ import matplotlib.pyplot as pyplot import matplotlib.animation as animation -from PySide2 import QtCore, QtGui, QtWidgets as QTW +from PySide6 import QtCore, QtGui, QtWidgets as QTW from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas from matplotlib.figure import Figure diff --git a/ismrmrdviewer/viewer/WaveformViewer.py b/ismrmrdviewer/viewer/WaveformViewer.py index 13934f2..284e118 100644 --- a/ismrmrdviewer/viewer/WaveformViewer.py +++ b/ismrmrdviewer/viewer/WaveformViewer.py @@ -1,8 +1,8 @@ import logging -from PySide2 import QtWidgets, QtCore, QtGui -from PySide2.QtCore import Qt +from PySide6 import QtWidgets, QtCore, QtGui +from PySide6.QtCore import Qt import numpy as np import matplotlib as mpl diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..98880d1 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,33 @@ +[build-system] +requires = ["setuptools>=61.0", "wheel"] +build-backend = "setuptools.build_meta" + +[project] +name = "ismrmrdviewer" +version = "0.2.1" +description = "Simple tool for viewing ISMRMRD data." +readme = "README.md" +license = {file = "LICENSE.txt"} +authors = [ + {name = "Kristoffer Langeland Knudsen", email = "kristofferlknudsen@gradientsoftware.net"} +] +requires-python = ">=3.8" +dependencies = [ + "cycler", + "h5py", + "ismrmrd", + "kiwisolver", + "matplotlib", + "numpy", + "pyparsing", + "PySide6", + "python-dateutil", + "six", +] + +[project.scripts] +ismrmrdviewer = "ismrmrdviewer.__main__:main" + +[tool.setuptools.packages.find] +where = ["."] +include = ["ismrmrdviewer*"] diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 61b9ebb..0000000 --- a/requirements.txt +++ /dev/null @@ -1,11 +0,0 @@ -cycler==0.10.0 -h5py==2.9.0 -ismrmrd==1.6.1 -kiwisolver==1.1.0 -matplotlib==3.0.3 -numpy==1.16.2 -pyparsing==2.4.0 -PySide2==5.15.1 -python-dateutil==2.8.0 -shiboken2==5.15.1 -six==1.12.0 diff --git a/res/data/.gitattributes b/res/data/.gitattributes deleted file mode 100644 index 2552b5c..0000000 --- a/res/data/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -simple.h5 filter=lfs diff=lfs merge=lfs -text -spiral.h5 filter=lfs diff=lfs merge=lfs -text diff --git a/res/data/cine.h5 b/res/data/cine.h5 deleted file mode 100644 index 7065be2..0000000 Binary files a/res/data/cine.h5 and /dev/null differ diff --git a/res/data/image.h5 b/res/data/image.h5 deleted file mode 100644 index b455ec0..0000000 Binary files a/res/data/image.h5 and /dev/null differ diff --git a/res/data/simple.h5 b/res/data/simple.h5 deleted file mode 100644 index 507b615..0000000 --- a/res/data/simple.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea1b961eac11430ceefa2b36069be5f0a18f666ae6b5dad5838e959a076023a4 -size 84535248 diff --git a/res/data/spiral.h5 b/res/data/spiral.h5 deleted file mode 100644 index 5443752..0000000 --- a/res/data/spiral.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd1d9cd21da3d2c1c96ebf98f180f871c01c6657f6c71fa0fb21a14deaf5dda0 -size 12356616 diff --git a/setup.py b/setup.py deleted file mode 100644 index a2023b8..0000000 --- a/setup.py +++ /dev/null @@ -1,25 +0,0 @@ -from setuptools import setup,find_packages - -setup( - name='ismrmrdviewer', - version='0.2.1', - packages=find_packages(), - license='LICENSE.txt', - author='Kristoffer Langeland Knudsen', - author_email='kristofferlknudsen@gradientsoftware.net', - description='Simple tool for viewing ISMRMRD data.', - entry_points={'gui_scripts' : [ 'ismrmrdviewer=ismrmrdviewer.__main__:main']}, - install_requires=[ - 'cycler', - 'h5py', - 'ismrmrd', - 'kiwisolver', - 'matplotlib', - 'numpy', - 'pyparsing', - 'PySide2', - 'python-dateutil', - 'shiboken2', - 'six' - ] -)