=
							
						 
						
							 
							
							
							
								
							
								333fea4d18 
								
							
								 
							
						 
						
							
							
								
								merge conflicts  
							
							 
							
							
							
						 
						
							2018-04-11 21:08:37 -04:00  
						
					 
				
					
						
							
							
								 
								=
							
						 
						
							 
							
							
							
								
							
								ba6fa595c6 
								
							
								 
							
						 
						
							
							
								
								WIP - finding more issues with allowing dicts as filters  
							
							 
							
							
							
						 
						
							2018-04-11 20:54:16 -04:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								3e048ef325 
								
							
								 
							
						 
						
							
							
								
								Fix deprecated 3.6 backslash-character pairs  
							
							 
							
							... 
							
							
							
							(https://docs.python.org/3/whatsnew/3.6.html#deprecated-python-behavior ) 
							
						 
						
							2018-04-11 15:46:17 -04:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								1d22c757ef 
								
							
								 
							
						 
						
							
							
								
								Improve Tox test harness  
							
							 
							
							... 
							
							
							
							- No need for both pycodestyle and flake8; flake8 includes the former.
- Use the proper pytest invocation. 
							
						 
						
							2018-04-11 15:40:52 -04:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								76f1474a8b 
								
							
								 
							
						 
						
							
							
								
								Pin sphinx version for ReadTheDocs  
							
							 
							
							... 
							
							
							
							See also: https://github.com/rtfd/readthedocs.org/issues/3148  
							
						 
						
							2018-04-11 14:43:44 -04:00  
						
					 
				
					
						
							
							
								 
								=
							
						 
						
							 
							
							
							
								
							
								27647091a5 
								
							
								 
							
						 
						
							
							
								
								WIP - just at stash point  
							
							 
							
							
							
						 
						
							2018-04-11 13:36:52 -04:00  
						
					 
				
					
						
							
							
								 
								Greg Back
							
						 
						
							 
							
							
								
								
							
							
								
							
								86b5d8408c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #160  from oasis-open/159-custom-consistency  
							
							 
							
							... 
							
							
							
							Ensure consistency with custom Observable content 
							
						 
						
							2018-04-11 09:00:08 -05:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
								
								
							
							
								
							
								af84948659 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #158  from oasis-open/137-docs-review  
							
							 
							
							... 
							
							
							
							Documentation Review 
							
						 
						
							2018-04-10 13:11:24 -04:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								b633fd3785 
								
							
								 
							
						 
						
							
							
								
								WIP: Allow custom observables, extensions  
							
							 
							
							
							
						 
						
							2018-04-10 12:54:27 -04:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								5c5ca1f21c 
								
							
								 
							
						 
						
							
							
								
								Move 'extensions' property to custom Observables  
							
							 
							
							... 
							
							
							
							... from custom Observable extensions (an extension doesn't need an
'extensions' property). 
							
						 
						
							2018-04-09 15:35:08 -04:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								b851afba01 
								
							
								 
							
						 
						
							
							
								
								Req. custom extension properties as list of tuples  
							
							 
							
							
							
						 
						
							2018-04-09 15:34:39 -04:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								f83d9a56b5 
								
							
								 
							
						 
						
							
							
								
								Clean up documentation  
							
							 
							
							
							
						 
						
							2018-04-09 13:29:53 -04:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								1d06e642a4 
								
							
								 
							
						 
						
							
							
								
								Bump and pin nbsphinx version  
							
							 
							
							
							
						 
						
							2018-04-09 09:55:29 -04:00  
						
					 
				
					
						
							
							
								 
								Emmanuelle Vargas-Gonzalez
							
						 
						
							 
							
							
							
								
							
								4d35cc6f28 
								
							
								 
							
						 
						
							
							
								
								WIP: Update tox.ini  
							
							 
							
							
							
						 
						
							2018-04-06 14:25:06 -04:00  
						
					 
				
					
						
							
							
								 
								Emmanuelle Vargas-Gonzalez
							
						 
						
							 
							
							
							
								
							
								1ff640de3c 
								
							
								 
							
						 
						
							
							
								
								Moved some test methods here  
							
							 
							
							
							
						 
						
							2018-04-06 14:24:15 -04:00  
						
					 
				
					
						
							
							
								 
								Emmanuelle Vargas-Gonzalez
							
						 
						
							 
							
							
							
								
							
								cd85683f2b 
								
							
								 
							
						 
						
							
							
								
								WIP: Cleaned test_datastore to only include base store tests  
							
							 
							
							
							
						 
						
							2018-04-06 14:23:48 -04:00  
						
					 
				
					
						
							
							
								 
								Emmanuelle Vargas-Gonzalez
							
						 
						
							 
							
							
							
								
							
								0d1729bbd7 
								
							
								 
							
						 
						
							
							
								
								Deleted test_filesystem in favor of test_datastore_filesystem.py  
							
							 
							
							
							
						 
						
							2018-04-06 14:20:39 -04:00  
						
					 
				
					
						
							
							
								 
								Emmanuelle Vargas-Gonzalez
							
						 
						
							 
							
							
							
								
							
								80e4706ac4 
								
							
								 
							
						 
						
							
							
								
								Add some test objs previously in test_datastore.py  
							
							 
							
							
							
						 
						
							2018-04-06 14:19:51 -04:00  
						
					 
				
					
						
							
							
								 
								Emmanuelle Vargas-Gonzalez
							
						 
						
							 
							
							
							
								
							
								c2e7cbb3e3 
								
							
								 
							
						 
						
							
							
								
								Moved from test_datastore.py -> new file test_datastore_taxii.py  
							
							 
							
							
							
						 
						
							2018-04-06 14:18:05 -04:00  
						
					 
				
					
						
							
							
								 
								Emmanuelle Vargas-Gonzalez
							
						 
						
							 
							
							
							
								
							
								59ff0c4f26 
								
							
								 
							
						 
						
							
							
								
								Moved from test_datastore.py -> new file test_datastore_memory.py  
							
							 
							
							
							
						 
						
							2018-04-06 14:17:49 -04:00  
						
					 
				
					
						
							
							
								 
								Emmanuelle Vargas-Gonzalez
							
						 
						
							 
							
							
							
								
							
								5c4472cbbd 
								
							
								 
							
						 
						
							
							
								
								Moved from test_datastore.py -> new file test_datastore_filters.py  
							
							 
							
							
							
						 
						
							2018-04-06 14:17:19 -04:00  
						
					 
				
					
						
							
							
								 
								Emmanuelle Vargas-Gonzalez
							
						 
						
							 
							
							
							
								
							
								8f58f29358 
								
							
								 
							
						 
						
							
							
								
								Moved from test_datastore.py -> new file test_datastore_filesystem.py  
							
							 
							
							
							
						 
						
							2018-04-06 14:16:04 -04:00  
						
					 
				
					
						
							
							
								 
								Greg Back
							
						 
						
							 
							
							
								
								
							
							
								
							
								f5d64279e0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #156  from oasis-open/105-docs-label-out  
							
							 
							
							... 
							
							
							
							Ensure all guide doc output cells have "Out [#]:" label 
							
						 
						
							2018-04-05 16:28:35 -05:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								5791810906 
								
							
								 
							
						 
						
							
							
								
								Ensure all guide doc output cells have [Out] label  
							
							 
							
							... 
							
							
							
							Fixes  #105 . 
							
						 
						
							2018-04-05 16:44:44 -04:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								e6e72856b3 
								
							
								 
							
						 
						
							
							
								
								Remove query_by_type()  
							
							 
							
							... 
							
							
							
							Missed these earlier. 
							
						 
						
							2018-04-05 11:22:50 -04:00  
						
					 
				
					
						
							
							
								 
								Greg Back
							
						 
						
							 
							
							
								
								
							
							
								
							
								a1ad90d43f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #150  from oasis-open/38-workbench  
							
							 
							
							... 
							
							
							
							Create Workbench layer 
							
						 
						
							2018-04-05 10:09:23 -05:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								e3bbc39353 
								
							
								 
							
						 
						
							
							
								
								Fix bug with mutable default parameter  
							
							 
							
							
							
						 
						
							2018-04-05 10:07:35 -04:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								589c00064b 
								
							
								 
							
						 
						
							
							
								
								Remove query_by_type  
							
							 
							
							... 
							
							
							
							It's not that much of a shortcut and we can add it back in later if it
makes sense. 
							
						 
						
							2018-04-04 14:09:54 -04:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								f951b9b09e 
								
							
								 
							
						 
						
							
							
								
								Factor out dupl. code for creating list of filters  
							
							 
							
							
							
						 
						
							2018-04-04 13:50:41 -04:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
								
								
							
							
								
							
								9a50f54ec4 
								
									
								
							
								 
							
						 
						
							
							
								
								Update README.rst  
							
							 
							
							... 
							
							
							
							Fix line break in usage example 
							
						 
						
							2018-04-04 12:12:09 -04:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								a1af05a14e 
								
							
								 
							
						 
						
							
							
								
								Warn against using workbench with the rest of lib  
							
							 
							
							... 
							
							
							
							Doing so may cause issues because the workbench overwrites the STIX
Object mapping. 
							
						 
						
							2018-04-04 09:47:48 -04:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
								
								
							
							
								
							
								1536857b19 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #155  from oasis-open/emmanvg-patch-1  
							
							 
							
							... 
							
							
							
							Update README.rst 
							
						 
						
							2018-04-04 08:48:32 -04:00  
						
					 
				
					
						
							
							
								 
								Emmanuelle Vargas-Gonzalez
							
						 
						
							 
							
							
								
								
							
							
								
							
								fe1852d41e 
								
									
								
							
								 
							
						 
						
							
							
								
								Update README.rst  
							
							 
							
							... 
							
							
							
							Update broken banners for Build_Status, Coverage and Version 
							
						 
						
							2018-04-04 05:48:32 -04:00  
						
					 
				
					
						
							
							
								 
								Greg Back
							
						 
						
							 
							
							
								
								
							
							
								
							
								f61bc5e5ee 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #154  from oasis-open/code-coverage  
							
							 
							
							... 
							
							
							
							Increase code coverage, fix patterning bugs 
							
						 
						
							2018-04-03 15:11:15 -05:00  
						
					 
				
					
						
							
							
								 
								Greg Back
							
						 
						
							 
							
							
								
								
							
							
								
							
								537dff9d2a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #153  from oasis-open/118-allow-generic-obj  
							
							 
							
							... 
							
							
							
							118-allow generic obj and 135- split up parse() 
							
						 
						
							2018-04-03 15:06:25 -05:00  
						
					 
				
					
						
							
							
								 
								Robin Cover
							
						 
						
							 
							
							
							
								
							
								d5bcc902cc 
								
							
								 
							
						 
						
							
							
								
								fixup program name w/ 'TC' to OASIS TC Open Repo...  
							
							 
							
							
							
						 
						
							2018-04-03 11:20:43 -05:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								dd8f0f5c72 
								
							
								 
							
						 
						
							
							
								
								Increase code coverage slightly  
							
							 
							
							... 
							
							
							
							An Environment will always have a CompositeDataSource, so there was no way
those exceptions could get raised. 
							
						 
						
							2018-04-02 16:44:57 -04:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								3abfe7868a 
								
							
								 
							
						 
						
							
							
								
								Add more patterning tests  
							
							 
							
							... 
							
							
							
							... and fix bugs detected in doing so 
							
						 
						
							2018-04-02 16:38:04 -04:00  
						
					 
				
					
						
							
							
								 
								Greg Back
							
						 
						
							 
							
							
								
								
							
							
								
							
								8fd9fa92bc 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #152  from emmanvg/remove-taxii-requirement  
							
							 
							
							... 
							
							
							
							Update stix2 setup configuration 
							
						 
						
							2018-04-02 13:42:52 -05:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
								
								
							
							
								
							
								81e5fdd4cc 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #151  from emmanvg/memory-store-typo  
							
							 
							
							... 
							
							
							
							Fix on MemorySource.load_from_file() 
							
						 
						
							2018-04-02 10:21:22 -04:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								940afb0012 
								
							
								 
							
						 
						
							
							
								
								Require a type when querying by type  
							
							 
							
							
							
						 
						
							2018-04-02 09:54:22 -04:00  
						
					 
				
					
						
							
							
								 
								Emmanuelle Vargas-Gonzalez
							
						 
						
							 
							
							
							
								
							
								470b3ec092 
								
							
								 
							
						 
						
							
							
								
								Update setup.py to include taxii2-client as an extra dependency  
							
							 
							
							
							
						 
						
							2018-04-02 09:25:26 -04:00  
						
					 
				
					
						
							
							
								 
								Emmanuelle Vargas-Gonzalez
							
						 
						
							 
							
							
							
								
							
								c518533275 
								
							
								 
							
						 
						
							
							
								
								Update stix2 setup configuration  
							
							 
							
							... 
							
							
							
							# Remove taxii2-client as a requirement to install stix2
# Add taxii2-client to the Tox configuration instead
# Re-factor the version and description loading 
							
						 
						
							2018-04-02 07:51:51 -04:00  
						
					 
				
					
						
							
							
								 
								Emmanuelle Vargas-Gonzalez
							
						 
						
							 
							
							
							
								
							
								0bb1bb37f1 
								
							
								 
							
						 
						
							
							
								
								Call parse() on stix_data  
							
							 
							
							... 
							
							
							
							# Fix on MemorySource.load_from_file() 
							
						 
						
							2018-04-02 07:40:25 -04:00  
						
					 
				
					
						
							
							
								 
								=
							
						 
						
							 
							
							
							
								
							
								90834c5b95 
								
							
								 
							
						 
						
							
							
								
								docs and tests for parse() mod  
							
							 
							
							
							
						 
						
							2018-03-30 13:21:07 -04:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								d453bf6f1a 
								
							
								 
							
						 
						
							
							
								
								Add a couple granular markings tests  
							
							 
							
							
							
						 
						
							2018-03-30 13:12:51 -04:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								4a2ac6df3a 
								
							
								 
							
						 
						
							
							
								
								Add/fix workbench docs, rename add() -> save()  
							
							 
							
							
							
						 
						
							2018-03-30 12:04:31 -04:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								98cc86eef6 
								
							
								 
							
						 
						
							
							
								
								Fix workbench wrapped classes for `parse()`.  
							
							 
							
							... 
							
							
							
							The wrapped classes need to be in the OBJ_MAP mapping, not just the
workbench.py globals. 
							
						 
						
							2018-03-30 12:04:31 -04:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								b9bbd03481 
								
							
								 
							
						 
						
							
							
								
								Update workbench imports and documentation  
							
							 
							
							... 
							
							
							
							Import a bunch of stuff so users can just "from stix2.workbench import *" and
not need to import other stuff (e.g. MarkingDefinition, Cyber Observable
Object classes, etc.) from stix2. 
							
						 
						
							2018-03-30 12:04:31 -04:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								efede51453 
								
							
								 
							
						 
						
							
							
								
								Skip documenting some workbench stuff  
							
							 
							
							
							
						 
						
							2018-03-30 12:04:31 -04:00