Commit Graph

15 Commits

Author SHA1 Message Date
rallytime
8d1e1e7f94
Merge branch '2017.7' into '2018.3'
Conflicts:
  - .kitchen.yml
  - Gemfile
  - pkg/windows/build_env_2.ps1
  - pkg/windows/build_env_3.ps1
  - pkg/windows/req.txt
  - salt/client/ssh/__init__.py
  - salt/client/ssh/ssh_py_shim.py
  - salt/modules/boto_vpc.py
  - salt/modules/file.py
  - salt/modules/heat.py
  - salt/modules/smartos_vmadm.py
  - salt/modules/win_dsc.py
  - salt/returners/elasticsearch_return.py
  - salt/runners/salt.py
  - salt/states/module.py
  - salt/utils/win_functions.py
  - setup.py
  - tests/integration/modules/test_state.py
  - tests/unit/grains/test_core.py
  - tests/unit/test_pillar.py
2018-03-15 17:22:05 -04:00
Erik Johnson
b958b4699c
Update requirements files to depend on mock>=2.0.0
This requirement was changed in salt-jenkins but never done here.
2018-03-09 11:16:13 -06:00
Daniel Wallace
500f52b98c
include testinfra for testing kitchen tests 2017-10-17 14:59:10 -06:00
Erik Johnson
e178f08d3a Remove GitPython from dev requirements files
This was added in the past because we put git_pillar configuration in
the integration suite's master config file. However, now that git_pillar
is being tested in its own separate way and no longer requires the
git_pillar config to be in the master config file, it has been removed.
This makes GitPython unnecessary in the dev requirements file. The
reason it was there before was mainly to squelch a bunch of critical
errors that would occur every time the test suite would attempt to
compile the git_pillar items and failed if GitPython wasn't installed.
This was more for the benefit of users running the test suite on their
own than for our jenkins setup of course, since we were installing
GitPython on the Jenkins VMs.
2017-06-23 07:17:51 -05:00
Pedro Algarvio
796e0b153d
pytest-catchlog is also required for pytest-salt 2017-03-09 19:31:14 +00:00
Pedro Algarvio
878e770088
Bump required SaltPyLint version 2017-03-06 15:28:58 +00:00
Pedro Algarvio
f377a25394
Update development requirements file 2017-03-01 16:15:10 +00:00
Erik Johnson
79a65aa3b4 Add GitPython to dev_python27.txt requirements file 2017-02-25 19:49:44 -06:00
Pedro Algarvio
1dd7d8d88f
Require SaltPyLint >= v2017.2.22
Minimal Python version for develop is now 2.7
2017-02-22 12:15:31 +00:00
rallytime
fe1e24909e Merge branch '2016.11' into 'develop'
No conflicts.
2016-12-13 11:29:16 -07:00
Denys Havrysh
004bff113e Add missing requirements for running unit tests: libcloud and boto3 2016-12-12 13:18:38 +02:00
Eric Radman
e3f14ff298 dev_python*.txt: use current SaltTesting and SaltPyLint modules
Pinning SaltTesting to 2015.2.16 is not right--integration tests will
not run with this version. Let pip install the latest minimum version
instead.

Include SaltPyLint since anyone doing development work will also want to
run pylint.
2016-10-31 22:23:44 -04:00
Aneesh Agrawal
17acede368 Pin SaltTesting dependency down to a specific version. 2015-03-14 01:30:21 -04:00
Aneesh Agrawal
c8f55a1b3a Update salttesting pip requirement to develop branch.
Master seems to be orphaned/unused since Jan. 2, 2014, over a year ago.
Some tests require the new functionality pushed onto develop since then.
2015-03-11 02:49:38 -04:00
Justin Findlay
ad33589fac move requirements files into requirements dir 2014-12-27 17:29:03 -07:00