From ca1354c9417bda5f6b3c022f04063d9a9a1a3ba1 Mon Sep 17 00:00:00 2001 From: Bernhard Reiter Date: Mon, 8 Dec 2025 16:13:18 +0100 Subject: [PATCH] upgrade python dependency appdirs to platformdirs Replace deprecated module appdirs with suggested replacement platformdirs. See https://gitlab.com/inkscape/extras/extension-manager/-/merge_requests/10 https://gitlab.com/inkscape/extras/extension-manager/-/issues/43#note_2930566499 --- CMakeScripts/InstallMSYS2.cmake | 2 +- buildtools/msys2installdeps.sh | 2 +- packaging/appimage/generate.sh | 2 +- packaging/debian/control | 2 +- snap/snapcraft.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake index 7694e4ed25..1a0438a991 100644 --- a/CMakeScripts/InstallMSYS2.cmake +++ b/CMakeScripts/InstallMSYS2.cmake @@ -371,7 +371,7 @@ if(WIN32) # Python packages for the extensions manager, and clipart importer extensions set(packages - "python-appdirs" "python-msgpack" "python-cachecontrol" + "python-platformdirs" "python-msgpack" "python-cachecontrol" "python-idna" "python-urllib3" "python-chardet" "python-certifi" "python-requests" "python-beautifulsoup4" "python-filelock") foreach(package ${packages}) list_files_pacman(${package} paths) diff --git a/buildtools/msys2installdeps.sh b/buildtools/msys2installdeps.sh index 14a504f19d..666fc1a6ad 100644 --- a/buildtools/msys2installdeps.sh +++ b/buildtools/msys2installdeps.sh @@ -108,7 +108,7 @@ $ARCH-scour # install modules needed by extensions manager and clipart importer eval pacman -S $PACMAN_OPTIONS \ -$ARCH-python-appdirs \ +$ARCH-python-platformdirs \ $ARCH-python-beautifulsoup4 \ $ARCH-python-cachecontrol \ $ARCH-python-certifi \ diff --git a/packaging/appimage/generate.sh b/packaging/appimage/generate.sh index 5d3fe7fb0d..cf4bb34180 100755 --- a/packaging/appimage/generate.sh +++ b/packaging/appimage/generate.sh @@ -59,7 +59,7 @@ apt_bundle \ python3-webencodings \ python3-tinycss2 \ python3-packaging \ - python3-appdirs \ + python3-platformdirs \ python3-bs4 \ python3-gi \ python3-gi-cairo \ diff --git a/packaging/debian/control b/packaging/debian/control index 33d866bd30..85be8e01fc 100644 --- a/packaging/debian/control +++ b/packaging/debian/control @@ -103,7 +103,7 @@ Description: vector-based drawing program - extensions Package: inkscape-extension-manager Architecture: any Depends: ${misc:Depends}, ${python3:Depends}, inkscape-extensions, - python3-appdirs, + python3-platformdirs python3-cachecontrol, python3-certifi, python3-charset-normalizer, diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 90c09a4a69..f029c70361 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -266,7 +266,7 @@ parts: python-packages: # the following dependencies are taken manually from share/extensions/other/inkman/pyproject.toml: - requests - - appdirs + - platformdirs - filelock - cachecontrol[filecache] # the following dependencies are taken manually from share/extensions/other/clipart/pyproject.toml: -- GitLab