Merge pull request #965 from jhaack/master

Merging develop into master

.gitignore

@@ -4,7 +4,9 @@
 *~
 .svn
 .metadata
-
+parser.out
+/.cache
+/.idea
 /env/
 /Agents/*/{build,dist}/
 /Agents/*.egg
@@ -15,3 +17,5 @@
 /build
 /configs/
 /config/
+/docs/build/*
+/docs/source/apidocs

.travis.yml

@@ -1,29 +1,32 @@
 language: python
 
-#sudo: false
+matrix:
+  include:
+    #precise with ones that don't include dist
+    - python: "2.7.6"
+      env: TOXENV=py276Precise
+      sudo: required
 
-#addons:
-#  apt:
-#    packages:
-#    - build-essential 
-#    - python-dev 
-#    - openssl 
-#    - libssl-dev 
-#    - libevent-dev
+    - python: "2.7.11"
+      env: TOXENV=py2711Precise
+      sudo: required
+      
+    - dist: trusty
+      env: TOXENV=py276Trusty
+      sudo: required
+      python: "2.7.6"
 
+    - dist: trusty
+      env: TOXENV=py2711Trusty
+      sudo: required
+      python: "2.7.11"
+
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y build-essential python-dev openssl libssl-dev libevent-dev
+  #- ./services/core/MongodbHistorian/tests/mongosetup.sh
 
-install: 
+install:
   - python2 bootstrap.py
 
-script: scripts/run-tests.sh
-
-#language: python
-#matrix:
-#  include:
-#    - python: "2.7"
-#      env: TEST_SUITE=suite_2_7
-# script: env/bin/python 
-
+script: ci-integration/run-tests.sh

COPYRIGHT

@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*- {{{
+# vim: set fenc=utf-8 ft=python sw=4 ts=4 sts=4 et:
+
+# Copyright (c) 2016, Battelle Memorial Institute
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# The views and conclusions contained in the software and documentation
+# are those of the authors and should not be interpreted as representing
+# official policies, either expressed or implied, of the FreeBSD
+# Project.
+#
+# This material was prepared as an account of work sponsored by an
+# agency of the United States Government.  Neither the United States
+# Government nor the United States Department of Energy, nor Battelle,
+# nor any of their employees, nor any jurisdiction or organization that
+# has cooperated in the development of these materials, makes any
+# warranty, express or implied, or assumes any legal liability or
+# responsibility for the accuracy, completeness, or usefulness or any
+# information, apparatus, product, software, or process disclosed, or
+# represents that its use would not infringe privately owned rights.
+#
+# Reference herein to any specific commercial product, process, or
+# service by trade name, trademark, manufacturer, or otherwise does not
+# necessarily constitute or imply its endorsement, recommendation, or
+# favoring by the United States Government or any agency thereof, or
+# Battelle Memorial Institute. The views and opinions of authors
+# expressed herein do not necessarily state or reflect those of the
+# United States Government or any agency thereof.
+#
+# PACIFIC NORTHWEST NATIONAL LABORATORY
+# operated by BATTELLE for the UNITED STATES DEPARTMENT OF ENERGY
+# under Contract DE-AC05-76RL01830
+# }}}

README.md

@@ -1,4 +1,4 @@
-# VOLTTRON
+![image](docs/source/images/volttron-webimage.jpg)
 
 Distributed Control System Platform.
 
@@ -62,12 +62,28 @@ To update the scripts after modifying `setup.py` or after a repository update,
 use the following command:
 
 ```sh
-  $ env/bin/python bootstrap.py
+(volttron) user@machine $ python bootstrap.py
 ```
 
 The bootstrap script creates a virtual Python environment, using virtualenv,
 and installs Volttron as an editable (or developer mode) package using pip.
 
+## Testing
+
+VOLTTRON uses py.test as a framework for executing tests.  py.test is not installed
+with the distribution by default.  To install py.test and it's dependencies
+execute the following:
+
+```
+(volttron) user@machine $ python bootstrap.py --testing
+```
+
+To run all of the tests in the volttron repository execute the following in the
+root directory:
+
+```
+(volttron) user@machine $ py.test
+```
 
 ## Configuration
 

TERMS.md

@@ -1,4 +1,4 @@
-Copyright (c) 2013, Battelle Memorial Institute
+Copyright (c) 2016, Battelle Memorial Institute
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without