[1/2] climate git commit: CLIMATE-794 - Update travis.yml

[ja...@apache.org]

Repository: climate
Updated Branches:
  refs/heads/master a04ce8247 -> 436855092


CLIMATE-794 - Update travis.yml

- Use easy-ocw script for build
- Track coverage
- Upload code coverage report to coveralls.io


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/fd17855a
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/fd17855a
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/fd17855a

Branch: refs/heads/master
Commit: fd17855ad00e49c04bee8b88603c8aa2ae7cceee
Parents: a04ce82
Author: Ibrahim <ja...@gmail.com>
Authored: Thu May 26 00:14:47 2016 +0530
Committer: Ibrahim <ja...@gmail.com>
Committed: Mon May 30 00:11:48 2016 +0530

----------------------------------------------------------------------
 .travis.yml | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/fd17855a/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 9fd9635..dca9987 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,20 +17,13 @@
 language: python
 python:
   - "2.7"
+notifications:
+   email: false
 install:
   - sudo apt-get update
-  - wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
-  - bash miniconda.sh -b -p $HOME/miniconda
-  - export PATH="$HOME/miniconda/bin:$PATH"
-  - hash -r
-  - conda config --set always_yes yes --set changeps1 no
-  - conda update -q conda
-  # Useful for debugging any issues with conda
-  - conda info -a
-  - sudo apt-get -y install python-dev
-  - sudo apt-get -y install python-pip
-  - conda install --file easy-ocw/ocw-conda-dependencies.txt
-  - pip install -r easy-ocw/ocw-pip-dependencies.txt
-  - python setup.py install
+  - source easy-ocw/install-ubuntu.sh
+  - pip install python-coveralls
 script:
-  - nosetests
+  - nosetests --with-coverage --cover-package=ocw --nocapture -v
+after_script:
+  - coveralls

[2/2] climate git commit: Remove __name__==__main__ from test coverage

[ja...@apache.org]

Remove __name__==__main__ from test coverage


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/43685509
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/43685509
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/43685509

Branch: refs/heads/master
Commit: 436855092b966a29305b64fd1859b9a0c275f73e
Parents: fd17855
Author: Ibrahim <ja...@gmail.com>
Authored: Mon May 30 13:17:21 2016 +0530
Committer: Ibrahim <ja...@gmail.com>
Committed: Mon Jun 13 22:54:27 2016 +0530

----------------------------------------------------------------------
 .coveragerc | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/43685509/.coveragerc
----------------------------------------------------------------------
diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 0000000..4e4a627
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+[report]
+exclude_lines = 
+    if __name__ == .__main__.: