Pedro Algarvio
f958df5c2e
Move all of PyTest requirements to its own requiremnts file
2019-01-19 18:37:52 +00:00
C. R. Oldham
f3e5399cc4
Ignore testinfra 1.17.0
2018-10-24 11:38:24 -04:00
rallytime
68aabff0cf
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- pkg/windows/req.txt
- salt/netapi/rest_tornado/saltnado.py
- salt/utils/versions.py
- tests/integration/states/test_file.py
2018-07-09 10:27:58 -04:00
Daniel Wallace
44aaac1d33
use tox to run pylint
...
Also allow pylint to be run from a virtualenv
2018-07-06 13:25:08 -05:00
rallytime
3d2ea16c3a
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- requirements/base.txt
- salt/states/archive.py
- salt/states/file.py
- tests/integration/runners/test_state.py
- tests/unit/daemons/test_masterapi.py
2018-06-11 11:45:37 -04:00
Daniel Wallace
81bd01f5af
add tests.txt for running tests with tox requirements
2018-06-05 18:55:04 -05:00
rallytime
4abfd26e86
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 12:33:00 -04:00
Daniel Wallace
f78b81db94
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 08:38:34 -04:00
