Merge pull request #1372 from VOLTTRON/releasing-4.1

Releasing 4.1

.gitignore

@@ -5,8 +5,10 @@
 .svn
 .metadata
 parser.out
-/.cache
-/.idea
+node_modules
+applications
+.cache
+.idea
 /env/
 /Agents/*/{build,dist}/
 /Agents/*.egg

.travis.yml

@@ -24,9 +24,22 @@ matrix:
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y build-essential python-dev openssl libssl-dev libevent-dev
+  - sudo bash -c "$(curl -L install.crate.io)"
+
   #- ./services/core/MongodbHistorian/tests/mongosetup.sh
 
 install:
   - python2 bootstrap.py
+  # Installs testing toolkit
+  #- python2 bootstrap.py --crate
+  - python2 bootstrap.py --testing
 
 script: ci-integration/run-tests.sh
+
+notifications:
+  slack: volttron-team:EgnBsUcQ98b75kU59tV8TnEa
+
+addons:
+  apt:
+    packages:
+        - oracle-java8-installer

COPYRIGHT

@@ -1,6 +1,3 @@
-# -*- 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.
 #
@@ -27,30 +24,3 @@
 # (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

@@ -61,7 +61,7 @@ Results in:
 
 ```sh
 2016-10-17 18:17:52,245 (listeneragent-3.2 11367) listener.agent INFO: Peer: 'pubsub', Sender: 'listeneragent-3.2_1'
-:, Bus: u'', Topic: 'heartbeat/ListenerAgent/f230df97-658e-45d3-8165-18a2ec834d3f', Headers:
+:, Bus: u'', Topic: 'heartbeat/listeneragent-3.2_1', Headers:
 {'Date': '2016-10-18T01:17:52.239724+00:00', 'max_compatible_version': u'', 'min_compatible_version': '3.0'},
 Message: {'status': 'GOOD', 'last_updated': '2016-10-18T01:17:47.232972+00:00', 'context': 'hello'}
 ```

TERMS.md

@@ -1,52 +1,4 @@
-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
+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

ci-integration/run-tests.sh

@@ -3,22 +3,34 @@
 export CI=travis
 export FAST_FAIL=1
 
-# The context should already have been activated at this point.
 
+# The context should already have been activated at this point.
 #pip install pymongo pytest pytest-bdd pytest-cov
-pip install mock
-pip install pytest pytest-timeout
+#pip install mock --upgrade
+#pip install pytest pytest-timeout --upgrade
+
+pip list
 
 exit_code=0
 
 # Break up the tests to work around the issue in #754. Breaking them up allows 
 # the files to be closed with the individual pytest processes
-
+echo "Current Environment of Execution"
+ls -la
+echo "PATH"
+echo "$PATH"
+echo "PYTHONPATH"
+echo "$PYTHONPATH"
+echo "VOLTTRON is at"
+which volttron
+which volttron-ctl
+echo "python is at"
+which python
 
 #directories that need split into individual files
 filedirs="volttrontesting/platform"
 #directories that can be called as normal (recursive)
-testdirs="docs examples scripts volttron volttrontesting/gevent volttrontesting/multiplatform volttrontesting/subsystems volttrontesting/testutils volttrontesting/zmq"
+testdirs="services/core/VolttronCentral/tests services/core/VolttronCentralPlatform/tests docs examples scripts volttron volttrontesting/gevent volttrontesting/multiplatform volttrontesting/subsystems volttrontesting/testutils volttrontesting/zmq"
 #directories that must have their subdirectories split
 splitdirs="services/core/*"
 
@@ -43,22 +55,29 @@ done
 echo "SplitDirs"
 for dir in $splitdirs; do
 
-for D in $dir; do
-    if [ -d "${D}" ]; then
-  echo "*********SPLITDIR: $D"
-        py.test -s -v ${D}
-        tmp_code=$?
-        if [ $tmp_code -ne 0 ]; then
-          if [ $tmp_code -ne 5 ]; then
-            if [ ${FAST_FAIL} ]; then
-              echo "Fast failing!"
-              exit $tmp_code
+    for D in $dir; do
+        for p in $testdirs; do
+            if [ "$p" == "$d" ]; then
+                echo "ALREADY TESTED DIR: $p";
+                continue;
+            fi;
+        done
+
+        if [ -d "${D}" ]; then
+            echo "*********SPLITDIR: $D"
+            py.test -s -v ${D}
+            tmp_code=$?
+            if [ $tmp_code -ne 0 ]; then
+              if [ $tmp_code -ne 5 ]; then
+                if [ ${FAST_FAIL} ]; then
+                  echo "Fast failing!"
+                  exit $tmp_code
+                fi
+                exit_code=$tmp_code
+              fi
             fi
-            exit_code=$tmp_code
-          fi
         fi
-    fi
-done
+    done
 done
 
 echo "File tests"

docs/Makefile

@@ -6,6 +6,7 @@ SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = build
+SOURCEDIR     = source
 
 # User-friendly check for sphinx-build
 ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
@@ -49,7 +50,7 @@ help:
 
 .PHONY: clean
 clean:
-	rm -rf $(BUILDDIR)/*
+	rm -rf $(BUILDDIR)/* $(SOURCEDIR)/apidocs
 
 .PHONY: html
 html:

docs/requirements.txt

@@ -6,3 +6,4 @@ zmq
 ply
 psutil
 pymongo
+mysql-connector-python-rf