update docs

(cherry picked from commit 3edeea3)

docs/all_module/airtest.core.android.rst

@@ -21,12 +21,12 @@ Submodules
 
 .. toctree::
 
-   airtest.core.android.adb
    airtest.core.android.android
+   airtest.core.android.adb
    airtest.core.android.constant
    airtest.core.android.ime
-   airtest.core.android.javacap
-   airtest.core.android.minicap
+   airtest.core.android.cap_methods.javacap
+   airtest.core.android.cap_methods.minicap
    airtest.core.android.recorder
    airtest.core.android.rotation
    airtest.core.android.yosemite

docs/all_module/airtest.core.ios.rst

@@ -13,12 +13,9 @@ Submodules
 
 .. toctree::
 
+   airtest.core.ios.ios
    airtest.core.ios.constant
    airtest.core.ios.elements_type
-   airtest.core.ios.fake_minitouch
    airtest.core.ios.instruct_cmd
-   airtest.core.ios.ios
-   airtest.core.ios.minicap
    airtest.core.ios.rotation
-   airtest.core.ios.wda_client
 

docs/all_module/airtest.core.win.rst

@@ -13,7 +13,5 @@ Submodules
 
 .. toctree::
 
-   airtest.core.win.ctypesinput
-   airtest.core.win.screen
    airtest.core.win.win
-
+   airtest.core.win.ctypesinput

docs/conf.py

@@ -41,7 +41,7 @@
 
 import mock
 
-mock_list = ['cv2', 'Xlib', 'numpy', 'mss', 'wda', 'ffmpeg']
+mock_list = ['cv2', 'Xlib', 'numpy', 'mss', 'wda', 'ffmpeg', 'logzero']
 win_mock_list = [
             'win32api',
             'win32con',
@@ -54,7 +54,9 @@
             'pywinauto.win32structures',
             'airtest.core.win.ctypesinput'
             ]
-for mod_name in mock_list + win_mock_list:
+ios_mock_list = [
+    'tidevice', 'tidevice._usbmux', 'tidevice._device', 'tidevice._proto', 'tidevice.exceptions', ]
+for mod_name in mock_list + win_mock_list + ios_mock_list:
     sys.modules[mod_name] = mock.MagicMock()
 
 sys.modules["cv2"].__version__ = "3.2.0.7"

setup.py

@@ -1,8 +1,6 @@
 import os
 import sys
 import codecs
-import platform
-import pkg_resources
 from setuptools import setup, find_packages
 
 
@@ -28,15 +26,6 @@ def parse_requirements(filename):
     reqs = [line for line in lineiter if line and not line.startswith("#")]
     if sys.platform == "win32":
         reqs.append('pywin32')
-    if sys.version_info.major == 2:
-        if "opencv-contrib-python" not in [d.project_name for d in pkg_resources.working_set]:
-            # If py<=2 and opencv-contrib-python has not been installed, install version==3.2.0.7
-            reqs.remove("opencv-contrib-python>=4.4.0.46")
-            reqs.append("opencv-contrib-python==3.2.0.7")
-        # facebook-wda only supports py3
-        reqs.remove("facebook-wda>=1.3.3")
-        reqs.remove("mss==6.1.0")
-        reqs.append("mss==4.0.3")
     # if py<=3.6 add dataclasses
     if sys.version_info.major == 3 and sys.version_info.minor <= 6:
         reqs.append("dataclasses")
@@ -47,7 +36,7 @@ def parse_requirements(filename):
     name='airtest',
     version=get_version("airtest/utils/version.py"),
     author='Netease Games',
-    author_email='[email protected].com',
+    author_email='rockywhisper@163.com',
     description='UI Test Automation Framework for Games and Apps on Android/iOS/Windows/Linux',
     long_description='UI Test Automation Framework for Games and Apps on Android/iOS/Windows, present by NetEase Games',
     url='https://github.com/AirtestProject/Airtest',
@@ -76,7 +65,6 @@ def parse_requirements(filename):
     airtest = airtest.cli.__main__:main
     """,
     classifiers=[
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',