Backport to Qt5

(cherry picked from commit 70ee515)
Donders-Institute · Oct 16, 2023 · fe41284 · fe41284
1 parent d03fd20
commit fe41284
Show file tree

Hide file tree

Showing 7 changed files with 98 additions and 101 deletions.
diff --git a/bidscoin/bcoin.py b/bidscoin/bcoin.py
@@ -482,7 +482,7 @@ def test_bidscoin(bidsmapfile: Union[Path,dict], options: dict=None, testplugins
     if testgui:
         LOGGER.info('Testing the PyQt GUI setup:')
         try:
-            from PyQt6.QtWidgets import QApplication, QPushButton
+            from PyQt5.QtWidgets import QApplication, QPushButton
             app = QApplication(sys.argv)
             window = QPushButton('Minimal GUI test: OK')
             window.show()

diff --git a/bidscoin/bidseditor.py b/bidscoin/bidseditor.py
diff --git a/bidscoin/bidsmapper.py b/bidscoin/bidsmapper.py
@@ -143,8 +143,8 @@ def bidsmapper(rawfolder: str, bidsfolder: str, bidsmapfile: str, templatefile:
 
     else:
         LOGGER.info('Opening the bidseditor')
-        from PyQt6 import QtCore, QtGui
-        from PyQt6.QtWidgets import QApplication, QMessageBox
+        from PyQt5 import QtCore, QtGui
+        from PyQt5.QtWidgets import QApplication, QMessageBox
         try:
             from bidscoin import bidseditor
         except ImportError:
@@ -165,7 +165,7 @@ def bidsmapper(rawfolder: str, bidsfolder: str, bidsmapfile: str, templatefile:
                                f"{versionmessage}")
             messagebox.setWindowTitle('About the BIDS-mapping workflow')
             messagebox.setIconPixmap(QtGui.QPixmap(str(bidseditor.BIDSCOIN_LOGO)).scaled(150, 150, QtCore.Qt.AspectRatioMode.KeepAspectRatio, QtCore.Qt.TransformationMode.SmoothTransformation))
-            messagebox.setWindowFlags(messagebox.windowFlags() & ~QtCore.Qt.WindowType.WindowMinMaxButtonsHint)
+            messagebox.setWindowFlags(messagebox.windowFlags() & ~QtCore.Qt.WindowMinMaxButtonsHint)
             messagebox.show()
 
         app.exec()

diff --git a/bidscoin/heuristics/bidsmap_dccn.yaml b/bidscoin/heuristics/bidsmap_dccn.yaml
@@ -22,7 +22,7 @@ Options:
 # General options and plugins
 # --------------------------------------------------------------------------------
   bidscoin:
-    version: 4.2.0                  # BIDScoin version (should correspond with the version in pyproject.toml)
+    version: 4.2.0+qt5              # BIDScoin version (should correspond with the version in pyproject.toml)
     bidsignore: mrs/;extra_data/;sub-*_ct.*    # Semicolon-separated list of entries that are added to the .bidsignore file (for more info, see BIDS specifications), e.g. extra_data/;pet/;myfile.txt;yourfile.csv
     subprefix: sub-                 # The subject prefix of the source data
     sesprefix: ses-                 # The session prefix of the source data

diff --git a/bidscoin/heuristics/bidsmap_sst.yaml b/bidscoin/heuristics/bidsmap_sst.yaml
@@ -21,7 +21,7 @@ Options:
 # General options and plugins
 # --------------------------------------------------------------------------------
   bidscoin:
-    version: 4.2.0                  # BIDScoin version (should correspond with the version in pyproject.toml)
+    version: 4.2.0+qt5              # BIDScoin version (should correspond with the version in pyproject.toml)
     bidsignore: mrs/;extra_data/    # Semicolon-separated list of entries that are added to the .bidsignore file (for more info, see BIDS specifications), e.g. extra_data/;pet/;myfile.txt;yourfile.csv
     subprefix: sub-                 # The subject prefix of the source data
     sesprefix: ses-                 # The session prefix of the source data

diff --git a/pyproject.toml b/pyproject.toml
@@ -7,7 +7,7 @@ build-backend    = 'setuptools.build_meta'
 [project]
 name             = 'bidscoin'
 description      = 'Converts and organises raw MRI data-sets according to the Brain Imaging Data Structure (BIDS)'
-version          = '4.2.0'
+version          = '4.2.0+qt5'
 readme           = 'README.rst'
 requires-python  = '>= 3.8'
 license          = {file = 'LICENSE.txt'}
@@ -21,7 +21,7 @@ dependencies     = ['pandas',
                     'matplotlib',
                     'numpy',
                     'pydicom >= 2',
-                    'PyQt6',
+                    'PyQt5 >= 5.12.1',
                     'ruamel-yaml >= 0.15.35',
                     'tomli >= 1.1.0 ; python_version < "3.11"',
                     'coloredlogs',

diff --git a/tests/test_data/bidsmap.yaml b/tests/test_data/bidsmap.yaml
@@ -20,7 +20,7 @@ Options:
 # General options and plugins
 # --------------------------------------------------------------------------------
   bidscoin:
-    version: 4.2.0                  # BIDScoin version (should correspond with the version in pyproject.toml)
+    version: 4.2.0+qt5              # BIDScoin version (should correspond with the version in pyproject.toml)
     bidsignore: mrs/;extra_data/    # Semicolon-separated list of entries that are added to the .bidsignore file (for more info, see BIDS specifications), e.g. extra_data/;pet/;myfile.txt;yourfile.csv
     subprefix: sub-                 # The subject prefix of the source data
     sesprefix: ses-                 # The session prefix of the source data