diff options
| author | Matt Clay <matt@mystile.com> | 2016-11-02 21:43:40 -0700 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2016-11-02 21:59:45 -0700 |
| commit | 7cc4d3fe04f633f4090d56292f04aecaa2c45735 (patch) | |
| tree | e359bb1715d87aed7cb7d8b98f7f9ae0d6905a5d | |
| parent | cb1d90ccfd2f3ed62fc8fb1e6620463f5c9c15fe (diff) | |
| download | ansible-modules-core-7cc4d3fe04f633f4090d56292f04aecaa2c45735.tar.gz | |
Simplify compileall checks. Remove py3 skip list.
| -rw-r--r-- | test/utils/shippable/sanity-skip-python24.txt | 2 | ||||
| -rw-r--r-- | test/utils/shippable/sanity-skip-python3.txt | 0 | ||||
| -rw-r--r-- | test/utils/shippable/sanity-test-python24.txt | 2 | ||||
| -rwxr-xr-x | test/utils/shippable/sanity.sh | 3 |
4 files changed, 2 insertions, 5 deletions
diff --git a/test/utils/shippable/sanity-skip-python24.txt b/test/utils/shippable/sanity-skip-python24.txt index 1434a040..1a0a28c4 100644 --- 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 deleted file mode 100644 index e69de29b..00000000 --- a/test/utils/shippable/sanity-skip-python3.txt +++ /dev/null diff --git a/test/utils/shippable/sanity-test-python24.txt b/test/utils/shippable/sanity-test-python24.txt deleted file mode 100644 index 5ad993ee..00000000 --- a/test/utils/shippable/sanity-test-python24.txt +++ /dev/null @@ -1,2 +0,0 @@ -cloud/amazon/_ec2_ami_search.py -cloud/amazon/ec2_facts.py diff --git a/test/utils/shippable/sanity.sh b/test/utils/shippable/sanity.sh index 3b754afa..8c145302 100755 --- 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(/|$)' . |