valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
98,551 Commits 24 Branches 182 Tags 341 MiB
6e15bc58ff
Commit Graph

75 Commits

Author SHA1 Message Date
rallytime
0412c5654e
Merge branch '2018.3' into 'fluorine' 
No conflicts.
 2018-09-06 12:20:52 -04:00
rallytime
9e274335a3
Pin CherryPy version to < 18.0.0 in requirements files for PY2 
Version 18.0 now requires Python 3.5, so we need to pin this for Py2.
 2018-09-04 10:51:12 -04:00
Daniel Wallace
0abd02a6f6
add lxd tests 2018-08-09 10:33:06 -05:00
Daniel Wallace
f99283751f
handle pyzmq for python3.4 2018-07-18 12:16:05 -05:00
Daniel Wallace
3c1882077e
handle pyzmq for python3.4 2018-07-18 12:15:55 -05:00
Daniel Wallace
a1423c2a1f
add ansible playbook test 2018-07-12 11:29:36 -05:00
Daniel Wallace
221559358a
add 2018.3 requirements for tox/pytest tests 2018-07-11 13:08:49 -05: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
398cc78224
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - .kitchen.yml
  - doc/topics/releases/2017.7.6.rst
  - salt/modules/timezone.py
  - tests/support/case.py
  - tests/unit/modules/test_timezone.py
 2018-06-15 16:51:45 -04:00
rallytime
cdb45874de
Merge branch '2017.7.6' into '2017.7' 
Conflicts:
  - doc/topics/releases/2017.7.6.rst
  - requirements/base.txt
 2018-06-13 15:04:55 -04: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
cc9c4b4d5a
add pytest coverage and xml junits 2018-06-07 12:53:22 -05:00
Daniel Wallace
e1872e2036
simplify tox.ini 2018-06-05 20:41:52 -05:00
Daniel Wallace
81bd01f5af
add tests.txt for running tests with tox requirements 2018-06-05 18:55:04 -05:00
rallytime
2801eecb26
Merge branch '2018.3.1' into '2018.3' 
No conflicts.
 2018-05-30 11:14:40 -04:00
Daniel Wallace
3d874b5529
quote python_version in requirements.txt 2018-05-29 16:08:58 -05:00
Daniel Wallace
987ae6358b
quote python_version in requirements.txt 2018-05-29 16:08:13 -05:00
Daniel Wallace
aeacd2b749
allow tornado 5.0 to be installed only for python2 2018-05-29 14:01:18 -05:00
Daniel Wallace
a1c1b5b5cf
allow tornado 5.0 to be installed only for python2 2018-05-29 13:57:54 -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
rallytime
e458f4a031
Merge branch '2017.7.6' into '2017.7' 
No conflicts.
 2018-05-21 10:34:10 -04:00
Daniel Wallace
550ef2e272
allow using tornado 5.0 2018-05-17 08:41:32 -05:00
Daniel Wallace
a046512287
allow using tornado 5.0 2018-05-16 21:23:25 -05:00
Daniel Wallace
0d06da6944
Merge pull request #47626 from gtmanfred/2017.7 
Implement Pipfile and remove extra requirements.txt files
 2018-05-15 19:03:11 -05:00
Daniel Wallace
418364a533
make dev_python27.txt have the same message as dev_python34.txt 2018-05-15 12:29:52 -05: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
Daniel Wallace
9334c03da9
Update dependency to msgpack 2018-05-10 13:21:35 -04:00
Daniel Wallace
84aa034e03
Update dependency to msgpack 2018-05-09 12:47:07 -05:00
rallytime
786076ac03
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - pkg/windows/modules/get-settings.psm1
  - salt/modules/cmdmod.py
  - salt/modules/pip.py
  - salt/modules/win_lgpo.py
  - salt/states/pip_state.py
  - tests/integration/states/test_pip.py
  - tests/support/helpers.py
  - tests/unit/modules/test_pip.py
  - tests/whitelist.txt
 2018-05-07 13:17:01 -04:00
Pedro Algarvio
5abadf25d6
Add missing requirements files not commited in #47106 2018-05-02 18:34:09 +01:00
Pedro Algarvio
7938b4906e
Allow running pytest>=3.5.0 2018-04-27 23:38:08 +03:00
Pedro Algarvio
d6873800d5
Allow running pytest>=3.5.0 2018-04-20 17:01:26 +01:00
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
rallytime
6439bce4a8
Don't install msgpack 0.5.5 
This version has known critical issues.

See da902f9c1d (r27725642)
for more information.
 2018-03-02 13:39:33 -05:00
rallytime
fde88d0dcd
Don't install msgpack 0.5.5 
This version has known critical issues.

See da902f9c1d (r27725642)
for more information.
 2018-02-28 12:21:32 -05:00
rallytime
4c2f504a85
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2018-02-20 17:43:33 -05:00
rallytime
e0a419655b
Pin tornado version in requirements file 
tornado needs to be >= 4.2.1, but less that 5.0.

Tornado 5.0 is introducing backwards-incompatible changes. Therefore,
we need to pin the version of tornado in base.txt until we can fix
supporting Tornado 5.0 in Salt.

Refs #45790
 2018-02-16 12:05:44 -05:00
rallytime
b94d73c53e
Pin tornado version in requirements file 
tornado needs to be >= 4.2.1, but less that 5.0.

Tornado 5.0 is introducing backwards-incompatible changes. Therefore,
we need to pin the version of tornado in base.txt until we can fix
supporting Tornado 5.0 in Salt.

Refs #45790
 2018-02-16 12:05:18 -05:00
Daniel Wallace
662d8bd68c
add catchlog to py3 dev 
this is installed with py2, but not py3 for some reason

Though, we can remove it once https://github.com/pytest-dev/pytest/pull/2794 is merged
 2017-10-17 14:59:10 -06:00
Daniel Wallace
500f52b98c
include testinfra for testing kitchen tests 2017-10-17 14:59:10 -06:00
s8weber
2b79ba2f32 nacl updates 2017-07-24 10:11:32 -04: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
twangboy
57d5f781f4 Use req files in pkg\windows for setup 2017-04-27 09:47:46 -06:00
Erik Johnson
c09f8e283c Add httpretty to py34 dev requirements 
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).
 2017-03-14 10:29:19 -05:00
Mike Place
db642d05e2 Merge pull request #39970 from twangboy/win_py3_installer 
Win py3 installer
 2017-03-13 12:29:39 -06:00
Mike Place
af242e1c51 Merge pull request #39864 from rallytime/remove-26-requirements 
Remove the dev_python26.txt install file
 2017-03-10 20:51:24 -07:00
twangboy
984ee934a7 Merge branch 'develop' of https://github.com/saltstack/salt into develop 2017-03-10 21:53:07 +00:00
twangboy
02757db1e4 Add python 3 installer for Windows 2017-03-10 21:52:38 +00:00