Merge pull request oasis-open#63 from oasis-open/config_fixes_for_pyp…

…i_publish

fix tox and isort configurations to prepare for pypi publishing

.isort.cfg

@@ -1,7 +1,11 @@
 [settings]
-check=1
-diff=1
-known_third_party=antlr4,enum,dateutil,six,stix2patterns,typing
+known_third_party=
+    antlr4,
+    dateutil,
+    enum,
+    pytest,
+    six,
+    stix2patterns,
+    typing,
 known_first_party=stix2matcher
-not_skip=__init__.py
 force_sort_within_sections=1

.pre-commit-config.yaml

@@ -1,12 +1,12 @@
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    sha: ea227f024bd89d638aea319c92806737e3375979
+    rev: ea227f024bd89d638aea319c92806737e3375979
     hooks:
     -   id: trailing-whitespace
     -   id: flake8
         args:
         - --max-line-length=160
     -   id: check-merge-conflict
 -   repo: https://github.com/FalconSocial/pre-commit-python-sorter
-    sha: b57843b0b874df1d16eb0bef00b868792cb245c2
+    rev: b57843b0b874df1d16eb0bef00b868792cb245c2
     hooks:
     -   id: python-import-sorter

CHANGELOG.rst

@@ -0,0 +1,2 @@
+CHANGELOG
+=========

MANIFEST.in

@@ -1,5 +1,8 @@
+include .isort.cfg
+include .pre-commit-config.yaml
 include *.md
 include *.txt
 include LICENSE
+include CHANGELOG.rst
 include tox.ini
 recursive-include stix2matcher/test/testcases *.json

stix2matcher/test/test_basic_ops.py

@@ -1,4 +1,5 @@
 import pytest
+
 from stix2matcher.matcher import MatcherException, match
 
 _observations = [

stix2matcher/test/test_binary.py

@@ -1,4 +1,5 @@
 import pytest
+
 from stix2matcher.matcher import match
 
 _observations = [

stix2matcher/test/test_comparison_exprs.py

@@ -1,4 +1,5 @@
 import pytest
+
 from stix2matcher.matcher import match
 
 _observations = [

stix2matcher/test/test_complex.py

@@ -1,4 +1,5 @@
 import pytest
+
 from stix2matcher.matcher import match
 
 _observations = [

stix2matcher/test/test_matching_sdos.py

@@ -1,6 +1,6 @@
+import pytest
 import six
 
-import pytest
 from stix2matcher.matcher import match
 
 _observations = [

stix2matcher/test/test_null.py

@@ -1,6 +1,6 @@
+import pytest
 from stix2patterns.pattern import ParseException
 
-import pytest
 from stix2matcher.matcher import match
 
 _observations = [

stix2matcher/test/test_object_path_quoting.py

@@ -1,6 +1,6 @@
+import pytest
 from stix2patterns.pattern import ParseException
 
-import pytest
 from stix2matcher.matcher import match
 
 _observations = [

stix2matcher/test/test_observation_exprs.py

@@ -1,4 +1,5 @@
 import pytest
+
 from stix2matcher.matcher import match
 
 _observations = [

stix2matcher/test/test_references.py

@@ -1,4 +1,5 @@
 import pytest
+
 from stix2matcher.matcher import match
 
 _observations = [

stix2matcher/test/test_temporal_qualifiers.py

@@ -1,9 +1,9 @@
-from stix2patterns.pattern import ParseException
-
 # I'll specially test some critical internal time-interval related code,
 # since it's easier to test it separately than create lots of SDOs AND
 # patterns.
 import pytest
+from stix2patterns.pattern import ParseException
+
 from stix2matcher.matcher import (_OVERLAP, _OVERLAP_NONE,
                                   _OVERLAP_TOUCH_INNER, _OVERLAP_TOUCH_OUTER,
                                   _OVERLAP_TOUCH_POINT, MatcherException,

stix2matcher/test/test_timestamps.py

@@ -1,6 +1,6 @@
+import pytest
 from stix2patterns.pattern import ParseException
 
-import pytest
 from stix2matcher.matcher import MatcherException, match
 
 _observations = [

stix2matcher/test/test_unicode_normalization.py

@@ -1,4 +1,5 @@
 import pytest
+
 from stix2matcher.matcher import match
 
 _observations = [

tox.ini

@@ -17,17 +17,16 @@ passenv = CI TRAVIS TRAVIS_*
 deps =
   flake8
 commands =
-  flake8
+  flake8 ./stix2matcher
 
 [testenv:isort-check]
 deps = isort
 commands =
-    isort -rc stix2matcher -df
-    isort -rc stix2matcher -c
+    isort stix2matcher --df
+    isort stix2matcher -c
 
 [pycodestyle]
 max-line-length=160
-exclude=grammars
 
 [flake8]
 max-line-length=160