Skip to content

Commit

Permalink
Merge pull request #1657 from craig8/bump-5.0.1
Browse files Browse the repository at this point in the history
Bump version 5.0.1
  • Loading branch information
craig8 authored Apr 9, 2018
2 parents 05b6c46 + fd643d3 commit 29d076c
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
6 changes: 3 additions & 3 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,17 @@ 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
# |version| and |release|, also used in various other places throughout the
# 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.
Expand Down
3 changes: 2 additions & 1 deletion scripts/bacnet/proxy_grab_bacnet_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion services/core/VolttronCentral/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
'pymodbus>=1.2,<2',
'setuptools',
'simplejson>=3.3,<4',
'wheel>=0.24,<2',
'wheel==0.30',
]

install_requires = (
Expand Down
2 changes: 1 addition & 1 deletion volttron/platform/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
import psutil
import sys

__version__ = '5.0rc2'
__version__ = '5.0.1'


def set_home(home=None):
Expand Down

0 comments on commit 29d076c

Please sign in to comment.