From 5492083fcfa670b9c2fe9eaca14f097e6c457a51 Mon Sep 17 00:00:00 2001 From: Craig Date: Fri, 30 Mar 2018 10:30:19 -0700 Subject: [PATCH 1/7] Update package.json Getting rid of the security issue warning for github --- services/core/VolttronCentral/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/VolttronCentral/package.json b/services/core/VolttronCentral/package.json index 50e9dddea6..f193ff2cb3 100644 --- a/services/core/VolttronCentral/package.json +++ b/services/core/VolttronCentral/package.json @@ -40,7 +40,7 @@ "font-awesome": "^4.6.3", "history": "^3.0.0", "immutable": "^3.8.1", - "jquery": "^2.1.3", + "jquery": "^3.0.0", "keymirror": "^0.1.1", "moment": "^2.10.3", "node-uuid": "^1.4.2", From 4262b4964af4c82149f189ea86795abb94104a5a Mon Sep 17 00:00:00 2001 From: Craig Date: Fri, 30 Mar 2018 10:36:37 -0700 Subject: [PATCH 2/7] Update package.json Fixed nonsense for jquery --- services/core/VolttronCentral/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/VolttronCentral/package.json b/services/core/VolttronCentral/package.json index 50e9dddea6..f193ff2cb3 100644 --- a/services/core/VolttronCentral/package.json +++ b/services/core/VolttronCentral/package.json @@ -40,7 +40,7 @@ "font-awesome": "^4.6.3", "history": "^3.0.0", "immutable": "^3.8.1", - "jquery": "^2.1.3", + "jquery": "^3.0.0", "keymirror": "^0.1.1", "moment": "^2.10.3", "node-uuid": "^1.4.2", From 2864f3de6140add6612cd81aea91f98f63e7dc82 Mon Sep 17 00:00:00 2001 From: Craig A Date: Wed, 4 Apr 2018 10:19:06 -0700 Subject: [PATCH 3/7] Fixes #1652 Downgraded wheel to 0.30 as 0.31 broke agent installation. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8fc9a531f8..d699fa4e35 100644 --- a/setup.py +++ b/setup.py @@ -81,7 +81,7 @@ 'pymodbus>=1.2,<2', 'setuptools', 'simplejson>=3.3,<4', - 'wheel>=0.24,<2', + 'wheel=0.30', ] install_requires = ( From 8579aa9e8d0cbc0c6eec4de04035ec99ef74d82b Mon Sep 17 00:00:00 2001 From: Craig A Date: Wed, 4 Apr 2018 10:40:11 -0700 Subject: [PATCH 4/7] Bumped version numbers from rc to 5.0 --- docs/source/conf.py | 6 +++--- volttron/platform/__init__.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index a02f377ff6..8d7726d493 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -70,7 +70,7 @@ def __getattr__(cls, name): # General information about the project. project = u'VOLTTRON' -copyright = u'2017, Battelle Memorial Institute' +copyright = u'2018, Battelle Memorial Institute' author = u'The VOLTTRON Developer Team' # The version info for the project you're documenting, acts as replacement for @@ -78,9 +78,9 @@ def __getattr__(cls, name): # built documents. # # The short X.Y version. -version = u'5.0-rc2' +version = u'5.0' # The full version, including alpha/beta/rc tags. -release = u'5.0-rc2' +release = u'5.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/volttron/platform/__init__.py b/volttron/platform/__init__.py index 13e286241c..fdd93ac8a4 100644 --- a/volttron/platform/__init__.py +++ b/volttron/platform/__init__.py @@ -44,7 +44,7 @@ import psutil import sys -__version__ = '5.0rc2' +__version__ = '5.0' def set_home(home=None): From 98c77d35f319ee0fa901650f40cb61732e2136e5 Mon Sep 17 00:00:00 2001 From: Craig A Date: Wed, 4 Apr 2018 10:49:42 -0700 Subject: [PATCH 5/7] Should be == --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d699fa4e35..e25eb8b338 100644 --- a/setup.py +++ b/setup.py @@ -81,7 +81,7 @@ 'pymodbus>=1.2,<2', 'setuptools', 'simplejson>=3.3,<4', - 'wheel=0.30', + 'wheel==0.30', ] install_requires = ( From 618be680d0035d6657fb621d0eeb995cf25cf7f3 Mon Sep 17 00:00:00 2001 From: Thibaud Nesztler Date: Fri, 6 Apr 2018 15:20:19 +0200 Subject: [PATCH 6/7] import build_agent from utils.py --- scripts/bacnet/proxy_grab_bacnet_config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/bacnet/proxy_grab_bacnet_config.py b/scripts/bacnet/proxy_grab_bacnet_config.py index 61dcac954a..914f29ad58 100644 --- a/scripts/bacnet/proxy_grab_bacnet_config.py +++ b/scripts/bacnet/proxy_grab_bacnet_config.py @@ -53,7 +53,8 @@ from volttron.platform.agent.bacnet_proxy_reader import BACnetReader from volttron.platform.keystore import KeyStore from volttron.platform.messaging import topics -from volttron.platform.vip.agent import Agent, PubSub, errors, build_agent +from volttron.platform.vip.agent import Agent, PubSub, errors +from volttron.platform.vip.agent.utils import build_agent from volttron.platform.jsonrpc import RemoteError From fd643d396b5215119d5837f328c58eabecd44b1f Mon Sep 17 00:00:00 2001 From: Craig Allwardt Date: Mon, 9 Apr 2018 12:02:00 -0700 Subject: [PATCH 7/7] Bump version 5.0.1 --- docs/source/conf.py | 4 ++-- volttron/platform/__init__.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 8d7726d493..b30cc197d2 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -78,9 +78,9 @@ def __getattr__(cls, name): # built documents. # # The short X.Y version. -version = u'5.0' +version = u'5.0.1' # The full version, including alpha/beta/rc tags. -release = u'5.0' +release = u'5.0.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/volttron/platform/__init__.py b/volttron/platform/__init__.py index fdd93ac8a4..7ac5bbbef2 100644 --- a/volttron/platform/__init__.py +++ b/volttron/platform/__init__.py @@ -44,7 +44,7 @@ import psutil import sys -__version__ = '5.0' +__version__ = '5.0.1' def set_home(home=None):