From 4cd99f04eaf3ccbc467b690d2511957c5651c29a Mon Sep 17 00:00:00 2001 From: Greg Back Date: Mon, 21 Aug 2017 22:16:10 +0000 Subject: [PATCH] Use version of taxii2-client from PyPI. --- .isort.cfg | 2 +- setup.py | 3 ++- stix2/test/test_data_sources.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.isort.cfg b/.isort.cfg index e141924..e8d95f8 100644 --- a/.isort.cfg +++ b/.isort.cfg @@ -1,7 +1,7 @@ [settings] check=1 diff=1 -known_third_party=dateutil,pytest,pytz,six,requests,taxii2_client +known_third_party=dateutil,pytest,pytz,six,requests,taxii2client known_first_party=stix2 not_skip=__init__.py force_sort_within_sections=1 diff --git a/setup.py b/setup.py index c10da46..29d98f6 100644 --- a/setup.py +++ b/setup.py @@ -52,6 +52,7 @@ setup( 'pytz', 'requests', 'simplejson', - 'six' + 'six', + 'taxii2-client', ], ) diff --git a/stix2/test/test_data_sources.py b/stix2/test/test_data_sources.py index bbb7f31..0095802 100644 --- a/stix2/test/test_data_sources.py +++ b/stix2/test/test_data_sources.py @@ -1,5 +1,5 @@ import pytest -from taxii2_client import Collection +from taxii2client import Collection from stix2.sources import DataSource, Filter, taxii