[WIP] CI shuffle.

lukesneeringer · Mar 7, 2017 · 093a6da · dhermes · Mar 8, 2017 · lukesneeringer
1 parent a28beb9
commit 093a6da
Show file tree

Hide file tree

Showing 15 changed files with 70 additions and 44 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,25 +1,29 @@
 language: python
 sudo: false
 
-addons:
-  apt:
-    sources:
-    - deadsnakes
-    packages:
-    - python3.5
+matrix:
+  include:
+    - python: 2.7
+      env:
+        - TOXENV=py27
+        - TOXENV=system-tests
+    - python: 3.4
+      env: TOXENV=py34
+    - python: 3.5
+      env:
+        - TOXENV=py35
+        - TOXENV=lint
+    - python: 3.6
+      env:
+        - TOXENV=py36
+        - TOXENV=system-tests
 
 install:
-  - pip install --upgrade pip tox
+  - pip install --upgrade pip
+  - pip install --upgrade tox
 
 script:
-  - python2.7 scripts/run_unit_tests.py
-  - if [[ "${TRAVIS_EVENT_TYPE}" != "pull_request" ]]; then python3.4 scripts/run_unit_tests.py; fi
-  - python3.5 scripts/run_unit_tests.py
-  - python scripts/run_unit_tests.py --tox-env cover
-  - tox -e lint
-  - tox -e system-tests
-  - tox -e system-tests3
-  - scripts/update_docs.sh
+  - tox
 
 after_success:
   - scripts/coveralls.sh

diff --git a/system_tests/system_test_utils.py → ...ogle/cloud/_system_test_utils/__init__.py b/system_tests/system_test_utils.py → ...ogle/cloud/_system_test_utils/__init__.py
@@ -66,5 +66,4 @@ def unique_resource_id(delimiter='_'):
     if build_id == '':
         return '%s%d' % (delimiter, 1000 * time.time())
     else:
-        return '%s%s%s%d' % (delimiter, build_id,
-                             delimiter, time.time())
+        return '%s%s%s%d' % (delimiter, build_id, delimiter, time.time())
diff --git a/system_tests/retry.py → .../google/cloud/_system_test_utils/retry.py b/system_tests/retry.py → .../google/cloud/_system_test_utils/retry.py
diff --git a/language/tests/__init__.py b/language/tests/__init__.py
diff --git a/system_tests/language.py → language/tests/system.py b/system_tests/language.py → language/tests/system.py
@@ -18,8 +18,8 @@
 from google.cloud import language
 from google.cloud import storage
 
-from system_test_utils import unique_resource_id
-from retry import RetryErrors
+from google.cloud._system_test_utils import unique_resource_id
+from google.cloud._system_test_utils.retry import RetryErrors
 
 
 class Config(object):

diff --git a/language/unit_tests/__init__.py → language/tests/unit/__init__.py b/language/unit_tests/__init__.py → language/tests/unit/__init__.py
diff --git a/language/unit_tests/test__http.py → language/tests/unit/test__http.py b/language/unit_tests/test__http.py → language/tests/unit/test__http.py
diff --git a/language/unit_tests/test_api_responses.py → language/tests/unit/test_api_responses.py b/language/unit_tests/test_api_responses.py → language/tests/unit/test_api_responses.py
diff --git a/language/unit_tests/test_client.py → language/tests/unit/test_client.py b/language/unit_tests/test_client.py → language/tests/unit/test_client.py
diff --git a/language/unit_tests/test_document.py → language/tests/unit/test_document.py b/language/unit_tests/test_document.py → language/tests/unit/test_document.py
diff --git a/language/unit_tests/test_entity.py → language/tests/unit/test_entity.py b/language/unit_tests/test_entity.py → language/tests/unit/test_entity.py
diff --git a/language/unit_tests/test_sentence.py → language/tests/unit/test_sentence.py b/language/unit_tests/test_sentence.py → language/tests/unit/test_sentence.py
diff --git a/language/unit_tests/test_sentiment.py → language/tests/unit/test_sentiment.py b/language/unit_tests/test_sentiment.py → language/tests/unit/test_sentiment.py
diff --git a/language/unit_tests/test_syntax.py → language/tests/unit/test_syntax.py b/language/unit_tests/test_syntax.py → language/tests/unit/test_syntax.py
diff --git a/language/tox.ini b/language/tox.ini
@@ -1,35 +1,58 @@
 [tox]
 envlist =
-    py27,py34,py35,cover
+  {py27,py34,py35,py36}-unit
+  {py27,py36}-system
+  lint
+  cover
 
-[testing]
-localdeps =
-    pip install --quiet --upgrade {toxinidir}/../core
-deps =
-    {toxinidir}/../core
-    mock
-    pytest
-covercmd =
-    py.test --quiet \
-      --cov=google.cloud.language \
-      --cov=unit_tests \
-      --cov-config {toxinidir}/.coveragerc \
-      unit_tests
 
 [testenv]
-commands =
-    {[testing]localdeps}
-    py.test --quiet {posargs} unit_tests
+basepython =
+  py27: python2.7
+  py34: python3.4
+  py35: python3.5
+  py36: python3.6
+
 deps =
-    {[testing]deps}
+  mock
+  pytest
+  pytest-cov
+  {toxinidir}/../core
+  system: {toxinidir}/../storage
+usedevelop = True
+
+commands =
+  unit: py.test --quiet \
+  unit:  --cov=google.cloud.language --cov tests.unit \
+  unit:  --cov-config {toxinidir}/.coveragerc \
+  unit:  --cov-append --cov-report= --cov-fail-under=97 \
+  unit:  tests/unit
+  system: py.test --quiet tests/system.py
+
+passenv =
+  CI_*
+  CIRCLE*
+  GOOGLE_*
+  TRAVIS*
+
 
 [testenv:cover]
-basepython =
-    python2.7
+basepython = python3.6
+deps =
+  coverage
+  pytest-cov
 commands =
-    {[testing]localdeps}
-    {[testing]covercmd}
+  coverage report --show-missing --fail-under=100
+  coverage erase
+
+
+[testenv:lint]
+basepython = python3.5
 deps =
-    {[testing]deps}
-    coverage
-    pytest-cov
+  pycodestyle
+  pylint
+changedir={toxinidir}/../
+usedevelop = False
+commands =
+  pycodestyle language/
+  pylint google.cloud.language