diff --git a/docs/source/conf.py b/docs/source/conf.py index a02f377ff6..b30cc197d2 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.1' # The full version, including alpha/beta/rc tags. -release = u'5.0-rc2' +release = u'5.0.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. 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 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", diff --git a/setup.py b/setup.py index 8fc9a531f8..e25eb8b338 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 = ( diff --git a/volttron/platform/__init__.py b/volttron/platform/__init__.py index 13e286241c..7ac5bbbef2 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.1' def set_home(home=None):