Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Arksine/moonraker
Browse files Browse the repository at this point in the history
  • Loading branch information
actions-user committed Feb 4, 2025
2 parents 94957f4 + f3b0afd commit 9d87c63
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 12 deletions.
10 changes: 4 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,21 @@ authors = [
{name = "Eric Callahan", email = "[email protected]"},
]
dependencies = [
"tornado==6.2.0 ; python_version=='3.7'",
"tornado==6.4.1 ; python_version>='3.8'",
"tornado>=6.2.0, <=6.4.2",
"pyserial==3.4",
"pillow==9.5.0 ; python_version=='3.7'",
"pillow==10.3.0 ; python_version>='3.8'",
"streaming-form-data==1.11.0 ; python_version=='3.7'",
"streaming-form-data==1.15.0 ; python_version>='3.8'",
"streaming-form-data>=1.11.0, <=1.19.1",
"distro==1.9.0",
"inotify-simple==1.3.5",
"libnacl==2.1.0",
"paho-mqtt==1.6.1",
"zeroconf==0.131.0",
"preprocess-cancellation==0.2.1",
"jinja2==3.1.4",
"jinja2==3.1.5",
"dbus-fast==2.28.0 ; python_version>='3.9'",
"dbus-fast<=2.28.0 ; python_version<'3.9'",
"apprise==1.8.0",
"apprise==1.9.2",
"ldap3==2.9.1",
"python-periphery==2.4.1",
"importlib_metadata==6.7.0 ; python_version=='3.7'",
Expand Down
10 changes: 4 additions & 6 deletions scripts/moonraker-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
# Python dependencies for Moonraker
--find-links=python_wheels
tornado==6.2.0 ; python_version=='3.7'
tornado==6.4.1 ; python_version>='3.8'
tornado>=6.2.0, <=6.4.2
pyserial==3.4
pillow==9.5.0 ; python_version=='3.7'
pillow==10.3.0 ; python_version>='3.8'
streaming-form-data==1.11.0 ; python_version=='3.7'
streaming-form-data==1.15.0 ; python_version>='3.8'
streaming-form-data>=1.11.0, <=1.19.1
distro==1.9.0
inotify-simple==1.3.5
libnacl==2.1.0
paho-mqtt==1.6.1
zeroconf==0.131.0
preprocess-cancellation==0.2.1
jinja2==3.1.4
jinja2==3.1.5
dbus-fast==2.28.0 ; python_version>='3.9'
dbus-fast<=2.28.0 ; python_version<'3.9'
apprise==1.8.0
apprise==1.9.2
ldap3==2.9.1
python-periphery==2.4.1
importlib_metadata==6.7.0 ; python_version=='3.7'
Expand Down

0 comments on commit 9d87c63

Please sign in to comment.