Adding basic CircleCI configuration.

dhermes · dhermes · commit 8576e49cea9f · 2016-11-07T16:38:47.000-08:00
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,7 @@ script:
   - scripts/update_docs.sh
 
 after_success:
-  - scripts/travis_coveralls.sh
+  - scripts/coveralls.sh
 
 cache:
   directories:
diff --git a/circle.yml b/circle.yml
@@ -0,0 +1,23 @@
+dependencies:
+  override:
+    - pip install --upgrade pip tox tox-pyenv
+    # latest as of Nov. 7, 2016: 2.7.12, 3.4.5, 3.5.2
+    - pyenv local 2.7.12 3.4.4 3.5.2
+
+test:
+  override:
+    - python2.7 scripts/run_unit_tests.py
+    - python3.4 scripts/run_unit_tests.py
+    - 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
+  post:
+    - scripts/coveralls.sh
+
+general:
+  branches:
+    ignore:
+      - gh-pages
diff --git a/docs/logging_snippets.py b/docs/logging_snippets.py
@@ -365,5 +365,6 @@ def main():
         for item in to_delete:
             _backoff_not_found(item.delete)
 
+
 if __name__ == '__main__':
     main()
diff --git a/scripts/coveralls.sh b/scripts/coveralls.sh
@@ -16,14 +16,19 @@
 
 set -ev
 
-##################################################
-# Only run coveralls during a Travis push build. #
-##################################################
+#############################################################
+# Only run coveralls during a CircleCI / Travis push build. #
+#############################################################
 if [[ "${TRAVIS_BRANCH}" == "master" ]] && \
        [[ "${TRAVIS_PULL_REQUEST}" == "false" ]]; then
-  echo "Sending coverage report on a merge to master."
-  tox -e coveralls
+  echo "Sending coverage report on a Travis merge to master."
+elif [[ "${CIRCLECI}" == "true" ]] && \
+       [[ "${CIRCLE_BRANCH}" == "master" ]] && \
+       [[ "${CI_PULL_REQUEST}" == "" ]]; then
+  echo "Sending coverage report on a CircleCI merge to master."
 else
   echo "Not on a push build for master, skipping coveralls."
   exit
 fi
+
+tox -e coveralls
diff --git a/system_tests/system_test_utils.py b/system_tests/system_test_utils.py
@@ -61,7 +61,8 @@ def unique_resource_id(delimiter='_'):
     Intended to help locate resources created in particular
     testing environments and at particular times.
     """
-    build_id = os.getenv('TRAVIS_BUILD_ID', '')
+    build_id = os.getenv(
+        'TRAVIS_BUILD_ID', os.getenv('CIRCLE_BUILD_NUM', ''))
     if build_id == '':
         return '%s%d' % (delimiter, 1000 * time.time())
     else:
diff --git a/tox.ini b/tox.ini
@@ -128,7 +128,7 @@ skip_install =
     py34: True
     py35: True
     cover: True
-passenv = TRAVIS* GOOGLE_CLOUD_*
+passenv = CI_* CIRCLE* TRAVIS* GOOGLE_CLOUD_*
 
 [testenv:cover]
 commands =
@@ -229,7 +229,7 @@ commands =
     python {toxinidir}/system_tests/attempt_system_tests.py {posargs}
 deps =
     {[testing]deps}
-passenv = GOOGLE_* TRAVIS* encrypted_*
+passenv = CI_* CIRCLE* GOOGLE_* TRAVIS* encrypted_*
 
 [testenv:system-tests3]
 basepython =
