Merge ec60ec6 into 5616963

zhmcclient · Oct 30, 2020 · 0504bcc · 0504bcc
2 parents 5616963 + ec60ec6
commit 0504bcc
Show file tree

Hide file tree

Showing 13 changed files with 195 additions and 317 deletions.
diff --git a/.flake8 b/.flake8
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@ env*
 .coverage
 /AUTHORS
 /ChangeLog
+/dist
 *.egg
 *.egg-info
 /_mailinglist
@@ -25,6 +26,7 @@ tmp_*
 *.tmp
 *.log
 *.retry
+/*.done
 vars.yml
 vault.yml
 /python-zhmcclient

diff --git a/.travis.yml b/.travis.yml
@@ -191,6 +191,7 @@ install:
   - which pip
   - pip --version
   - pip list
+  - python tools/remove_duplicate_setuptools.py
   - make install
   - pip list
   - make develop
@@ -199,19 +200,9 @@ install:
 
 # commands to run builds & tests
 script:
-  - if [[ $TRAVIS_PYTHON_VERSION == 3.8 && $PACKAGE_LEVEL == latest ]]; then
-      make docs;
-    fi
-  - if [[ $TRAVIS_PYTHON_VERSION == 3.8 && $PACKAGE_LEVEL == latest ]]; then
-      make doccheck || true;
-    fi
-  - make check
+  - make docs
   - make test
-  # sanity tests will run for all ansible-supported python versions in a
-  # docker container, so its enough to run them once
-  - if [[ $TRAVIS_PYTHON_VERSION == 3.8 && $PACKAGE_LEVEL == latest ]]; then
-      make sanity;
-    fi
+  - make sanity
 
 after_success:
   - if [[ "$TRAVIS_OS_NAME" == "linux" && "$TRAVIS_PYTHON_VERSION" == "3.8" && "$PACKAGE_LEVEL" == "latest" ]]; then