From 1ea36df9042a8d7a21ff61d0f44dd8c4a81582dd Mon Sep 17 00:00:00 2001 From: Randy Barlow Date: Mon, 19 Oct 2015 13:05:11 -0400 Subject: [PATCH 1/3] Ignore D104 in our pep257 checks. D104 gets upset about our empty __init__.py files. This commit configures the pep257 checker to ignore that error. --- run-tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.py b/run-tests.py index 5aca10ca..abfbe87c 100755 --- a/run-tests.py +++ b/run-tests.py @@ -24,7 +24,7 @@ # Check the code for PEP-257 compliance # We should remove some of these over time -pep257_fail_ignore_codes = 'D100,D103,D200,D202,D203,D205,D400,D401,D402' +pep257_fail_ignore_codes = 'D100,D103,D104,D200,D202,D203,D205,D400,D401,D402' print "checking pep257 for failures, ignoring %s" % pep257_fail_ignore_codes exit_code = subprocess.call(['pep257', '--ignore=' + pep257_fail_ignore_codes]) From 397743f237c664a9883d0dfe932f1688fc928e21 Mon Sep 17 00:00:00 2001 From: Randy Barlow Date: Mon, 19 Oct 2015 14:54:43 -0400 Subject: [PATCH 2/3] Don't test pulp_python against pypi in Travis. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a7026bae..db8213c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: python python: - "2.6" - "2.7" - - "pypy" before_install: - "pushd .." - "git clone https://github.com/pulp/pulp.git --branch 2.7-dev" From 459d765be0ebe4edf4168a67432ff2bbf58f0904 Mon Sep 17 00:00:00 2001 From: Randy Barlow Date: Mon, 19 Oct 2015 15:15:58 -0400 Subject: [PATCH 3/3] Limit Mock to <1.1 in test_requirement.txt. --- test_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_requirements.txt b/test_requirements.txt index 8d22e2be..9f971c9d 100644 --- a/test_requirements.txt +++ b/test_requirements.txt @@ -2,7 +2,7 @@ coverage coveralls flake8 flake8-import-order -mock +mock<1.1 nose nosexcover pep257