Skip to content

Commit

Permalink
Use parse from packaging.version instead of distutils LooseVersion
Browse files Browse the repository at this point in the history
  • Loading branch information
misl6 committed May 26, 2024
1 parent d6b79ef commit b283b87
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions buildozer/targets/android.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
from time import sleep
import traceback

from distutils.version import LooseVersion
import packaging
import pexpect

import buildozer.buildops as buildops
Expand Down Expand Up @@ -1306,7 +1306,7 @@ def build_package(self):
pass

build_tools_versions = os.listdir(join(self.android_sdk_dir, "build-tools"))
build_tools_versions = sorted(build_tools_versions, key=LooseVersion)
build_tools_versions = sorted(build_tools_versions, key=packaging.version.parse)
build_tools_version = build_tools_versions[-1]
gradle_files = ["build.gradle", "gradle", "gradlew"]
is_gradle_build = build_tools_version >= "25.0" and any(
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ def find_version(*file_paths):
include_package_data=True,
install_requires=[
'pexpect',
'packaging',
# Cython is required by both kivy-ios and python-for-android.
# However, python-for-android does not include it in its dependencies
# and kivy-ios's dependencies are not always checked, so it is included
Expand Down

0 comments on commit b283b87

Please sign in to comment.