Clean up dep requirements in `setup.py`. (#489)
* Move test-only deps out of package dep list.
diff --git a/setup.py b/setup.py
index d24c45e..2bf2b09 100755
--- a/setup.py
+++ b/setup.py
@@ -18,16 +18,8 @@
import sys
install_requires = [
- 'future',
- # mock-1.0.1 is the last version compatible with setuptools <17.1,
- # which is what comes with Ubuntu 14.04 LTS.
- 'mock<=1.0.1',
- 'portpicker',
- 'psutil>=5.4.4',
- 'pytz',
- 'pyyaml',
- 'timeout_decorator',
- 'pyserial'
+ 'future', 'portpicker', 'psutil>=5.4.4', 'pyserial', 'pyyaml',
+ 'timeout_decorator'
]
if sys.version_info < (3, ):
@@ -70,7 +62,11 @@
packages=setuptools.find_packages(),
include_package_data=False,
scripts=['tools/sl4a_shell.py', 'tools/snippet_shell.py'],
- tests_require=['pytest'],
+ tests_require=[
+ 'mock',
+ 'pytest',
+ 'pytz',
+ ],
install_requires=install_requires,
cmdclass={'test': PyTest},
)
diff --git a/tests/mobly/controllers/android_device_lib/snippet_client_test.py b/tests/mobly/controllers/android_device_lib/snippet_client_test.py
index d964ae3..61765e7 100755
--- a/tests/mobly/controllers/android_device_lib/snippet_client_test.py
+++ b/tests/mobly/controllers/android_device_lib/snippet_client_test.py
@@ -230,7 +230,7 @@
cmd_setsid = '%s am instrument -w -e action start %s/%s' % (
snippet_client._SETSID_COMMAND, MOCK_PACKAGE_NAME,
snippet_client._INSTRUMENTATION_RUNNER_PACKAGE)
- mock_do_start_app.assert_has_calls(mock.call(cmd_setsid))
+ mock_do_start_app.assert_has_calls([mock.call(cmd_setsid)])
# Test 'setsid' does not exist, but 'nohup' exsits
client = self._make_client()
