reoragnize dependencies, imports

This commit was sponsored by Quentin Pradet, Greg Back, Blaise Pabon,
and my other patrons.  If you want to join them, you can support my
work at https://glyph.im/patrons/.

Author: glyph

.github/workflows/test-ui.yml

@@ -27,6 +27,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -Ur macOS-gui.requirements.txt
+          pip install -Ur dev-requirements.txt
       - name: Check
         run: |
           mypy src

dev-requirements.txt

@@ -0,0 +1,145 @@
+#
+# This file is autogenerated by pip-compile with Python 3.12
+# by the following command:
+#
+#    pip-compile --allow-unsafe --extra=dev --no-emit-index-url --output-file=dev-requirements.txt --strip-extras
+#
+altgraph==0.17.4
+    # via
+    #   macholib
+    #   modulegraph
+    #   py2app
+attrs==24.2.0
+    # via
+    #   service-identity
+    #   twisted
+automat==24.8.1
+    # via twisted
+build==1.2.2.post1
+    # via pip-tools
+cffi==1.17.1
+    # via cryptography
+click==8.1.7
+    # via
+    #   encrust
+    #   pip-tools
+constantly==23.10.4
+    # via twisted
+cryptography==44.0.0
+    # via
+    #   pyopenssl
+    #   service-identity
+datetype==2024.2.28
+    # via
+    #   Pomodouroboros (pyproject.toml)
+    #   fritter
+delocate==0.12.0
+    # via encrust
+encrust==2024.12.0 ; sys_platform == "darwin"
+    # via Pomodouroboros (pyproject.toml)
+fritter==0.0.9
+    # via Pomodouroboros (pyproject.toml)
+h2==4.1.0
+    # via twisted
+hpack==4.0.0
+    # via h2
+hyperframe==6.0.1
+    # via h2
+hyperlink==21.0.0
+    # via twisted
+idna==3.10
+    # via
+    #   hyperlink
+    #   twisted
+incremental==24.7.2
+    # via twisted
+macholib==1.16.3
+    # via
+    #   delocate
+    #   py2app
+modulegraph==0.19.6
+    # via py2app
+mypy==1.13.0
+    # via
+    #   Pomodouroboros (pyproject.toml)
+    #   mypy-zope
+mypy-extensions==1.0.0
+    # via mypy
+mypy-zope==1.0.9
+    # via Pomodouroboros (pyproject.toml)
+packaging==24.2
+    # via
+    #   build
+    #   delocate
+    #   py2app
+pip-tools==7.4.1
+    # via Pomodouroboros (pyproject.toml)
+priority==1.3.0
+    # via twisted
+py2app==0.28.8
+    # via encrust
+pyasn1==0.6.1
+    # via
+    #   pyasn1-modules
+    #   service-identity
+pyasn1-modules==0.4.1
+    # via service-identity
+pycparser==2.22
+    # via cffi
+pygobject-stubs==2.12.0
+    # via Pomodouroboros (pyproject.toml)
+pyopenssl==24.3.0
+    # via twisted
+pyproject-hooks==1.2.0
+    # via
+    #   build
+    #   pip-tools
+python-dateutil==2.9.0.post0
+    # via Pomodouroboros (pyproject.toml)
+service-identity==24.2.0
+    # via twisted
+six==1.17.0
+    # via python-dateutil
+twisted==24.11.0
+    # via
+    #   Pomodouroboros (pyproject.toml)
+    #   encrust
+types-python-dateutil==2.9.0.20241206
+    # via Pomodouroboros (pyproject.toml)
+types-python-xlib==0.33.0.20240407
+    # via Pomodouroboros (pyproject.toml)
+typing-extensions==4.12.2
+    # via
+    #   delocate
+    #   mypy
+    #   twisted
+tzdata==2024.2
+    # via fritter
+ulid-py==1.1.0
+    # via Pomodouroboros (pyproject.toml)
+wheel==0.45.1
+    # via pip-tools
+wheel-filename==1.4.2
+    # via encrust
+zope-event==5.0
+    # via zope-schema
+zope-interface==7.2
+    # via
+    #   mypy-zope
+    #   twisted
+    #   zope-schema
+zope-schema==7.0.1
+    # via mypy-zope
+
+# The following packages are considered to be unsafe in a requirements file:
+pip==24.3.1
+    # via pip-tools
+setuptools==70.3.0
+    # via
+    #   Pomodouroboros (pyproject.toml)
+    #   incremental
+    #   modulegraph
+    #   pip-tools
+    #   zope-event
+    #   zope-interface
+    #   zope-schema

macOS-gui.requirements.txt

@@ -9,7 +9,7 @@ altgraph==0.17.4
     #   macholib
     #   modulegraph
     #   py2app
-anyio==4.6.2.post1
+anyio==4.7.0
     # via httpx
 appdirs==1.4.4
     # via twisted
@@ -22,18 +22,12 @@ automat==24.8.1
     # via twisted
 bcrypt==4.2.1
     # via twisted
-build==1.2.2.post1
-    # via pip-tools
 certifi==2024.8.30
     # via
     #   httpcore
     #   httpx
 cffi==1.17.1
     # via cryptography
-click==8.1.7
-    # via
-    #   encrust
-    #   pip-tools
 constantly==23.10.4
     # via twisted
 cryptography==44.0.0
@@ -47,10 +41,6 @@ datetype==2024.2.28
     # via
     #   Pomodouroboros (pyproject.toml)
     #   fritter
-delocate==0.12.0
-    # via encrust
-encrust==2024.9.3 ; sys_platform == "darwin"
-    # via Pomodouroboros (pyproject.toml)
 fritter==0.0.9
     # via Pomodouroboros (pyproject.toml)
 h11==0.14.0
@@ -63,13 +53,13 @@ hpack==4.0.0
     # via h2
 httpcore==1.0.7
     # via httpx
-httpx==0.28.0
+httpx==0.28.1
     # via twisted
 hyperframe==6.0.1
     # via h2
 hyperlink==21.0.0
     # via twisted
-hypothesis==6.122.1
+hypothesis==6.122.3
     # via twisted
 idna==3.10
     # via
@@ -80,32 +70,15 @@ idna==3.10
 incremental==24.7.2
     # via twisted
 macholib==1.16.3
-    # via
-    #   delocate
-    #   py2app
+    # via py2app
 modulegraph==0.19.6
     # via py2app
-mypy==1.13.0
-    # via
-    #   Pomodouroboros (pyproject.toml)
-    #   mypy-zope
-mypy-extensions==1.0.0
-    # via mypy
-mypy-zope==1.0.9
-    # via Pomodouroboros (pyproject.toml)
 packaging==24.2
-    # via
-    #   build
-    #   delocate
-    #   py2app
-pip-tools==7.4.1
-    # via Pomodouroboros (pyproject.toml)
+    # via py2app
 priority==1.3.0
     # via twisted
 py2app==0.28.8 ; sys_platform == "darwin"
-    # via
-    #   Pomodouroboros (pyproject.toml)
-    #   encrust
+    # via Pomodouroboros (pyproject.toml)
 pyasn1==0.6.1
     # via
     #   pyasn1-modules
@@ -147,10 +120,6 @@ pyobjc-framework-usernotifications==10.3.2 ; sys_platform == "darwin"
     #   quickmacapp
 pyopenssl==24.3.0
     # via twisted
-pyproject-hooks==1.2.0
-    # via
-    #   build
-    #   pip-tools
 pyserial==3.5
     # via twisted
 python-dateutil==2.9.0.post0
@@ -170,42 +139,22 @@ sortedcontainers==2.4.0
 twisted==24.11.0
     # via
     #   Pomodouroboros (pyproject.toml)
-    #   encrust
     #   quickmacapp
-types-python-dateutil==2.9.0.20241003
-    # via Pomodouroboros (pyproject.toml)
 typing-extensions==4.12.2
     # via
-    #   delocate
-    #   mypy
+    #   anyio
     #   twisted
 tzdata==2024.2
     # via fritter
 ulid-py==1.1.0
     # via Pomodouroboros (pyproject.toml)
-wheel==0.45.1
-    # via pip-tools
-wheel-filename==1.4.2
-    # via encrust
-zope-event==5.0
-    # via zope-schema
 zope-interface==7.2
-    # via
-    #   mypy-zope
-    #   twisted
-    #   zope-schema
-zope-schema==7.0.1
-    # via mypy-zope
+    # via twisted
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==24.3.1
-    # via pip-tools
 setuptools==70.3.0
     # via
     #   Pomodouroboros (pyproject.toml)
     #   incremental
     #   modulegraph
-    #   pip-tools
-    #   zope-event
     #   zope-interface
-    #   zope-schema

pindeps

@@ -7,3 +7,4 @@ import platform
 print(platform.platform().split("-")[0])
 '
 )-gui.requirements.txt"
+pip-compile --strip-extras --quiet --upgrade --allow-unsafe --no-emit-index-url --extra dev -o dev-requirements.txt

pyproject.toml

@@ -20,12 +20,6 @@ dependencies = [
   "datetype",
   "fritter",
   "setuptools<71.0.0",
-
-  "pip-tools",
-  "mypy",
-  "mypy-zope",
-  "types-python-dateutil",
-
 ]
 classifiers = [
     "Programming Language :: Python :: 3",
@@ -43,7 +37,6 @@ gui = [
   "pyobjc-framework-CFNetwork ; sys_platform == 'darwin'",
   "quickmacapp ; sys_platform == 'darwin'",
   "quickmachotkey ; sys_platform == 'darwin'",
-  "encrust ; sys_platform == 'darwin'",
 
   "ewmh ; sys_platform == 'linux'",
   "pycairo ; sys_platform == 'linux'",
@@ -52,6 +45,16 @@ gui = [
   "pydbus ; sys_platform == 'linux'",
 ]
 
+dev = [
+  "pip-tools",
+  "mypy",
+  "mypy-zope",
+  "types-python-dateutil",
+  "pygobject-stubs",
+  "types-python-xlib",
+  "encrust ; sys_platform == 'darwin'",
+]
+
 [project.urls]
 Source = "https://github.com/glyph/Pomodouroboros"
 Bug-Tracker = "https://github.com/glyph/Pomodouroboros/issues"