Merge pull request #226 from emmanvg/1.0.4-release

Final update for v1.0.4 release
2018-11-15 13:46:34 -05:00 · 2018-11-15 13:46:34 -05:00 · 84348b526d
parent 28d069a7f5 d01e6b47af
commit 84348b526d
4 changed files with 10 additions and 4 deletions
--- a/5
+++ b/5
@ -1,6 +1,11 @@
 CHANGELOG
 =========

+1.0.4 - 2018-11-15
+
+* #225 MemorySource fix to support custom objects
+* #212 More consistency in Observable extensions behavior/error messages
+
 1.0.3 - 2018-10-31

 * #187 Pickle proof objects
--- a/docs/conf.py
+++ b/docs/conf.py
@ -34,8 +34,8 @@ project = 'stix2'
 copyright = '2017, OASIS Open'
 author = 'OASIS Open'

-version = '1.0.3'
-release = '1.0.3'
+version = '1.0.4'
+release = '1.0.4'

 language = None
 exclude_patterns = ['_build', '_templates', 'Thumbs.db', '.DS_Store', 'guide/.ipynb_checkpoints']
--- a/setup.cfg
+++ b/setup.cfg
@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.3
+current_version = 1.0.4
 commit = True
 tag = True

@ -12,3 +12,4 @@ license_file = LICENSE

 [bdist_wheel]
 universal = 1
+
--- a/stix2/version.py
+++ b/stix2/version.py
@ -1 +1 @@
-__version__ = "1.0.3"
+__version__ = "1.0.4"