[travis] Merge "verify" and "test" stages

Author: frozencemetery

.travis.yml

@@ -11,7 +11,6 @@ install: skip
 before_install: skip
 
 stages:
-- verify
 - test
 - name: deploy latest docs
   if: (branch = master OR branch =~ ^infra/$) AND type = push
@@ -28,19 +27,8 @@ script:
 - if [[ "$TRAVIS_OS_NAME" != "linux" ]]; then ./.travis/build.sh; fi
 
 jobs:
-  include:
-  - &docker_verify
-    stage: verify
-    env: DISTRO=fedora:latest PYTHON="2"
-    script:
-    - source ./.travis/lib-util.sh
-    - util::docker-run $DISTRO ./.travis/verify.sh
-
-  - <<: *docker_verify
-    env: DISTRO=fedora:latest PYTHON="3"
-
-
   # need to explictly define each builder for test due to different os types
+  include:
   - stage: test
     env: DISTRO=debian:stable PYTHON="2"
 
@@ -54,7 +42,7 @@ jobs:
     env: DISTRO=centos:7 PYTHON="2" # el7 doesn't do python3 modules
 
   - stage: test
-    env: DISTRO=fedora:latest PYTHON="3"
+    env: DISTRO=fedora:latest PYTHON="3" FLAKE="yes"
 
   - stage: test
     env: DISTRO=fedora:latest PYTHON="2"

.travis/build.sh

@@ -4,6 +4,28 @@
 source ./.travis/lib-setup.sh
 setup::install
 
+if [ x"$FLAKE" = "xyes" ]; then
+    flake8 setup.py
+    F8_SETUP=$?
+
+    flake8 gssapi
+    F8_PY=$?
+
+    # Cython requires special flags since it is not proper Python:
+    # - E225: missing whitespace around operator
+    # - E226: missing whitespace around arithmetic operator
+    # - E227: missing whitespace around bitwise or shift operator
+    # - E402: module level import not at top of file (needed for the `GSSAPI="blah" lines)
+    # - E901: SyntaxError or IndentationError
+    # - E999: Internal AST compilation error (flake8 specific)
+    flake8 gssapi --filename='*.pyx,*.pxd' --ignore=E225,E226,E227,E402,E901,E999
+    F8_MAIN_CYTHON=$?
+
+    if [ $F8_SETUP -ne 0 -o $F8_PY -ne 0 -o $F8_MAIN_CYTHON -ne 0 ]; then
+        exit 1
+    fi
+fi
+
 # always build in-place so that Sphinx can find the modules
 python setup.py build_ext --inplace $EXTRA_BUILDEXT
 BUILD_RES=$?

.travis/lib-util.sh

@@ -11,6 +11,7 @@ util::docker-run() {
     -e PKG_NAME_VER=$PKG_NAME_VER \
     -e KRB5_VER=$KRB5_VER \
     -e PYTHON=$PYTHON \
+    -e FLAKE=$FLAKE \
     $distro \
     /bin/bash -ex $@
 }