From 64ffe22545ab9c6e2ae0a37b214880de38ba8a2b Mon Sep 17 00:00:00 2001 From: Eric Callahan Date: Sun, 12 May 2024 18:01:35 -0400 Subject: [PATCH] build: dependency updates Remove lmdb python and system dependencies. Bump streaming-form-data to 1.15.0 and remove smart_open as the issue import issue has been resolved. Signed-off-by: Eric Callahan --- pyproject.toml | 8 +++----- scripts/install-moonraker.sh | 2 +- scripts/moonraker-requirements.txt | 6 ++---- scripts/system-dependencies.json | 1 - 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2fe500c..9238379 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,9 +12,8 @@ dependencies = [ "pyserial-asyncio==0.6", "pillow==9.5.0 ; python_version=='3.7'", "pillow==10.3.0 ; python_version>='3.8'", - "lmdb==1.4.1", "streaming-form-data==1.11.0 ; python_version=='3.7'", - "streaming-form-data==1.13.0 ; python_version>='3.8'", + "streaming-form-data==1.15.0 ; python_version>='3.8'", "distro==1.9.0", "inotify-simple==1.3.5", "libnacl==2.1.0", @@ -23,10 +22,9 @@ dependencies = [ "preprocess-cancellation==0.2.1", "jinja2==3.1.4", "dbus-next==0.2.3", - "apprise==1.7.0", + "apprise==1.8.0", "ldap3==2.9.1", - "python-periphery==2.4.1", - "smart_open<=6.4.0" + "python-periphery==2.4.1" ] requires-python = ">=3.7" readme = "README.md" diff --git a/scripts/install-moonraker.sh b/scripts/install-moonraker.sh index 55ecfb4..c34d990 100755 --- a/scripts/install-moonraker.sh +++ b/scripts/install-moonraker.sh @@ -55,7 +55,7 @@ install_packages() else echo "Error: system-dependencies.json not found, falling back to legacy pacakge list" - PKGLIST="${PKGLIST} python3-virtualenv python3-dev liblmdb-dev" + PKGLIST="${PKGLIST} python3-virtualenv python3-dev" PKGLIST="${PKGLIST} libopenjp2-7 libsodium-dev zlib1g-dev libjpeg-dev" PKGLIST="${PKGLIST} packagekit wireless-tools curl" PKGS=${PKGLIST} diff --git a/scripts/moonraker-requirements.txt b/scripts/moonraker-requirements.txt index 4872e94..2cd3809 100644 --- a/scripts/moonraker-requirements.txt +++ b/scripts/moonraker-requirements.txt @@ -6,9 +6,8 @@ pyserial==3.4 pyserial-asyncio==0.6 pillow==9.5.0 ; python_version=='3.7' pillow==10.3.0 ; python_version>='3.8' -lmdb==1.4.1 streaming-form-data==1.11.0 ; python_version=='3.7' -streaming-form-data==1.13.0 ; python_version>='3.8' +streaming-form-data==1.15.0 ; python_version>='3.8' distro==1.9.0 inotify-simple==1.3.5 libnacl==2.1.0 @@ -17,7 +16,6 @@ zeroconf==0.131.0 preprocess-cancellation==0.2.1 jinja2==3.1.4 dbus-next==0.2.3 -apprise==1.7.1 +apprise==1.8.0 ldap3==2.9.1 python-periphery==2.4.1 -smart_open<=6.4.0 diff --git a/scripts/system-dependencies.json b/scripts/system-dependencies.json index 58e148c..4426e53 100644 --- a/scripts/system-dependencies.json +++ b/scripts/system-dependencies.json @@ -2,7 +2,6 @@ "debian": [ "python3-virtualenv", "python3-dev", - "liblmdb-dev", "libopenjp2-7", "libsodium-dev", "zlib1g-dev",