Skip to content

Commit f781cb7

Browse files
committedDec 5, 2024·
more dependency mangling
This commit was sponsored by Brian Grohe, rockstar, tdsmith, and my other patrons. If you want to join them, you can support my work at https://glyph.im/patrons/.
1 parent f92d408 commit f781cb7

6 files changed

+360
-109
lines changed
 

‎.github/workflows/test-ui.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Install dependencies
2727
run: |
2828
python -m pip install --upgrade pip
29-
pip install -Ur requirements.txt
29+
pip install -Ur macOS-gui.requirements.txt
3030
- name: Check
3131
run: |
3232
mypy src

‎Linux-gui.requirements.txt

+127
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.12
3+
# by the following command:
4+
#
5+
# pip-compile --allow-unsafe --extra=gui --no-emit-index-url --output-file=Linux-gui.requirements.txt --strip-extras
6+
#
7+
attrs==24.2.0
8+
# via
9+
# service-identity
10+
# twisted
11+
automat==24.8.1
12+
# via twisted
13+
build==1.2.2.post1
14+
# via pip-tools
15+
cffi==1.17.1
16+
# via cryptography
17+
click==8.1.7
18+
# via pip-tools
19+
constantly==23.10.4
20+
# via twisted
21+
cryptography==44.0.0
22+
# via
23+
# pyopenssl
24+
# service-identity
25+
datetype==2024.2.28
26+
# via
27+
# Pomodouroboros (pyproject.toml)
28+
# fritter
29+
ewmh==0.1.6 ; sys_platform == "linux"
30+
# via Pomodouroboros (pyproject.toml)
31+
fritter==0.0.9
32+
# via Pomodouroboros (pyproject.toml)
33+
h2==4.1.0
34+
# via twisted
35+
hpack==4.0.0
36+
# via h2
37+
hyperframe==6.0.1
38+
# via h2
39+
hyperlink==21.0.0
40+
# via twisted
41+
idna==3.10
42+
# via
43+
# hyperlink
44+
# twisted
45+
incremental==24.7.2
46+
# via twisted
47+
mypy==1.13.0
48+
# via
49+
# Pomodouroboros (pyproject.toml)
50+
# mypy-zope
51+
mypy-extensions==1.0.0
52+
# via mypy
53+
mypy-zope==1.0.9
54+
# via Pomodouroboros (pyproject.toml)
55+
packaging==24.2
56+
# via build
57+
pip-tools==7.4.1
58+
# via Pomodouroboros (pyproject.toml)
59+
priority==1.3.0
60+
# via twisted
61+
pyasn1==0.6.1
62+
# via
63+
# pyasn1-modules
64+
# service-identity
65+
pyasn1-modules==0.4.1
66+
# via service-identity
67+
pycairo==1.27.0 ; sys_platform == "linux"
68+
# via
69+
# Pomodouroboros (pyproject.toml)
70+
# pygobject
71+
pycparser==2.22
72+
# via cffi
73+
pygobject==3.50.0 ; sys_platform == "linux"
74+
# via Pomodouroboros (pyproject.toml)
75+
pyopenssl==24.3.0
76+
# via twisted
77+
pyproject-hooks==1.2.0
78+
# via
79+
# build
80+
# pip-tools
81+
python-dateutil==2.9.0.post0
82+
# via Pomodouroboros (pyproject.toml)
83+
python-xlib==0.33 ; sys_platform == "linux"
84+
# via
85+
# Pomodouroboros (pyproject.toml)
86+
# ewmh
87+
service-identity==24.2.0
88+
# via twisted
89+
six==1.17.0
90+
# via
91+
# python-dateutil
92+
# python-xlib
93+
twisted==24.11.0
94+
# via Pomodouroboros (pyproject.toml)
95+
types-python-dateutil==2.9.0.20241003
96+
# via Pomodouroboros (pyproject.toml)
97+
typing-extensions==4.12.2
98+
# via
99+
# mypy
100+
# twisted
101+
tzdata==2024.2
102+
# via fritter
103+
ulid-py==1.1.0
104+
# via Pomodouroboros (pyproject.toml)
105+
wheel==0.45.1
106+
# via pip-tools
107+
zope-event==5.0
108+
# via zope-schema
109+
zope-interface==7.2
110+
# via
111+
# mypy-zope
112+
# twisted
113+
# zope-schema
114+
zope-schema==7.0.1
115+
# via mypy-zope
116+
117+
# The following packages are considered to be unsafe in a requirements file:
118+
pip==24.3.1
119+
# via pip-tools
120+
setuptools==70.3.0
121+
# via
122+
# Pomodouroboros (pyproject.toml)
123+
# incremental
124+
# pip-tools
125+
# zope-event
126+
# zope-interface
127+
# zope-schema

‎macOS-gui.requirements.txt

+211
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,211 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.12
3+
# by the following command:
4+
#
5+
# pip-compile --allow-unsafe --extra=gui --no-emit-index-url --output-file=macOS-gui.requirements.txt --strip-extras
6+
#
7+
altgraph==0.17.4
8+
# via
9+
# macholib
10+
# modulegraph
11+
# py2app
12+
anyio==4.6.2.post1
13+
# via httpx
14+
appdirs==1.4.4
15+
# via twisted
16+
attrs==24.2.0
17+
# via
18+
# hypothesis
19+
# service-identity
20+
# twisted
21+
automat==24.8.1
22+
# via twisted
23+
bcrypt==4.2.1
24+
# via twisted
25+
build==1.2.2.post1
26+
# via pip-tools
27+
certifi==2024.8.30
28+
# via
29+
# httpcore
30+
# httpx
31+
cffi==1.17.1
32+
# via cryptography
33+
click==8.1.7
34+
# via
35+
# encrust
36+
# pip-tools
37+
constantly==23.10.4
38+
# via twisted
39+
cryptography==44.0.0
40+
# via
41+
# pyopenssl
42+
# service-identity
43+
# twisted
44+
cython-test-exception-raiser==1.0.2
45+
# via twisted
46+
datetype==2024.2.28
47+
# via
48+
# Pomodouroboros (pyproject.toml)
49+
# fritter
50+
delocate==0.12.0
51+
# via encrust
52+
encrust==2024.9.3 ; sys_platform == "darwin"
53+
# via Pomodouroboros (pyproject.toml)
54+
fritter==0.0.9
55+
# via Pomodouroboros (pyproject.toml)
56+
h11==0.14.0
57+
# via httpcore
58+
h2==4.1.0
59+
# via
60+
# httpx
61+
# twisted
62+
hpack==4.0.0
63+
# via h2
64+
httpcore==1.0.7
65+
# via httpx
66+
httpx==0.28.0
67+
# via twisted
68+
hyperframe==6.0.1
69+
# via h2
70+
hyperlink==21.0.0
71+
# via twisted
72+
hypothesis==6.122.1
73+
# via twisted
74+
idna==3.10
75+
# via
76+
# anyio
77+
# httpx
78+
# hyperlink
79+
# twisted
80+
incremental==24.7.2
81+
# via twisted
82+
macholib==1.16.3
83+
# via
84+
# delocate
85+
# py2app
86+
modulegraph==0.19.6
87+
# via py2app
88+
mypy==1.13.0
89+
# via
90+
# Pomodouroboros (pyproject.toml)
91+
# mypy-zope
92+
mypy-extensions==1.0.0
93+
# via mypy
94+
mypy-zope==1.0.9
95+
# via Pomodouroboros (pyproject.toml)
96+
packaging==24.2
97+
# via
98+
# build
99+
# delocate
100+
# py2app
101+
pip-tools==7.4.1
102+
# via Pomodouroboros (pyproject.toml)
103+
priority==1.3.0
104+
# via twisted
105+
py2app==0.28.8 ; sys_platform == "darwin"
106+
# via
107+
# Pomodouroboros (pyproject.toml)
108+
# encrust
109+
pyasn1==0.6.1
110+
# via
111+
# pyasn1-modules
112+
# service-identity
113+
pyasn1-modules==0.4.1
114+
# via service-identity
115+
pycparser==2.22
116+
# via cffi
117+
pyhamcrest==2.1.0
118+
# via twisted
119+
pyobjc-core==10.3.2 ; sys_platform == "darwin"
120+
# via
121+
# Pomodouroboros (pyproject.toml)
122+
# pyobjc-framework-cfnetwork
123+
# pyobjc-framework-cocoa
124+
# pyobjc-framework-exceptionhandling
125+
# pyobjc-framework-usernotifications
126+
# quickmachotkey
127+
# twisted
128+
pyobjc-framework-cfnetwork==10.3.2 ; sys_platform == "darwin"
129+
# via
130+
# Pomodouroboros (pyproject.toml)
131+
# twisted
132+
pyobjc-framework-cocoa==10.3.2 ; sys_platform == "darwin"
133+
# via
134+
# Pomodouroboros (pyproject.toml)
135+
# pyobjc-framework-cfnetwork
136+
# pyobjc-framework-exceptionhandling
137+
# pyobjc-framework-usernotifications
138+
# quickmacapp
139+
# twisted
140+
pyobjc-framework-exceptionhandling==10.3.2 ; sys_platform == "darwin"
141+
# via
142+
# Pomodouroboros (pyproject.toml)
143+
# quickmacapp
144+
pyobjc-framework-usernotifications==10.3.2 ; sys_platform == "darwin"
145+
# via
146+
# Pomodouroboros (pyproject.toml)
147+
# quickmacapp
148+
pyopenssl==24.3.0
149+
# via twisted
150+
pyproject-hooks==1.2.0
151+
# via
152+
# build
153+
# pip-tools
154+
pyserial==3.5
155+
# via twisted
156+
python-dateutil==2.9.0.post0
157+
# via Pomodouroboros (pyproject.toml)
158+
quickmacapp==2023.4.24 ; sys_platform == "darwin"
159+
# via Pomodouroboros (pyproject.toml)
160+
quickmachotkey==2023.11.17 ; sys_platform == "darwin"
161+
# via Pomodouroboros (pyproject.toml)
162+
service-identity==24.2.0
163+
# via twisted
164+
six==1.17.0
165+
# via python-dateutil
166+
sniffio==1.3.1
167+
# via anyio
168+
sortedcontainers==2.4.0
169+
# via hypothesis
170+
twisted==24.11.0
171+
# via
172+
# Pomodouroboros (pyproject.toml)
173+
# encrust
174+
# quickmacapp
175+
types-python-dateutil==2.9.0.20241003
176+
# via Pomodouroboros (pyproject.toml)
177+
typing-extensions==4.12.2
178+
# via
179+
# delocate
180+
# mypy
181+
# twisted
182+
tzdata==2024.2
183+
# via fritter
184+
ulid-py==1.1.0
185+
# via Pomodouroboros (pyproject.toml)
186+
wheel==0.45.1
187+
# via pip-tools
188+
wheel-filename==1.4.2
189+
# via encrust
190+
zope-event==5.0
191+
# via zope-schema
192+
zope-interface==7.2
193+
# via
194+
# mypy-zope
195+
# twisted
196+
# zope-schema
197+
zope-schema==7.0.1
198+
# via mypy-zope
199+
200+
# The following packages are considered to be unsafe in a requirements file:
201+
pip==24.3.1
202+
# via pip-tools
203+
setuptools==70.3.0
204+
# via
205+
# Pomodouroboros (pyproject.toml)
206+
# incremental
207+
# modulegraph
208+
# pip-tools
209+
# zope-event
210+
# zope-interface
211+
# zope-schema

‎pindeps

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
#!/bin/sh
22

33
pip-compile --strip-extras --quiet --upgrade --allow-unsafe --no-emit-index-url
4+
pip-compile --strip-extras --quiet --upgrade --allow-unsafe --no-emit-index-url --extra gui -o "$(
5+
python3 -c '
6+
import platform
7+
print(platform.platform().split("-")[0])
8+
'
9+
)-gui.requirements.txt"

‎pyproject.toml

+9-4
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,15 @@ dependencies = [
2626
"mypy-zope",
2727
"types-python-dateutil",
2828

29+
]
30+
classifiers = [
31+
"Programming Language :: Python :: 3",
32+
]
33+
version = "0.4.8"
34+
35+
[project.optional-dependencies]
36+
37+
gui = [
2938
"py2app ; sys_platform == 'darwin'",
3039
"pyobjc-core ; sys_platform == 'darwin'",
3140
"pyobjc-framework-Cocoa ; sys_platform == 'darwin'",
@@ -41,10 +50,6 @@ dependencies = [
4150
"PyGObject ; sys_platform == 'linux'",
4251
"python-xlib ; sys_platform == 'linux'",
4352
]
44-
classifiers = [
45-
"Programming Language :: Python :: 3",
46-
]
47-
version = "0.4.8"
4853

4954
[project.urls]
5055
Source = "https://github.com/glyph/Pomodouroboros"

‎requirements.txt

+6-104
Original file line numberDiff line numberDiff line change
@@ -4,87 +4,44 @@
44
#
55
# pip-compile --allow-unsafe --no-emit-index-url --strip-extras
66
#
7-
altgraph==0.17.4
8-
# via
9-
# macholib
10-
# modulegraph
11-
# py2app
12-
anyio==4.6.2.post1
13-
# via httpx
14-
appdirs==1.4.4
15-
# via twisted
167
attrs==24.2.0
178
# via
18-
# hypothesis
199
# service-identity
2010
# twisted
2111
automat==24.8.1
2212
# via twisted
23-
bcrypt==4.2.1
24-
# via twisted
2513
build==1.2.2.post1
2614
# via pip-tools
27-
certifi==2024.8.30
28-
# via
29-
# httpcore
30-
# httpx
3115
cffi==1.17.1
3216
# via cryptography
3317
click==8.1.7
34-
# via
35-
# encrust
36-
# pip-tools
18+
# via pip-tools
3719
constantly==23.10.4
3820
# via twisted
3921
cryptography==44.0.0
4022
# via
4123
# pyopenssl
4224
# service-identity
43-
# twisted
44-
cython-test-exception-raiser==1.0.2
45-
# via twisted
4625
datetype==2024.2.28
4726
# via
4827
# Pomodouroboros (pyproject.toml)
4928
# fritter
50-
delocate==0.12.0
51-
# via encrust
52-
encrust==2024.9.3 ; sys_platform == "darwin"
53-
# via Pomodouroboros (pyproject.toml)
5429
fritter==0.0.9
5530
# via Pomodouroboros (pyproject.toml)
56-
h11==0.14.0
57-
# via httpcore
5831
h2==4.1.0
59-
# via
60-
# httpx
61-
# twisted
32+
# via twisted
6233
hpack==4.0.0
6334
# via h2
64-
httpcore==1.0.7
65-
# via httpx
66-
httpx==0.28.0
67-
# via twisted
6835
hyperframe==6.0.1
6936
# via h2
7037
hyperlink==21.0.0
7138
# via twisted
72-
hypothesis==6.122.0
73-
# via twisted
7439
idna==3.10
7540
# via
76-
# anyio
77-
# httpx
7841
# hyperlink
7942
# twisted
8043
incremental==24.7.2
8144
# via twisted
82-
macholib==1.16.3
83-
# via
84-
# delocate
85-
# py2app
86-
modulegraph==0.19.6
87-
# via py2app
8845
mypy==1.13.0
8946
# via
9047
# Pomodouroboros (pyproject.toml)
@@ -94,18 +51,11 @@ mypy-extensions==1.0.0
9451
mypy-zope==1.0.9
9552
# via Pomodouroboros (pyproject.toml)
9653
packaging==24.2
97-
# via
98-
# build
99-
# delocate
100-
# py2app
54+
# via build
10155
pip-tools==7.4.1
10256
# via Pomodouroboros (pyproject.toml)
10357
priority==1.3.0
10458
# via twisted
105-
py2app==0.28.8 ; sys_platform == "darwin"
106-
# via
107-
# Pomodouroboros (pyproject.toml)
108-
# encrust
10959
pyasn1==0.6.1
11060
# via
11161
# pyasn1-modules
@@ -114,69 +64,24 @@ pyasn1-modules==0.4.1
11464
# via service-identity
11565
pycparser==2.22
11666
# via cffi
117-
pyhamcrest==2.1.0
118-
# via twisted
119-
pyobjc-core==10.3.2 ; sys_platform == "darwin"
120-
# via
121-
# Pomodouroboros (pyproject.toml)
122-
# pyobjc-framework-cfnetwork
123-
# pyobjc-framework-cocoa
124-
# pyobjc-framework-exceptionhandling
125-
# pyobjc-framework-usernotifications
126-
# quickmachotkey
127-
# twisted
128-
pyobjc-framework-cfnetwork==10.3.2 ; sys_platform == "darwin"
129-
# via
130-
# Pomodouroboros (pyproject.toml)
131-
# twisted
132-
pyobjc-framework-cocoa==10.3.2 ; sys_platform == "darwin"
133-
# via
134-
# Pomodouroboros (pyproject.toml)
135-
# pyobjc-framework-cfnetwork
136-
# pyobjc-framework-exceptionhandling
137-
# pyobjc-framework-usernotifications
138-
# quickmacapp
139-
# twisted
140-
pyobjc-framework-exceptionhandling==10.3.2 ; sys_platform == "darwin"
141-
# via
142-
# Pomodouroboros (pyproject.toml)
143-
# quickmacapp
144-
pyobjc-framework-usernotifications==10.3.2 ; sys_platform == "darwin"
145-
# via
146-
# Pomodouroboros (pyproject.toml)
147-
# quickmacapp
14867
pyopenssl==24.3.0
14968
# via twisted
15069
pyproject-hooks==1.2.0
15170
# via
15271
# build
15372
# pip-tools
154-
pyserial==3.5
155-
# via twisted
15673
python-dateutil==2.9.0.post0
15774
# via Pomodouroboros (pyproject.toml)
158-
quickmacapp==2023.4.24 ; sys_platform == "darwin"
159-
# via Pomodouroboros (pyproject.toml)
160-
quickmachotkey==2023.11.17 ; sys_platform == "darwin"
161-
# via Pomodouroboros (pyproject.toml)
16275
service-identity==24.2.0
16376
# via twisted
164-
six==1.16.0
77+
six==1.17.0
16578
# via python-dateutil
166-
sniffio==1.3.1
167-
# via anyio
168-
sortedcontainers==2.4.0
169-
# via hypothesis
170-
twisted==24.10.0
171-
# via
172-
# Pomodouroboros (pyproject.toml)
173-
# encrust
174-
# quickmacapp
79+
twisted==24.11.0
80+
# via Pomodouroboros (pyproject.toml)
17581
types-python-dateutil==2.9.0.20241003
17682
# via Pomodouroboros (pyproject.toml)
17783
typing-extensions==4.12.2
17884
# via
179-
# delocate
18085
# mypy
18186
# twisted
18287
tzdata==2024.2
@@ -185,8 +90,6 @@ ulid-py==1.1.0
18590
# via Pomodouroboros (pyproject.toml)
18691
wheel==0.45.1
18792
# via pip-tools
188-
wheel-filename==1.4.1
189-
# via encrust
19093
zope-event==5.0
19194
# via zope-schema
19295
zope-interface==7.2
@@ -204,7 +107,6 @@ setuptools==70.3.0
204107
# via
205108
# Pomodouroboros (pyproject.toml)
206109
# incremental
207-
# modulegraph
208110
# pip-tools
209111
# zope-event
210112
# zope-interface

0 commit comments

Comments
 (0)
Please sign in to comment.