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
stix2.0
Emmanuelle Vargas-Gonzalez 2018-04-02 07:51:51 -04:00
parent e92db2417a
commit c518533275
2 changed files with 5 additions and 4 deletions

View File

@ -4,11 +4,12 @@ import os.path
from setuptools import find_packages, setup from setuptools import find_packages, setup
here = os.path.abspath(os.path.dirname(__file__)) BASE_DIR = os.path.dirname(os.path.abspath(__file__))
VERSION_FILE = os.path.join(BASE_DIR, 'stix2', 'version.py')
def get_version(): def get_version():
with open('stix2/version.py', encoding="utf-8") as f: with open(VERSION_FILE) as f:
for line in f.readlines(): for line in f.readlines():
if line.startswith("__version__"): if line.startswith("__version__"):
version = line.split()[-1].strip('"') version = line.split()[-1].strip('"')
@ -16,7 +17,7 @@ def get_version():
raise AttributeError("Package does not have a __version__") raise AttributeError("Package does not have a __version__")
with open(os.path.join(here, 'README.rst'), encoding='utf-8') as f: with open('README.rst') as f:
long_description = f.read() long_description = f.read()
@ -52,6 +53,5 @@ setup(
'simplejson', 'simplejson',
'six', 'six',
'stix2-patterns', 'stix2-patterns',
'taxii2-client',
], ],
) )

View File

@ -8,6 +8,7 @@ deps =
pytest pytest
pytest-cov pytest-cov
coverage coverage
taxii2-client
commands = commands =
py.test --cov=stix2 stix2/test/ --cov-report term-missing py.test --cov=stix2 stix2/test/ --cov-report term-missing