Skip to content

Commit

Permalink
Merge pull request #56 from glyph/py2app-setuptools-conflict-fix
Browse files Browse the repository at this point in the history
Py2app setuptools conflict fix
  • Loading branch information
glyph authored May 25, 2024
2 parents f69a659 + 2171bb6 commit fb794ce
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
[build-system]
requires = [
"setuptools>=42",
# https://github.com/ronaldoussoren/py2app/issues/525
"py2app@git+https://github.com/ronaldoussoren/py2app@e9c7a88f34d79c41a3a344ccc14cd97c24904b9f#egg=py2app",
"py2app",
"wheel",
"quickmacapp",
]
Expand Down
2 changes: 1 addition & 1 deletion requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pip-tools
pyobjc-framework-Cocoa
pyobjc-framework-ExceptionHandling
pyobjc-framework-UserNotifications
twisted[tls,macos_platform]
twisted[tls,macos-platform]
mypy<1.6.0
mypy-zope
python-dateutil
Expand Down
11 changes: 6 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ hyperframe==6.0.1
# via h2
hyperlink==21.0.0
# via twisted
hypothesis==6.100.5
hypothesis==6.102.6
# via twisted
idna==3.7
# via
Expand All @@ -82,11 +82,12 @@ packaging==24.0
# via
# build
# delocate
# py2app
pip-tools==7.4.1
# via -r requirements.in
priority==1.3.0
# via twisted
py2app==0.28.7
py2app==0.28.8
# via
# -r requirements.in
# encrust
Expand Down Expand Up @@ -148,14 +149,14 @@ six==1.16.0
# python-dateutil
sortedcontainers==2.4.0
# via hypothesis
twisted[all-non-platform,conch,http2,macos_platform,serial,test,tls]==24.3.0
twisted[all-non-platform,conch,http2,macos-platform,serial,test,tls]==24.3.0
# via
# -r requirements.in
# encrust
# quickmacapp
types-python-dateutil==2.9.0.20240316
# via -r requirements.in
typing-extensions==4.11.0
typing-extensions==4.12.0
# via
# delocate
# mypy
Expand All @@ -170,7 +171,7 @@ wheel-filename==1.4.1
# via encrust
zope-event==5.0
# via zope-schema
zope-interface==6.3
zope-interface==6.4.post2
# via
# mypy-zope
# twisted
Expand Down

0 comments on commit fb794ce

Please sign in to comment.