salt/requirements/dev.txt

-r base.txt

mock>=2.0.0
SaltPyLint>=v2017.3.6
pytest>=3.5.0
git+https://github.com/saltstack/pytest-salt.git@master#egg=pytest-salt
testinfra>=1.7.0

# httpretty Needs to be here for now even though it's a dependency of boto.
# A pip install on a fresh system will decide to target httpretty 0.8.10 to
# satisfy other requirements, and httpretty 0.8.10 has bugs in setup.py that
# prevent it from being successfully installed (at least on Python 3.4).
httpretty; python_version >= '3.4'
pylint==1.6.5
simplify dev and base.txt to single files Instead of having different files for different python versions, just have one, and use the built in `python_version` to handle which dependencies to install. 2018-05-13 01:20:47 +00:00			`-r base.txt`

			`mock>=2.0.0`
			`SaltPyLint>=v2017.3.6`
			`pytest>=3.5.0`
			`git+https://github.com/saltstack/pytest-salt.git@master#egg=pytest-salt`
Merge branch '2017.7' into '2018.3' Conflicts: - requirements/dev_python27.txt - requirements/dev_python34.txt - salt/fileclient.py - salt/output/__init__.py - salt/serializers/configparser.py - salt/states/pkg.py - salt/states/zpool.py - salt/transport/tcp.py - tests/integration/cloud/providers/test_ec2.py - tests/integration/modules/test_mac_user.py - tests/integration/modules/test_pip.py - tests/integration/modules/test_pkg.py - tests/integration/modules/test_service.py - tests/integration/states/test_pip_state.py - tests/integration/states/test_user.py - tests/unit/modules/test_cmdmod.py 2018-05-23 16:33:00 +00:00			`testinfra>=1.7.0`
simplify dev and base.txt to single files Instead of having different files for different python versions, just have one, and use the built in `python_version` to handle which dependencies to install. 2018-05-13 01:20:47 +00:00
			`# httpretty Needs to be here for now even though it's a dependency of boto.`
			`# A pip install on a fresh system will decide to target httpretty 0.8.10 to`
			`# satisfy other requirements, and httpretty 0.8.10 has bugs in setup.py that`
			`# prevent it from being successfully installed (at least on Python 3.4).`
			`httpretty; python_version >= '3.4'`
use tox to run pylint Also allow pylint to be run from a virtualenv 2018-07-06 18:24:07 +00:00			`pylint==1.6.5`