Erik Johnson
7693cd3f6e
Fix typo in top.sls docs
...
The extra ':' here negates the code-block section. Removed it.
2013-07-13 22:30:18 -05:00
Erik Johnson
ccc8ea24d7
Better documentation for npm, pecl, and pip states
...
This commit adds additional info to the top docstring for these states,
including SLS examples for how to properly set up requisites to ensure
that npm/pecl/pip is installed before these states are run.
2013-07-13 17:49:45 -05:00
Pedro Algarvio
8bda6cc858
Resetting .travis.pylintrc
to what is was. Shouldn't have been included in the commit.
2013-07-13 23:43:01 +01:00
Pedro Algarvio
c65b1348fe
Fix Travis-CI for unit.modules.virtualenv_test.VirtualenvTestCase.test_no_site_packages_deprecation
...
Also mock the `virtualenv` module.
2013-07-13 23:23:30 +01:00
Pedro Algarvio
b6471e4099
Mock the virtualenv module in unit.modules.virtualenv_test.VirtualenvTestCase.test_issue_6031_multiple_extra_search_dirs
. Is Travis-CI still going to complain?
2013-07-13 23:14:12 +01:00
Erik Johnson
a9e061540c
Add __virtual__ functions for pecl and pip states
...
Similar to what was recently done for npm, disable pecl and pip states
when the needed binary is not available. This prevents tracebacks when
one tries running these states without the required shell command
installed.
2013-07-13 17:10:09 -05:00
Pedro Algarvio
91e80bc994
Only send coverage info on Travis-CI success.
2013-07-13 22:49:38 +01:00
Pedro Algarvio
4e2d17388a
We're no longer passing ret
. Remove it from args. (Missed on f7459a15
)
2013-07-13 22:32:10 +01:00
Thomas S Hatch
f74fcfd5ea
Add state_order to master opts
2013-07-13 14:53:10 -06:00
Thomas S Hatch
2cbe8f27e8
Add state_auto_order to mopts
2013-07-13 14:36:59 -06:00
Thomas S Hatch
757767036d
simplify the iorder assignment and make includes first
2013-07-13 14:30:27 -06:00
Matthew Williams
68244504e2
virt: remove debug code
2013-07-13 20:28:51 +00:00
Matthew Williams
fbf63690cd
wip: preapprove virt minion keys
2013-07-13 20:10:04 +00:00
Pedro Algarvio
675d4273cf
Re-add the pip
keyword parameter lost in a messy rebase.
2013-07-13 19:55:51 +01:00
Pedro Algarvio
f7459a1536
We're no longer passing ret
. Remove it from args.
2013-07-13 19:55:51 +01:00
Pedro Algarvio
2b1cf0ac14
Patch _install_script()
since the virtualenv module will try to install some scripts.
2013-07-13 19:55:51 +01:00
Pedro Algarvio
895691d3cc
Fix unmerged docstring, added comments, applied formatting and simplified code.
...
* The return dictionary does not need to be passed to `_install_script()`, the update happens in `create()`.
* Used `glob` to find the downloaded distribute files, simpler logic.
2013-07-13 19:55:51 +01:00
Pedro Algarvio
05f2a23733
Make use of salttesting.helpers.ForceImportErrorOn
.
2013-07-13 19:55:50 +01:00
Pedro Algarvio
04133b07b4
Added mock test case to test getting the virtualenv version from shell and not from the module.
2013-07-13 19:55:50 +01:00
Pedro Algarvio
9cd446cb13
Empty stdout
when trying to get the virtualenv version is also an error.
2013-07-13 19:55:50 +01:00
Pedro Algarvio
db9d2af6e4
Don't make the virtualenv state module overlap the virtualenv library.
2013-07-13 19:55:50 +01:00
Pedro Algarvio
a54018d736
Map options with defaults changed from False
to None
from the virtualenv module to the virtualenv state.
2013-07-13 19:55:50 +01:00
Pedro Algarvio
4fb58a0eb1
Double to single quotes.
2013-07-13 19:55:50 +01:00
Pedro Algarvio
606c6d5ffb
Add test case which tests if non proper arguments raise an exception.
2013-07-13 19:55:50 +01:00
Pedro Algarvio
9d7bb2257e
Only strip()
on strings.
2013-07-13 19:55:50 +01:00
Pedro Algarvio
5c3a406e17
Let us not use a deprecated option ourselves unless for testing the deprecation.
2013-07-13 19:55:50 +01:00
Pedro Algarvio
336135f3e8
Extra care regarding empty strings.
2013-07-13 19:55:49 +01:00
Pedro Algarvio
80f07c7922
No empty strings as defaults!
2013-07-13 19:55:49 +01:00
Pedro Algarvio
de572cb193
Fix the virtualenv
unittests which rely on it's version changing.
2013-07-13 19:55:49 +01:00
Pedro Algarvio
4b5f865404
Warn about using option not available for virtualenv
and pyvenv
respectively.
...
`False` defaults have been turned into `None` to know if the user is even passing `False` and fail.
2013-07-13 19:55:49 +01:00
Pedro Algarvio
c5917edb65
virtualenv
version checking is only done if using virtualenv
and not pyvenv
.
2013-07-13 19:55:49 +01:00
Pedro Algarvio
5aef21759e
Update doc string to make it explicit that it's salt we're mentioning.
2013-07-13 19:55:49 +01:00
Pedro Algarvio
606413c063
Show a deprecation warning if no_site_packages
is used. Fixes #6027 .
...
If both `no_site_packages` and `system_site_packages` are used, throw an error.
Added the appropriate tests.
2013-07-13 19:55:49 +01:00
Pedro Algarvio
cde1c628ac
Added a test case to check for multiple extra search dirs support. Refs #6031 .
2013-07-13 19:55:49 +01:00
Pedro Algarvio
2fd8dc299a
Add test case to check for proper handling of --never-download
. Refs #6030 .
...
Also added assertions to check for proper deprecation logging messages output.
2013-07-13 19:55:49 +01:00
Pedro Algarvio
8e8703ee80
Allow extra_search_dir
for virtualenv.create()
to be passed a list. Fixes #6031 .
2013-07-13 19:55:48 +01:00
Pedro Algarvio
6609b0414e
Set defaults to None
instead of ''
.
2013-07-13 19:55:48 +01:00
Pedro Algarvio
fd8b843de3
Warn and don't pass --never-download
to virtualenv
if it's version is >= 0.10
. Fixes #6030 .
2013-07-13 19:55:48 +01:00
Pedro Algarvio
a20dd32f61
Add missing import and instantiate a local logger instance.
2013-07-13 19:55:48 +01:00
Pedro Algarvio
7b11e3dbf3
Warn the users if they're using --distribute
without needing.
2013-07-13 19:55:48 +01:00
Pedro Algarvio
6126aa47be
Small code and print's cleanup.
2013-07-13 19:55:48 +01:00
Pedro Algarvio
8858d1183f
Add test case which tests for proper deprecated output based on virtualenv version.
2013-07-13 19:55:48 +01:00
Pedro Algarvio
9024966aa4
Don't obfuscate the original module name.
2013-07-13 19:55:47 +01:00
Pedro Algarvio
49bcbe9551
Don't overlap the virtualenv salt module with the virtualenv library.
2013-07-13 19:55:47 +01:00
Pedro Algarvio
64c9463a8b
Merge pull request #6143 from s0undt3ch/issues/6129-unexpected-__env__-keyword
...
Fix Issue #6129 unexpected `__env__` keyword
2013-07-13 11:53:19 -07:00
Pedro Algarvio
62287b8917
Merge pull request #6142 from s0undt3ch/hotfix/salt-modules-rvm-pylint
...
Update mocked rvm unit test since we now call `cmd.run_all` instead of `cmd.retcode`
2013-07-13 11:52:07 -07:00
Pedro Algarvio
96852d96ca
jinja2.ext.Extension
is apparently an old-style class.
2013-07-13 18:51:51 +01:00
Pedro Algarvio
5bee1ca7f3
Re-implement 06ac67c84a
the right way since the state __env__
was being confused by the shell environment. Fixes #6129 .
2013-07-13 18:45:30 +01:00
Pedro Algarvio
fc63bb4469
Revert "Fix pip module for python 3"
...
This reverts commit 06ac67c84a
.
2013-07-13 18:14:32 +01:00
Pedro Algarvio
269175145f
Update mocked rvm unit test since we now call cmd.run_all
instead of cmd.retcode
.
2013-07-13 17:46:46 +01:00