Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: change distutils to packaging #1212

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −2
Open

chore: change distutils to packaging #1212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions airtest/core/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from airtest.utils.resolution import cocos_min_strategy
import os
import cv2
from distutils.version import LooseVersion
from packaging.version import Version, parse


class Settings(object):
Expand All @@ -13,7 +13,7 @@ class Settings(object):
RESIZE_METHOD = staticmethod(cocos_min_strategy)
# keypoint matching: kaze/brisk/akaze/orb, contrib: sift/surf/brief
CVSTRATEGY = ["mstpl", "tpl", "sift", "brisk"]
if LooseVersion('3.4.2') < LooseVersion(cv2.__version__) < LooseVersion('4.4.0'):
if Version('3.4.2') < parse(cv2.__version__) < Version('4.4.0'):
CVSTRATEGY = ["mstpl", "tpl", "brisk"]
KEYPOINT_MATCHING_PREDICTION = True
THRESHOLD = 0.7 # [0, 1]
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ filelock
ffmpeg-python
tidevice
psutil
packaging