travis: collapse phase1/2 into test stage

This change speeds-up testing and provides faster and better feedback.

Previously testing on py3 would start only if py27 was passing.

Change-Id: I50b798b63a234da826b624017284989bd615ef36

Author: ssbarnea

.travis.yml

@@ -20,8 +20,7 @@ os:
   - linux
 stages:
   - maintenance
-  - phase1
-  - phase2
+  - test
   - deploy
 before_install:
   # begin: workaround to enable support for py37:
@@ -46,10 +45,8 @@ jobs:
     - stage: maintenance
       script:
         - python -m tox -e maintenance
-      on:
-        condition: $TRAVIS_EVENT_TYPE = cron
-    - stage: phase1
-      script:
+      if: type = cron
+    - script:
         # package building added here purely to fail-fast if is broken
         - python setup.py sdist bdist_wheel
         - python -m tox
@@ -58,37 +55,31 @@ jobs:
       language: nodejs
       node_js:
         - "8"
-    - stage: phase1
-      script: python -m tox
+    - script: python -m tox
       python: "2.7"
       env: TOXENV=docs
-    - stage: phase1
-      script: python -m tox
+    - script: python -m tox
       python: "2.7"
       env: TOXENV=py27
       after_success:
         - bash <(curl -s https://codecov.io/bash) -e TOX_ENV
         - requires.io update-site -t ac3bbcca32ae03237a6aae2b02eb9411045489bb -r
-    - stage: phase2
-      script: python -m tox
+    - script: python -m tox
       python: "3.4"
       env: TOXENV=py34
       after_success:
         - bash <(curl -s https://codecov.io/bash) -e TOX_ENV
-    - stage: phase2
-      script: python -m tox
+    - script: python -m tox
       python: "3.5"
       env: TOXENV=py35
       after_success:
         - bash <(curl -s https://codecov.io/bash) -e TOX_ENV
-    - stage: phase2
-      script: python -m tox
+    - script: python -m tox
       python: "3.6"
       env: TOXENV=py36 PYTHON='3.6' PYENV_VERSION='system'
       after_success:
         - bash <(curl -s https://codecov.io/bash) -e TOX_ENV
-    - stage: phase2
-      script: python -m pip install -q tox-travis && python -m tox
+    - script: python -m pip install -q tox-travis && python -m tox
       python: "3.7"
       env: TOXENV=py37 PYTHON='3.7'
       after_success:
@@ -101,7 +92,7 @@ jobs:
       script:
         - python setup.py sdist bdist_wheel
         - python -m twine upload dist/*
-      if: tag IS present
+      if: tag IS present AND type != cron
       deploy:
         - provider: releases
           api_key:

docs/requirements-rtd.txt

@@ -1,3 +1,3 @@
 pbr>=3.0.0
-sphinx>=2.0.1
+Sphinx>=1.8.5
 sphinx_rtd_theme>=0.4.3

tests/test_client.py

@@ -3,7 +3,7 @@
 import getpass
 import pytest
 from tenacity import retry
-from tenacity import wait_random_exponential
+from tenacity import wait_incrementing
 from tests import get_unique_project_name
 from tests import JiraTestManager
 
@@ -57,15 +57,14 @@ def remove_by_slug():
     return slug
 
 
-@retry(wait=wait_random_exponential(multiplier=1, max=180))
+@retry(wait=wait_incrementing(start=0, increment=1, max=60))
 def test_delete_project(cl_admin, cl_normal, slug):
 
     with pytest.raises(JIRAError) as ex:
-        assert cl_normal.delete_project(slug)
-
-        assert 'Not enough permissions to delete project' in str(ex.value) \
-            or str(ex.value).endswith('is not a Project, projectID or slug')
-
+        cl_normal.delete_project(slug)
+    # verify that normal user cannot delete project
+    assert 'Not enough permissions to delete project' in str(ex.value)
+    # verify that admin user can delete project
     assert cl_admin.delete_project(slug)
 
 

tox.ini

@@ -36,6 +36,8 @@ commands=
 setenv =
     PIP_LOG={envdir}/pip.log
     PIP_DISABLE_PIP_VERSION_CHECK=1
+    # Avoid 2020-01-01 warnings: https://github.com/pypa/pip/issues/6207
+    PYTHONWARNINGS=ignore:DEPRECATION::pip._internal.cli.base_command
 
 passenv =
     CI