Fix pkg resources

README.md

@@ -8,35 +8,17 @@ xinput allows you to edit properties of devices like keyboards, mice, and touchp
 
 ## Installation
 
-xinput-gui depends on Python 3.5+, GTK+ 3.20+, PyGObject, and xinput.
-
-### Arch Linux
-
-Available as a package on the AUR: [xinput-gui](https://aur.archlinux.org/packages/xinput-gui)
-
-Install it with `makepkg` or your preferred AUR helper.
-
-### Gentoo
-
-Available as a Gentoo package thanks to [@filalex77](https://github.com/filalex77): [app-misc/xinput-gui](https://github.com/filalex77/bright/tree/master/app-misc/xinput-gui)
-
-To install it, run the following commands:
-
-```
-eselect-repository enable bright
-emerge --sync
-emerge xinput-gui
-```
-
-### pip
-
-Available on PyPI: [xinput-gui](https://pypi.org/project/xinput-gui/)
-
-Install it with pip: `pip install --user xinput-gui`.
+xinput-gui depends on Python 3.12+, GTK+ 3.20+, PyGObject, and xinput.
 
 ### Manual install
-
-Download the [latest release](https://github.com/IvanFon/xinput-gui/releases/latest) or clone this repo and run `./setup.py install --user`.
+Clone this repository, then use one of the following commands:
+ * #### uv
+  Install it whit uv: `uv pip install .`
+ * #### pip
+  Install it whit pip: `pip install .`
+
+### Other installs
+At the moment I dont have any plans to port the installation to other distros or package managers since this branch (or repo) it s just for personal use. But you're totally free to port it or adapt it whatever you like.
 
 ## Usage
 

pyproject.toml

@@ -0,0 +1,37 @@
+[project]
+name = "xinput-gui"
+version = "0.3.2"
+description = "A simple GUI for Xorg's Xinput tool."
+readme = "README.md"
+authors = [
+	{name = "Ivan Fonseca", email = "ivanfon@riseup.net"}
+]
+requires-python = ">=3.12"
+classifiers = [
+ "Development Status :: 4 - Beta",
+ "Environment :: X11 Applications :: GTK",
+ "Intended Audience :: End Users/Desktop",
+ "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
+ "Natural Language :: English",
+ "Operating System :: POSIX",
+ "Programming Language :: Python :: 3",
+ "Programming Language :: Python :: 3 :: Only",
+ "Programming Language :: Python :: 3.12",
+ "Topic :: Desktop Environment",
+ "Topic :: Utilities",
+]
+keywords=["'xinput", "keyboard", "mouse", "touchpad"]
+dependencies = ["PyGObject"	]
+license="GPL-3.0-or-later"
+
+[project.scripts]
+xinput-gui = "xinput_gui.__main__:main"
+
+[build-system]
+requires = ["uv_build>=0.11.28,<0.12.0"]
+build-backend = "uv_build"
+
+[project.urls]
+homepage = "https://pypi.org/project/xinput-gui/"
+repository = "https://github.com/IvanFon/xinput-gui"
+documentation = "https://github.com/IvanFon/xinput-gui/tree/master/docs"

xinput_gui/__main__.py → src/xinput_gui/__main__.py

@@ -26,3 +26,7 @@ def main():
 
     view_controller = ViewController()
     view_controller.start()
+
+
+if __name__ == "__main__":
+    main()

xinput_gui/gui/device_list.py → src/xinput_gui/gui/device_list.py

@@ -23,7 +23,7 @@
 import gi
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
-from pkg_resources import resource_filename
+from importlib.resources import as_file, files
 
 from ..settings import Settings
 from ..xinput.devices import Device, DeviceType
@@ -60,12 +60,14 @@ def __init__(self, controller: 'ViewController', main_window: 'MainWindow', sett
 
     def get_builder(self) -> Gtk.Builder:
         '''Get device list Gtk Builder.'''
-
-        builder = Gtk.Builder()
-        builder.add_objects_from_file(
-            resource_filename('xinput_gui', 'res/xinput-gui.ui'),
-            ['grid_device_list', 'store_devices'])
-        return builder
+        ref = files('xinput_gui') / 'res/xinput-gui.ui'
+        with as_file(ref) as path:
+
+            builder = Gtk.Builder()
+            builder.add_objects_from_file(
+                str(path),
+                ['grid_device_list', 'store_devices'])
+            return builder
 
     def apply_settings(self) -> None:
         '''Apply current settings.'''

xinput_gui/gui/dialog_about.py → src/xinput_gui/gui/dialog_about.py

@@ -21,10 +21,11 @@
 import gi
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
-from pkg_resources import require, resource_filename
 
+from importlib.resources import as_file, files
+from importlib.metadata import version
 
-__version__ = require('xinput_gui')[0].version
+__version__ = version('xinput_gui')
 
 
 class AboutDialog:
@@ -44,12 +45,14 @@ def __init__(self, main_window) -> None:
 
     def get_builder(self) -> Gtk.Builder:
         '''Get about dialog Gtk Builder.'''
-
-        builder = Gtk.Builder()
-        builder.add_objects_from_file(
-            resource_filename('xinput_gui', 'res/xinput-gui.ui'),
-            ['dialog_about'])
-        return builder
+        ref = files('xinput_gui') / 'res/xinput-gui.ui'
+        with as_file(ref) as path:
+
+            builder = Gtk.Builder()
+            builder.add_objects_from_file(
+                str(path),
+                ['dialog_about'])
+            return builder
 
     def show(self) -> None:
         '''Show the about dialog.'''

xinput_gui/gui/dialog_create_master.py → src/xinput_gui/gui/dialog_create_master.py

@@ -23,7 +23,8 @@
 import gi
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
-from pkg_resources import resource_filename
+
+from importlib.resources import files, as_file
 
 if TYPE_CHECKING:
     from ..view_controller import ViewController
@@ -51,11 +52,14 @@ def __init__(self, controller: 'ViewController', main_window: 'MainWindow') -> N
     def get_builder(self) -> Gtk.Builder:
         '''Get create master device dialog Gtk Builder.'''
 
-        builder = Gtk.Builder()
-        builder.add_objects_from_file(
-            resource_filename('xinput_gui', 'res/xinput-gui.ui'),
-            ['dialog_create_master'])
-        return builder
+        ref = files('xinput_gui') / 'res/xinput-gui.ui'
+        with as_file(ref) as path:
+
+            builder = Gtk.Builder()
+            builder.add_objects_from_file(
+                str(path),
+                ['dialog_create_master'])
+            return builder
 
     def show(self) -> Gtk.ResponseType:
         '''Show the create master device dialog.'''

xinput_gui/gui/dialog_device_info.py → src/xinput_gui/gui/dialog_device_info.py

@@ -23,10 +23,11 @@
 import gi
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
-from pkg_resources import resource_filename
 
 from ..xinput.devices import Device
 
+from importlib.resources import as_file, files
+
 if TYPE_CHECKING:
     from ..view_controller import ViewController
     from .win_main import MainWindow
@@ -49,12 +50,14 @@ def __init__(self, controller: 'ViewController', main_window: 'MainWindow') -> N
 
     def get_builder(self) -> Gtk.Builder:
         '''Get device info dialog Gtk Builder.'''
-
-        builder = Gtk.Builder()
-        builder.add_objects_from_file(
-            resource_filename('xinput_gui', 'res/xinput-gui.ui'),
-            ['dialog_device_info', 'buffer_device_info'])
-        return builder
+        ref = files('xinput_gui') / 'res/xinput-gui.ui'
+        with as_file(ref) as path:
+
+            builder = Gtk.Builder()
+            builder.add_objects_from_file(
+                str(path),
+                ['dialog_device_info', 'buffer_device_info'])
+            return builder
 
     def show(self, device: Device) -> None:
         '''Show the device info dialog.

xinput_gui/gui/dialog_edit.py → src/xinput_gui/gui/dialog_edit.py

@@ -23,7 +23,7 @@
 import gi
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
-from pkg_resources import resource_filename
+from importlib.resources import files, as_file
 
 from ..xinput.devices import Device, Prop
 
@@ -54,12 +54,14 @@ def __init__(self, controller: 'ViewController', main_window: 'MainWindow') -> N
 
     def get_builder(self) -> Gtk.Builder:
         '''Get edit dialog Gtk Builder.'''
-
-        builder = Gtk.Builder()
-        builder.add_objects_from_file(
-            resource_filename('xinput_gui', 'res/xinput-gui.ui'),
-            ['dialog_edit'])
-        return builder
+        ref = files('xinput_gui') / 'res/xinput-gui.ui'
+        with as_file(ref) as path:
+
+            builder = Gtk.Builder()
+            builder.add_objects_from_file(
+                str(path),
+                ['dialog_edit'])
+            return builder
 
     def show(self,
              device: Device,

xinput_gui/gui/dialog_reattach.py → src/xinput_gui/gui/dialog_reattach.py

@@ -23,7 +23,7 @@
 import gi
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
-from pkg_resources import resource_filename
+from importlib.resources import as_file, files
 
 from ..xinput.devices import Device, DeviceType
 
@@ -53,11 +53,14 @@ def __init__(self, controller: 'ViewController', main_window: 'MainWindow') -> N
     def get_builder(self) -> Gtk.Builder:
         '''Get reattach dialog Gtk Builder.'''
 
-        builder = Gtk.Builder()
-        builder.add_objects_from_file(
-            resource_filename('xinput_gui', 'res/xinput-gui.ui'),
-            ['dialog_reattach', 'store_reattach'])
-        return builder
+        ref = files('xinput_gui') / 'res/xinput-gui.ui'
+        with as_file(ref) as path:
+
+            builder = Gtk.Builder()
+            builder.add_objects_from_file(
+                str(path),
+                ['dialog_reattach', 'store_reattach'])
+            return builder
 
     def show(self, selected_device: Device, devices: List[Device]) -> Gtk.ResponseType:
         '''Show the reattach dialog.

xinput_gui/gui/log.py → src/xinput_gui/gui/log.py

@@ -23,7 +23,7 @@
 import gi
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
-from pkg_resources import resource_filename
+from importlib.resources import as_file, files
 
 if TYPE_CHECKING:
     from .win_main import MainWindow
@@ -48,12 +48,14 @@ def __init__(self, main_window: 'MainWindow'):
 
     def get_builder(self) -> Gtk.Builder:
         '''Get device list Gtk Builder.'''
-
-        builder = Gtk.Builder()
-        builder.add_objects_from_file(
-            resource_filename('xinput_gui', 'res/xinput-gui.ui'),
-            ['grid_log', 'buffer_log'])
-        return builder
+        ref = files('xinput_gui') / 'res/xinput-gui.ui'
+        with as_file(ref) as path:
+
+            builder = Gtk.Builder()
+            builder.add_objects_from_file(
+                str(path),
+                ['grid_log', 'buffer_log'])
+            return builder
 
     def clear_log(self) -> None:
         '''Clear the log.'''

xinput_gui/gui/prop_list.py → src/xinput_gui/gui/prop_list.py

@@ -23,7 +23,7 @@
 import gi
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
-from pkg_resources import resource_filename
+from importlib.resources import as_file, files
 
 from ..settings import Settings
 from ..xinput.devices import Device
@@ -60,12 +60,14 @@ def __init__(self, controller: 'ViewController', main_window: 'MainWindow', sett
 
     def get_builder(self) -> Gtk.Builder:
         '''Get prop list Gtk Builder.'''
-
-        builder = Gtk.Builder()
-        builder.add_objects_from_file(
-            resource_filename('xinput_gui', 'res/xinput-gui.ui'),
-            ['grid_prop_list', 'store_props'])
-        return builder
+        ref = files('xinput_gui') / 'res/xinput-gui.ui'
+        with as_file(ref) as path:
+
+            builder = Gtk.Builder()
+            builder.add_objects_from_file(
+                str(path),
+                ['grid_prop_list', 'store_props'])
+            return builder
 
     def apply_settings(self) -> None:
         '''Apply current settings.'''