Small tweaks: move the definition of DEFAULT_VERSION from the

top-level stix2 package to stix2.version but import it into
stix2.  This makes it possible for someone to get the symbol
without needing to import all of stix2.

Change an "import X" style import to "from X import Y" in
stix2/__init__.py to be consistent with the other imports in
that file.
pull/1/head
Michael Chisholm 2021-01-13 11:22:34 -05:00
parent f51e309775
commit 5d016142cf
2 changed files with 5 additions and 3 deletions

View File

@ -24,7 +24,7 @@
# flake8: noqa
DEFAULT_VERSION = '2.1' # Default version will always be the latest STIX 2.X version
from .version import DEFAULT_VERSION
from .confidence import scales
from .datastore import CompositeDataSource
@ -61,5 +61,5 @@ from .v21 import * # This import will always be the latest STIX 2.X version
from .version import __version__
from .versioning import new_version, revoke
import stix2.registry
stix2.registry._collect_stix2_mappings()
from .registry import _collect_stix2_mappings
_collect_stix2_mappings()

View File

@ -1 +1,3 @@
__version__ = "2.1.0"
DEFAULT_VERSION = '2.1' # Default version will always be the latest STIX 2.X version