update pyside to pyside6

Author: tuxberlin

README.md

@@ -21,6 +21,7 @@ Basic management of keys in the Linux kernel keyring in Python. Also comes with
 * [License](#license)
 
 
+
 # Description
 
 This is a small library to make use of some functions of the kernel keyring in Python.
@@ -41,56 +42,46 @@ Available functions:
 
 There are many more functions with keys in the kernel keyring (e.g. permissions)
 that is needed for proper keymanagement. But for my usecase I just needed the
-given simple functionality. 
+given simple functionality.
+
+:warning: You might need to link your keyrings (e.g. for the testcases using the default keyring)
+to have proper permissions.
+E.g.:
+```sh
+$ keyctl link @u @s
+```
 
 
 # Requirements
 
 Python 3.9
-```
+```sh
 $ sudo apt install python3.9
 $ python --version
-Python 3.9.12
+Python 3.9.18
 ```
 
 pip
-```
+```sh
 $ sudo apt install python3-pip
 $ pip --version
-pip 22.3.1 from .... (python 3.9)
+pip 23.3.2 from .... (python 3.9)
 ```
 
 The 'keyctl' command
-```
+```sh
 $ sudo apt install keyutils
 $ dpkg -s keyutils | grep Version
-Version: 1.5.9
+Version: 1.6.1
 ```
 
-For the GUI you also need:
-
-Qt4
+If you want to use the GUI, you also need PySide6
 ```
-$ sudo apt install qt4-qmake libqt4-core libqt4-dev
-$ qmake-qt4 --version
-QMake version 2.01a
-Using Qt version 4.8.1 in /usr/lib/x86_64-linux-gnu
+$ pip install pyside6
+$ python3 -c "import PySide6; print(PySide6.__version__)"
+6.6.1
 ```
 
-PySide
-```
-$ sudo apt install python-qt4 python3-pyside
-$ python3 -c "import PySide; print(PySide.__version__)"
-Version: 1.2.2
-```
-
-Virtualenv:  
-If you want to use gui part of this module in a virtualenv you either have to
-`(venv)$ pip install pyside` (which takes up to 40min to compile)
-or you can link your pyside distro package into your virtualenv like this:
-```
-$ ln -s /usr/lib/python3/dist-packages/PySide venv/lib/python3.9/site-packages/
-```
 
 
 # Installation
@@ -102,6 +93,7 @@ $ pip install keyctl
 Ready to use.
 
 
+
 # Usage
 
 ## Module
@@ -169,6 +161,7 @@ If you run the integrated tests, your user keyring will be cleared.
 Don't do this when you have active keys e.g. for encryption.
 
 
+
 # Similar projects
 
 Similar projects you might want to check out:
@@ -177,6 +170,7 @@ Similar projects you might want to check out:
  * https://github.com/jdukes/pykeyctl (more complete, direct library wrapper)
 
 
+
 # License
 
 GPL-3.0  

keyctl/gui/gui.py keyctl/gui/_gui.pykeyctl/gui/gui.py renamed to keyctl/gui/_gui.py

@@ -2,8 +2,9 @@
 # -*- coding: utf-8 -*-
 
 import os
-from PySide.QtUiTools import QUiLoader
-from PySide.QtGui import QMainWindow, QDesktopWidget, QTableWidgetItem, QDialog
+from PySide6.QtUiTools import QUiLoader
+from PySide6.QtWidgets import QMainWindow, QTableWidgetItem, QDialog
+from PySide6.QtGui import QGuiApplication
 
 from keyctl import Key
 
@@ -42,7 +43,7 @@ def __init__(self):
         self._refresh_table()
 
     def center_window(self):
-        coords = QDesktopWidget().availableGeometry().center()
+        coords = QGuiApplication.primaryScreen().availableGeometry().center()
         fg = self.ui.frameGeometry()
         fg.moveCenter(coords)
         self.ui.move(fg.topLeft())
@@ -67,7 +68,7 @@ def _open_add_dialog(self):
             name, content = dialog.get_input()
             Key.add(name, content)
         else:
-            print 'ERROR'
+            print('ERROR')
 
         self._refresh_table()
 

keyctl/gui/main.py

@@ -2,23 +2,26 @@
 # -*- coding: utf-8 -*-
 
 import sys
-from PySide.QtGui import QApplication
+from PySide6.QtCore import Qt, QCoreApplication
+from PySide6.QtWidgets import QApplication
 
-from gui import KeyringApp
+from keyctl.gui._gui import KeyringApp
 
 
 # -------------------------------------------------------------------
 
 
 def main():
+    QCoreApplication.setAttribute(Qt.AA_ShareOpenGLContexts)
+
     app = QApplication(sys.argv)
 
     window = KeyringApp()
     window.ui.show()
     window.center_window()
     window.activateWindow()
 
-    ret = app.exec_()
+    ret = app.exec()
     sys.exit(ret)
 
 

pyproject.toml

@@ -2,6 +2,9 @@
 requires = ["setuptools>=61.0"]
 build-backend = "setuptools.build_meta"
 
+[tool.setuptools.package-data]
+keyctl = ["gui/*.ui"]
+
 [project]
 name = "keyctl"
 version = "0.5rc1"
@@ -22,7 +25,7 @@ classifiers = [
 ]
 
 [project.optional-dependencies]
-gui = ["PyQt4"]
+gui = ["PySide6"]
 
 [project.gui-scripts]
 keyctlgui = "keyctl.gui:main"

requirements.txt

@@ -1,3 +1 @@
-pytest==7.2.1
-build==0.10.0
-twine==4.0.2
+PySide6==6.6.1