Commit Graph

46 Commits

Author SHA1 Message Date
Colton Myers
bd6ecdfd43 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    doc/topics/installation/windows.rst
    doc/topics/tutorials/gitfs.rst
    salt/pillar/pepa.py
    salt/states/artifactory.py
    salt/states/pip_state.py
    salt/transport/__init__.py
2015-04-21 10:42:22 -06:00
Pedro Algarvio
3ae68c4f7b Minor cosmetic changes in order not to disable the PEP8 PyLint code all together 2015-04-21 15:03:47 +01:00
rallytime
db612d0b81 Clean up some pylint on 2015.2
This way PRs against 2015.2 will be a little happier
2015-02-06 07:58:26 -07:00
rallytime
02d3235cf2 Fix remaining pylint errors on develop 2015-02-04 21:11:17 -07:00
Pedro Algarvio
378752402d Make pylint ignore invalid-sequence-index 2015-01-30 22:25:32 +00:00
Pedro Algarvio
f3bc5bdb49 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
Thomas S Hatch
1dcc05b049 Merge branch '2014.7' into develop
Conflicts:
	salt/modules/yumpkg.py
2014-12-17 15:00:26 -07:00
rallytime
b76f49b9d0 Pylint fix and skip all of the classes 2014-12-16 16:21:27 -07:00
rallytime
7f258bf729 Disable zcbuildout tests as they are not running reliably.
These tests are not running reliably, aren't quite testing the functionalty
the way they should, and take too long to run as unit tests. When these get
reinstated, they should be implemented as integration tests instead of unit
tests.
2014-12-16 16:00:51 -07:00
Pedro Algarvio
83153354c4 Remove PyLint disable rule in 2014.7
Since it's unlikely we upgrade PyLint in this branch
2014-12-02 01:37:42 +00:00
Pedro Algarvio
be18e8b244 Disable some Pylint errors 2014-12-01 03:24:41 +00:00
Pedro Algarvio
0c50d789b7 The imports actually work so shut up PyLint! 2014-11-20 18:22:19 +00:00
Pedro Algarvio
61de0bd629 Let's see if the slash makes a difference 2014-11-20 17:18:12 +00:00
Pedro Algarvio
13df58d2e6 Use urlopen and URLError from six 2014-11-20 16:40:45 +00:00
Mike Place
888662692f Pylint zcbuildout
I see no evidence of this argument in use. Removed and modified test.

Closes #9556
2014-05-21 10:11:25 -06:00
Pedro Algarvio
5a8575dbb9 The helper method is now released 2014-05-20 10:53:47 +01:00
Mike Place
205a3ac9c4 Grrrr 2014-04-18 11:25:15 -06:00
Mike Place
cb018eced0 Disable unreliable test. 2014-04-18 10:52:09 -06:00
Mathieu Le Marec - Pasquet
3a209d4c07 Bunch of safeguards for utf8 errors in buildout module 2014-02-02 04:18:32 +01:00
Alexey Ivanov
d23ff3821e
codespell: grammar nazi
Run codespell[1] against sources.

[1] https://github.com/lucasdemarchi/codespell
2014-01-26 18:41:28 -08:00
Mathieu Le Marec - Pasquet
b8885f8faf buildout: protect against unicodeerrors 2014-01-23 01:11:19 +01:00
Mathieu Le Marec - Pasquet
1f39bcfcb4 Fixing tests 2014-01-17 01:59:11 +01:00
Pedro Algarvio
61e217f894 Skip if the tar binary is not found. 2014-01-14 12:36:36 +00:00
Pedro Algarvio
e8de5e7077 Don't hardcode the virtualenv binary name 2013-12-31 14:49:22 +00:00
Pedro Algarvio
d14af796cc Skip tests if virtualenv is not available. 2013-12-31 14:12:02 +00:00
Mathieu Le Marec - Pasquet
1365688bf7 Again, more robustness for zcbuildout tests 2013-12-22 18:52:54 +00:00
Thomas S Hatch
99cc12ddc5 This test is passing in standalone environments but not in Jenkins
I am stubbing it out and we will need to come back to it
2013-12-20 13:56:26 -07:00
Mathieu Le Marec - Pasquet
bb7f5247d3 according buildout tests 2013-12-17 04:36:36 +01:00
Pedro Algarvio
fe7ab946d5 Make it run --docked. 2013-12-14 19:00:01 +00:00
Pedro Algarvio
c65d6ea523 Use salt.utils.fopen 2013-12-14 18:35:13 +00:00
Pedro Algarvio
8f8f8bfc4a Formatting and requirements fixes. 2013-12-14 18:31:40 +00:00
Mathieu Le Marec - Pasquet
303f5a782c small space error 2013-12-06 20:37:51 +00:00
Mathieu Le Marec - Pasquet
50b6ba65f8 fix last zcbuildout pylint errors 2013-12-06 20:32:33 +00:00
Pedro Algarvio
fe76fb8df0 Higher timeout. 2013-12-06 19:16:41 +00:00
Pedro Algarvio
8f8e3edd0f Lower the url request timeout and log it. 2013-12-06 19:09:38 +00:00
Pedro Algarvio
bff4c99149 Attribute name changed. 2013-12-06 18:13:22 +00:00
Mathieu Le Marec - Pasquet
50cdd562ad make buildout test more robust 2013-12-04 01:51:23 +00:00
Mathieu Le Marec - Pasquet
5f46962e80 pep8 fixes 2013-12-04 00:25:50 +00:00
Pedro Algarvio
a7365b6322 No last line 2013-12-03 20:28:41 +00:00
Pedro Algarvio
205ed46577 Easier path building 2013-12-03 20:28:08 +00:00
Pedro Algarvio
d6d2993486 No un-indexed curly braces on string .format() calls 2013-12-03 20:24:21 +00:00
Mathieu Le Marec - Pasquet
3a55194ba6 lint fix 2013-12-03 17:56:50 +00:00
Mathieu Le Marec - Pasquet
e9246d2a77 Remove bootstrap.py's & adapt tests for zcbuildout module 2013-12-03 17:53:58 +00:00
Mathieu Le Marec - Pasquet
30511257a8 add requires_network for buildout test 2013-12-03 16:51:46 +00:00
Mathieu Le Marec - Pasquet
228c987b76 feat: buildout support
This fixes #8856.
2013-11-29 18:51:20 +00:00