Simplify compileall checks. Remove py3 skip list.

amerkel2 · Nov 3, 2016 · 7cc4d3f · 7cc4d3f
1 parent cb1d90c
commit 7cc4d3f
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/test/utils/shippable/sanity-skip-python24.txt b/test/utils/shippable/sanity-skip-python24.txt
@@ -1 +1 @@
-/cloud/
+/cloud/[^/]+/(?!(ec2_facts.py|_ec2_ami_search.py))
diff --git a/test/utils/shippable/sanity-skip-python3.txt b/test/utils/shippable/sanity-skip-python3.txt
diff --git a/test/utils/shippable/sanity-test-python24.txt b/test/utils/shippable/sanity-test-python24.txt
diff --git a/test/utils/shippable/sanity.sh b/test/utils/shippable/sanity.sh
@@ -29,11 +29,10 @@ fi
 
 validate_modules="${build_dir}/test/sanity/validate-modules/validate-modules"
 
-python2.4 -m compileall -fq   -i                    "test/utils/shippable/sanity-test-python24.txt"
 python2.4 -m compileall -fq   -x "($(printf %s "$(< "test/utils/shippable/sanity-skip-python24.txt"))" | tr '\n' '|')" .
 python2.6 -m compileall -fq .
 python2.7 -m compileall -fq .
-python3.5 -m compileall -fq . -x "($(printf %s "$(< "test/utils/shippable/sanity-skip-python3.txt"))"  | tr '\n' '|')"
+python3.5 -m compileall -fq .
 
 ANSIBLE_DEPRECATION_WARNINGS=false \
     "${validate_modules}" --exclude '/utilities/|/shippable(/|$)' .
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/cloud/
		/cloud/[^/]+/(?!(ec2_facts.py\|_ec2_ami_search.py))