From db5f8f2ebfcc6cfeff518bb145833b74d199ff2d Mon Sep 17 00:00:00 2001 From: Emmanuelle Vargas-Gonzalez Date: Fri, 11 Jan 2019 13:55:05 -0500 Subject: [PATCH] Update docstrings to relocate links\documentation --- docs/api/stix2.v20.bundle.rst | 5 ----- docs/api/stix2.v20.common.rst | 5 ----- docs/api/stix2.v20.observables.rst | 5 ----- docs/api/stix2.v20.sdo.rst | 5 ----- docs/api/stix2.v20.sro.rst | 5 ----- docs/api/stix2.v21.bundle.rst | 5 ----- docs/api/stix2.v21.common.rst | 5 ----- docs/api/stix2.v21.observables.rst | 5 ----- docs/api/stix2.v21.sdo.rst | 5 ----- docs/api/stix2.v21.sro.rst | 5 ----- stix2/__init__.py | 12 ++---------- stix2/v20/__init__.py | 14 +++++++++++++- stix2/v21/__init__.py | 14 +++++++++++++- 13 files changed, 28 insertions(+), 62 deletions(-) delete mode 100644 docs/api/stix2.v20.bundle.rst delete mode 100644 docs/api/stix2.v20.common.rst delete mode 100644 docs/api/stix2.v20.observables.rst delete mode 100644 docs/api/stix2.v20.sdo.rst delete mode 100644 docs/api/stix2.v20.sro.rst delete mode 100644 docs/api/stix2.v21.bundle.rst delete mode 100644 docs/api/stix2.v21.common.rst delete mode 100644 docs/api/stix2.v21.observables.rst delete mode 100644 docs/api/stix2.v21.sdo.rst delete mode 100644 docs/api/stix2.v21.sro.rst diff --git a/docs/api/stix2.v20.bundle.rst b/docs/api/stix2.v20.bundle.rst deleted file mode 100644 index bd2abd4..0000000 --- a/docs/api/stix2.v20.bundle.rst +++ /dev/null @@ -1,5 +0,0 @@ -bundle -================ - -.. automodule:: stix2.v20.bundle - :members: \ No newline at end of file diff --git a/docs/api/stix2.v20.common.rst b/docs/api/stix2.v20.common.rst deleted file mode 100644 index 8cec059..0000000 --- a/docs/api/stix2.v20.common.rst +++ /dev/null @@ -1,5 +0,0 @@ -common -================ - -.. automodule:: stix2.v20.common - :members: diff --git a/docs/api/stix2.v20.observables.rst b/docs/api/stix2.v20.observables.rst deleted file mode 100644 index 4d9803a..0000000 --- a/docs/api/stix2.v20.observables.rst +++ /dev/null @@ -1,5 +0,0 @@ -observables -===================== - -.. automodule:: stix2.v20.observables - :members: diff --git a/docs/api/stix2.v20.sdo.rst b/docs/api/stix2.v20.sdo.rst deleted file mode 100644 index a115d5b..0000000 --- a/docs/api/stix2.v20.sdo.rst +++ /dev/null @@ -1,5 +0,0 @@ -sdo -============= - -.. automodule:: stix2.v20.sdo - :members: diff --git a/docs/api/stix2.v20.sro.rst b/docs/api/stix2.v20.sro.rst deleted file mode 100644 index 397cf29..0000000 --- a/docs/api/stix2.v20.sro.rst +++ /dev/null @@ -1,5 +0,0 @@ -sro -============= - -.. automodule:: stix2.v20.sro - :members: diff --git a/docs/api/stix2.v21.bundle.rst b/docs/api/stix2.v21.bundle.rst deleted file mode 100644 index da67082..0000000 --- a/docs/api/stix2.v21.bundle.rst +++ /dev/null @@ -1,5 +0,0 @@ -bundle -================ - -.. automodule:: stix2.v21.bundle - :members: \ No newline at end of file diff --git a/docs/api/stix2.v21.common.rst b/docs/api/stix2.v21.common.rst deleted file mode 100644 index b480481..0000000 --- a/docs/api/stix2.v21.common.rst +++ /dev/null @@ -1,5 +0,0 @@ -common -================ - -.. automodule:: stix2.v21.common - :members: \ No newline at end of file diff --git a/docs/api/stix2.v21.observables.rst b/docs/api/stix2.v21.observables.rst deleted file mode 100644 index 56f409a..0000000 --- a/docs/api/stix2.v21.observables.rst +++ /dev/null @@ -1,5 +0,0 @@ -observables -===================== - -.. automodule:: stix2.v21.observables - :members: \ No newline at end of file diff --git a/docs/api/stix2.v21.sdo.rst b/docs/api/stix2.v21.sdo.rst deleted file mode 100644 index b1a568d..0000000 --- a/docs/api/stix2.v21.sdo.rst +++ /dev/null @@ -1,5 +0,0 @@ -sdo -============= - -.. automodule:: stix2.v21.sdo - :members: \ No newline at end of file diff --git a/docs/api/stix2.v21.sro.rst b/docs/api/stix2.v21.sro.rst deleted file mode 100644 index 3532a37..0000000 --- a/docs/api/stix2.v21.sro.rst +++ /dev/null @@ -1,5 +0,0 @@ -sro -============= - -.. automodule:: stix2.v21.sro - :members: \ No newline at end of file diff --git a/stix2/__init__.py b/stix2/__init__.py index 3bedec8..246ecaf 100644 --- a/stix2/__init__.py +++ b/stix2/__init__.py @@ -12,16 +12,8 @@ patterns properties utils - v20.bundle - v20.common - v20.observables - v20.sdo - v20.sro - v21.bundle - v21.common - v21.observables - v21.sdo - v21.sro + v20 + v21 workbench """ diff --git a/stix2/v20/__init__.py b/stix2/v20/__init__.py index bef7d66..4d0a98f 100644 --- a/stix2/v20/__init__.py +++ b/stix2/v20/__init__.py @@ -1,4 +1,16 @@ -"""STIX 2.0 API Objects.""" +"""STIX 2.0 API Objects. + +.. autosummary:: + :toctree: v20 + + bundle + common + observables + sdo + sro + +| +""" # flake8: noqa diff --git a/stix2/v21/__init__.py b/stix2/v21/__init__.py index 4a8fe29..c1caae4 100644 --- a/stix2/v21/__init__.py +++ b/stix2/v21/__init__.py @@ -1,4 +1,16 @@ -"""STIX 2.1 API Objects.""" +"""STIX 2.1 API Objects. + +.. autosummary:: + :toctree: v21 + + bundle + common + observables + sdo + sro + +| +""" # flake8: noqa