Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into …

…main
MISP · Jul 9, 2020 · 87d178d · 87d178d
2 parents fc27071 + 2f08ad0
commit 87d178d
Show file tree

Hide file tree

Showing 56 changed files with 4,610 additions and 1,602 deletions.
diff --git a/.isort.cfg b/.isort.cfg
@@ -1,6 +1,5 @@
 [settings]
 skip = workbench.py
-not_skip = __init__.py
 known_third_party =
     antlr4,
     dateutil,

diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 os: linux
 language: python
 cache: pip
-dist: xenial
+dist: bionic
 python:
   - "3.5"
   - "3.6"

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,27 @@
 CHANGELOG
 =========
 
+2.0.2 - 2020-07-07
+
+* #423 Fixes issue with six dependency.
+
+2.0.1 - 2020-07-06
+
+* Fixes issue with PyPI.
+
+2.0.0 - 2020-07-06
+
+* #418 Drops support for Python versions older than 3.5
+* #397 Drops python-dateutil dependency to just use built-in datetime instead
+* #392, #402 Fixes bugs with deterministic ID generation
+* #393 Fixes bug when using SSDEEP hashes
+* #404 Fixes bug with "import *"
+* #400 Fixes bug with pattern builder and STIX 2.0 Start/Stop timestamps
+* #407 Fixes bug to allow granular markings with 'id' as selector
+* #409 Fixes bug with 2.1 object reference properties
+* #401 Fixes bug where some objects can be versioned and revoked that shouldn't
+* #417 Improves efficiency of ListProperty
+
 1.4.0 - 2020-04-03
 
 * #347, #355, #356, #357, #358, #360, #362, #369, #370, #379, #374, #384 Updates STIX 2.1 support to CS01

diff --git a/README.rst b/README.rst
@@ -33,7 +33,8 @@ be set automatically if not provided as keyword arguments.
     from stix2 import Indicator
 
     indicator = Indicator(name="File hash for malware variant",
-                          labels=["malicious-activity"],
+                          indicator_types=["malicious-activity"],
+                          pattern_type="stix",
                           pattern="[file:hashes.md5 = 'd41d8cd98f00b204e9800998ecf8427e']")
 
 To parse a STIX JSON string into a Python STIX object, use ``parse()``:
@@ -53,6 +54,7 @@ To parse a STIX JSON string into a Python STIX object, use ``parse()``:
             "malicious-activity"
         ],
         "pattern_type": "stix",
+        "pattern_version": "2.1",
         "pattern": "[file:hashes.md5 ='d41d8cd98f00b204e9800998ecf8427e']",
         "valid_from": "2017-09-26T23:33:39.829952Z"
     }""")
@@ -61,18 +63,20 @@ To parse a STIX JSON string into a Python STIX object, use ``parse()``:
 
 For more in-depth documentation, please see `https://stix2.readthedocs.io/ <https://stix2.readthedocs.io/>`__.
 
-STIX 2.X Technical Specification Support
-----------------------------------------
+STIX 2 Technical Specification Support
+--------------------------------------
 
-This version of python-stix2 brings initial support to STIX 2.1 currently at the
-CSD level. The intention is to help debug components of the library and also
-check for problems that should be fixed in the specification.
+This version of cti-python-stix2 brings support to `STIX Version 2.1 <https://docs.oasis-open.org/cti/stix/v2.1/cs01/stix-v2.1-cs01.html>`__
+published on 20 March 2020 currently at the Committee Specification (CS) level.
 
-The `stix2` Python library is built to support multiple versions of the STIX
-Technical Specification. With every major release of stix2 the ``import stix2``
-statement will automatically load the SDO/SROs equivalent to the most recent
-supported 2.X Committee Specification. Please see the library documentation for
-more details.
+The stix2 Python library supports multiple versions of the STIX 2 Technical
+Specification. The library will be updated to support new Committee
+Specification Drafts (CSDs) as they are released, but modules for these
+versions must be imported manually until the CSD reaches CS level. In new
+major releases of stix2 the ``import stix2`` implicit import statement
+will be updated to automatically load the STIX Objects equivalent to the most
+recently supported CS. Please see the `library documentation <https://stix2.readthedocs.io/en/latest/guide/ts_support.html>`__
+for details.
 
 Governance
 ----------

diff --git a/docs/api/stix2.confidence.rst b/docs/api/stix2.confidence.rst
@@ -2,4 +2,4 @@ confidence
 ================
 
 .. automodule:: stix2.confidence
-   :members:
+   :members:
diff --git a/docs/api/stix2.core.rst b/docs/api/stix2.core.rst
diff --git a/docs/api/stix2.parsing.rst b/docs/api/stix2.parsing.rst
@@ -0,0 +1,5 @@
+parsing
+===============
+
+.. automodule:: stix2.parsing
+   :members:
diff --git a/docs/api/stix2.pattern_visitor.rst b/docs/api/stix2.pattern_visitor.rst
@@ -0,0 +1,5 @@
+pattern_visitor
+================
+
+.. automodule:: stix2.pattern_visitor
+   :members:
diff --git a/docs/api/stix2.v20.rst b/docs/api/stix2.v20.rst
@@ -2,4 +2,4 @@ v20
 =========
 
 .. automodule:: stix2.v20
-   :members:
+   :members:
diff --git a/docs/api/stix2.v21.rst b/docs/api/stix2.v21.rst
@@ -2,4 +2,4 @@ v21
 =========
 
 .. automodule:: stix2.v21
-   :members:
+   :members:
diff --git a/docs/api/stix2.versioning.rst b/docs/api/stix2.versioning.rst
@@ -0,0 +1,5 @@
+versioning
+===============
+
+.. automodule:: stix2.versioning
+   :members: