Commit Graph

1339 Commits (0f0bc426818ded7497eace138c25d631fad34420)

Author SHA1 Message Date
chrisr3d 0f0bc42681
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 2020-03-02 15:31:39 +01:00
Chris Lenk c2b71672f5
Merge pull request #348 from khdesai/fix_issue_334
Fixes #334
2020-02-21 16:35:18 -05:00
Desai, Kartikey H a0a8b7d0e1 Fixes #334 2020-02-21 15:40:38 -05:00
Desai, Kartikey H 796a4e20fa Correct bug in recursive dict loop. Fixes #334 2020-02-21 15:26:19 -05:00
Chris Lenk 148d672b24
Merge pull request #346 from khdesai/fix_issue_336
Fixes #336 (some SCO _refs properties no longer deprecated)
2020-02-21 11:51:29 -05:00
Desai, Kartikey H 1084c75d33 Fixes #334 2020-02-19 16:29:13 -05:00
Desai, Kartikey H 8219b34ea4 Fix formatting issues. Fixes #336 2020-02-19 09:24:27 -05:00
Desai, Kartikey H 86f9e51a42 Fixes #336 2020-02-19 09:11:30 -05:00
Chris Lenk 8aca39a0b0
Merge pull request #342 from chisholm/sco_tlo_memorystore
Fix the memory store to support the new top-level 2.1 SCOs.
2020-02-14 10:16:06 -05:00
Michael Chisholm be5274878d Add trailing commas for pre-commit hook... 2020-02-13 17:37:59 -05:00
Michael Chisholm 98a654884d Fix the memory store to support the new top-level 2.1 SCOs. 2020-02-13 17:11:58 -05:00
Chris Lenk fdb00c4a8c
Merge pull request #337 from chisholm/improve_stix_version_detection
Fix STIX version detection from dicts
2020-02-13 14:53:03 -05:00
Michael Chisholm f86b6e8a66 More add-trailing-comma junk, which is not done by the python 3.8
pre-commit add-trailing-comma library.  Hopefully this satisfies
the travis tests for other versions of python!
2020-02-07 19:15:59 -05:00
Michael Chisholm bf83ca62b3 Add trailing commas for the pre-commit hook...... 2020-02-07 18:58:45 -05:00
Michael Chisholm 19707677c9 Fix STIX version detection from dicts. In particular, 2.1 SCOs
without the spec_version property ought to be correctly detected
as 2.1 now.
2020-02-07 18:17:12 -05:00
chrisr3d 5aaf07702d Merge branch 'master' of github.com:oasis-open/cti-python-stix2 2020-02-05 21:18:14 +01:00
Chris Lenk c96b74294a
Merge pull request #331 from chisholm/remove_values_workaround
Remove workaround for "values" being both a Mapping method name and STIX property name
2020-02-04 10:39:42 -05:00
Michael Chisholm c6b2b6fbfa Change the warning in the jupyter notebook for creating content,
regarding name collisions between method and property names, to
not pick on the Mapping methods specifically.  The problem is
more general than that: stix objects have more methods than those.
Instead of listing them all out, a more general statement is
made, that accessing those attributes will result in a bound
method, not a STIX property value.
2020-02-03 16:51:12 -05:00
chrisr3d dece917a68 Merge branch 'master' of github.com:oasis-open/cti-python-stix2 2020-01-31 11:38:26 +01:00
Michael Chisholm 1cadeaa1c6 Added a warning to creating.ipynb about Mapping attributes: they
can't be used to access STIX object properties.
2020-01-29 16:01:15 -05:00
Michael Chisholm 176cb980a2 Remove workaround for "values" being both a Mapping method name
and sometimes a STIX property name.  It didn't work (caused
crashes under some circumstances).  Now, attributes whose names
conflict with Mapping methods will have the Mapping
interpretation.  Same-named STIX object properties will not be
accessible as attributes.
2020-01-28 18:13:36 -05:00
Chris Lenk 7c186b0a06 Merge branch 'khdesai-fix_issue_303' 2020-01-28 16:10:54 -05:00
Desai, Kartikey H 5b07887edc Fixes #303 2020-01-28 15:41:38 -05:00
Chris Lenk 4b8fda0c2f
Merge pull request #328 from emmanvg/327-marking-definition-changes
327 marking definition changes
2020-01-28 14:05:20 -05:00
Emmanuelle Vargas-Gonzalez 88426de424 update test suite to include new property present in TLP Markings 2020-01-28 13:20:58 -05:00
Emmanuelle Vargas-Gonzalez 6f4e819c73 update check_tlp_marking() to contain new representation for TLP markings 2020-01-28 13:20:20 -05:00
Emmanuelle Vargas-Gonzalez 9463884170 add optional "name" StringProperty to MarkingDefinition
update TLP_* v21 constants according to spec
2020-01-28 13:19:23 -05:00
chrisr3d 96946d956d
fix: Avoid errors with custom object ids in the list of object refs in the Report object 2020-01-17 17:13:43 +01:00
chrisr3d ec1fbb58f6 Merge branch 'master' of github.com:oasis-open/cti-python-stix2 2020-01-17 09:20:06 +01:00
Chris Lenk 0af1f442c0
Merge pull request #322 from emmanvg/321-issue
add encoding option to areas where open() is used
2020-01-16 10:17:28 -05:00
Emmanuelle Vargas-Gonzalez c467f198c8 add encoding to MemorySource load_from_file() 2020-01-15 14:15:08 -05:00
Emmanuelle Vargas-Gonzalez 25cfb25ef3 add encoding and propagate accordingly for calls 2020-01-15 14:12:58 -05:00
chrisr3d 0cc3a4585e Merge branch 'master' of github.com:oasis-open/cti-python-stix2 2020-01-13 23:46:52 +01:00
Chris Lenk b17ac3ba30
Merge pull request #319 from oasis-open/fix-travis-pyyaml
Redo pyyaml workaround for travis
2020-01-08 13:37:03 -05:00
Chris Lenk 76439d1ce9 Redo pyyaml workaround for travis 2020-01-08 13:22:08 -05:00
chrisr3d 0a188f9440 Merge branch 'master' of github.com:oasis-open/cti-python-stix2 2020-01-08 17:01:31 +01:00
chrisr3d cbe109d815
fix: Avoiding issues with some extensions that are not dict but defaultdict 2020-01-08 17:00:18 +01:00
chrisr3d 36e4b41b9c
fix: Avoiding inconsistency in the id prefixes causing uuid check issues 2020-01-08 16:58:34 +01:00
Chris Lenk 8140258d81 Set pyyaml version for Python3.4 2020-01-08 09:44:49 -05:00
chrisr3d c8cd84925b
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 2020-01-08 14:53:36 +01:00
Chris Lenk 6cf47443b1
Update .travis.yml for 3.4 workaround
We'll drop 3.4 support in our next major release but until then this should keep travis builds working.
2020-01-07 16:18:14 -05:00
Chris Lenk a6fefff33d Fix semantic equivalence documentation 2020-01-07 15:49:06 -05:00
Chris Lenk 92f413a2e0 Bump version: 1.2.1 → 1.3.0 2020-01-04 19:40:01 -05:00
Chris Lenk f195cb299e Update CHANGELOG for v1.3.0 2020-01-04 19:35:01 -05:00
Chris Lenk 3092d88154 Fix trailing comma 2020-01-04 18:02:01 -05:00
Chris Lenk e3c2a3a57b Fix error: dict keys changing during iteration 2020-01-04 14:48:49 -05:00
Chris Lenk 4aaf1a0be7 Fix typo 2020-01-04 13:55:04 -05:00
Chris Lenk 6c0fba0e67 Add Python3.8 support, fix import
Uses try/catch to still support 2.7 too
2020-01-04 13:50:06 -05:00
Chris Lenk 2d3afb2a27 Merge branch 'khdesai-fix_issue_307'
Closes #317.
2020-01-04 10:24:51 -05:00
Desai, Kartikey H d50792b4d2 Fix tests. Fixes #307 2020-01-04 10:24:17 -05:00