Prep for 1.2.0 release

NASA-AMMOS · Sep 11, 2018 · 2a73b49 · 2a73b49
1 parent 3b857b1
commit 2a73b49
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Change Log
 
+## [1.2.0](https://github.com/NASA-AMMOS/AIT-GUI/tree/1.2.0) (2018-09-11)
+[Full Changelog](https://github.com/NASA-AMMOS/AIT-GUI/compare/1.1.0...1.2.0)
+
+**Closed issues:**
+
+- Add EVR message formatting to mirror Core functionality [\#85](https://github.com/NASA-AMMOS/AIT-GUI/issues/85)
+- Telemetry monitoring greenlet exception raise regressed [\#84](https://github.com/NASA-AMMOS/AIT-GUI/issues/84)
+- Command Browser requires subsystem attribute to function properly [\#82](https://github.com/NASA-AMMOS/AIT-GUI/issues/82)
+
+**Merged pull requests:**
+
+- Issue \#84 - Fix greenlet exception raise bug in telem monitoring code [\#87](https://github.com/NASA-AMMOS/AIT-GUI/pull/87) ([MJJoyce](https://github.com/MJJoyce))
+- Issue \#85 - Add support for EVR message formatting [\#86](https://github.com/NASA-AMMOS/AIT-GUI/pull/86) ([MJJoyce](https://github.com/MJJoyce))
+- Issue \#82 - Add commands without subsystem to default subsystem group [\#83](https://github.com/NASA-AMMOS/AIT-GUI/pull/83) ([MJJoyce](https://github.com/MJJoyce))
+
 ## [1.1.0](https://github.com/NASA-AMMOS/AIT-GUI/tree/1.1.0) (2018-07-16)
 [Full Changelog](https://github.com/NASA-AMMOS/AIT-GUI/compare/1.0.0...1.1.0)
 

diff --git a/ait/gui/static/build/ait.bundle.css b/ait/gui/static/build/ait.bundle.css
diff --git a/ait/gui/static/build/ait.bundle.js b/ait/gui/static/build/ait.bundle.js
diff --git a/ait/gui/static/package.json b/ait/gui/static/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ait-gui",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "AIT GUI",
   "main": "index.js",
   "scripts": {

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -70,9 +70,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'1.1.0'
+version = u'1.2.0'
 # The full version, including alpha/beta/rc tags.
-release = u'1.1.0'
+release = u'1.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -85,7 +85,7 @@ def run(self):
 
 setup(
     name = 'ait-gui',
-    version = '1.1.0',
+    version = '1.2.0',
     description = description,
     long_description = long_description,
     long_description_content_type = 'text/x-rst',
@@ -97,7 +97,7 @@ def run(self):
     namespace_packages   = ['ait'],
     include_package_data = True,
 
-    install_requires = ['ait-core>=0.37.0'],
+    install_requires = ['ait-core>=1.2.0'],
     extras_require = {
         'docs':  [
             'Sphinx==1.7.2',