Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
rev: v4.3.21
hooks:
- id: isort
args: ["-rc", "."]
args: ["."]
- repo: https://github.com/pre-commit/mirrors-mypy
rev: 'v0.782'
rev: 'v0.800'
hooks:
- id: mypy
entry: mypy appium/ test/
entry: mypy appium/ test/functional
pass_filenames: false
- repo: https://github.com/psf/black
rev: 20.8b1
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ check-all: ## Run all lint checks and unittest

.PHONY: isort
isort: ## Run isort
python -m isort $(ARGS) -rc .
python -m isort $(ARGS) .

.PHONY: black
black: ## Run black
Expand All @@ -20,7 +20,7 @@ pylint: ## Run pylint

.PHONY: mypy
mypy: ## Run mypy
python -m mypy appium test
python -m mypy appium test/functional

.PHONY: unittest
unittest: ## Run unittest
Expand Down
14 changes: 7 additions & 7 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ url = "https://pypi.org/simple"
verify_ssl = true

[dev-packages]
pre-commit = "~=2.6"
pre-commit = "~=2.10"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could dependabot do that?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes.
I don't remember the reason to stop using it now, but previously we used it.

Can we use it again? > @KazuCocoa

https://github.com/appium/python-client/pulls?q=is%3Apr+is%3Aclosed+author%3Aapp%2Fdependabot-preview


[packages]
selenium = "~=3.141"

black = "==20.8b1"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(note) black = "~=20.8b1" doesn't work.


pytest = "~=6.0"
pytest-cov = "~=2.10"
pytest = "~=6.2"
pytest-cov = "~=2.11"

tox = "~=3.19"
tox = "~=3.21"
tox-travis = "~=0.12"

httpretty = "~=1.0"
python-dateutil = "~=2.8"
mock = "~=4.0"

pylint = "~=2.5"
pylint = "~=2.6"
astroid = "~=2.4"
isort = "~=4.3" # TODO Can be 5> when pylint uses isort 5>
isort = "~=5.0"

mypy = "==0.782"
mypy = "~=0.800"
2 changes: 1 addition & 1 deletion appium/webdriver/common/multi_action.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
from appium.webdriver.mobilecommand import MobileCommand as Command

if TYPE_CHECKING:
from appium.webdriver.common.touch_action import TouchAction
from appium.webdriver.webdriver import WebDriver
from appium.webdriver.webelement import WebElement
from appium.webdriver.common.touch_action import TouchAction

T = TypeVar('T', bound='MultiAction')

Expand Down
2 changes: 1 addition & 1 deletion appium/webdriver/common/touch_action.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
from appium.webdriver.mobilecommand import MobileCommand as Command

if TYPE_CHECKING:
from appium.webdriver.webelement import WebElement
from appium.webdriver.webdriver import WebDriver
from appium.webdriver.webelement import WebElement

T = TypeVar('T', bound='TouchAction')

Expand Down
2 changes: 1 addition & 1 deletion test/functional/android/helper/test_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
from . import desired_capabilities

if TYPE_CHECKING:
from appium.webdriver.webelement import WebElement
from appium.webdriver.webdriver import WebDriver
from appium.webdriver.webelement import WebElement

# the emulator is sometimes slow and needs time to think
SLEEPY_TIME = 10
Expand Down
3 changes: 2 additions & 1 deletion test/unit/helper/test_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@
SERVER_URL_BASE = 'http://localhost:4723/wd/hub'

if TYPE_CHECKING:
from appium.webdriver.webdriver import WebDriver
from httpretty.core import HTTPrettyRequestEmpty

from appium.webdriver.webdriver import WebDriver


def appium_command(command: str) -> str:
"""Return a command of Appium
Expand Down