Update dependencies and test configuration.

.gitignore

@@ -1,5 +1,3 @@
-#####=== Python ===#####
-
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -10,7 +8,6 @@ __pycache__/
 
 # Distribution / packaging
 .Python
-env/
 build/
 develop-eggs/
 dist/
@@ -22,9 +19,11 @@ lib64/
 parts/
 sdist/
 var/
+wheels/
 *.egg-info/
 .installed.cfg
 *.egg
+MANIFEST
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -44,26 +43,69 @@ htmlcov/
 .cache
 nosetests.xml
 coverage.xml
-*,cover
+*.cover
+.hypothesis/
+.pytest_cache/
 
 # Translations
 *.mo
 *.pot
 
 # Django stuff:
 *.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
 
 # Sphinx documentation
 docs/_build/
 
 # PyBuilder
 target/
 
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+
 # Automatically-built grammar tokens
 *.tokens
 *.interp
 
 # PyCharm
 .idea/
-
-MANIFEST

.isort.cfg

@@ -4,6 +4,7 @@ skip_glob = **/STIXPattern*.py
 not_skip = __init__.py
 known_third_party =
     antlr4,
+    pytest,
     six,
     typing,
 known_first_party = stix2patterns

MANIFEST.in

@@ -1,5 +1,8 @@
-include *.md
-include requirements.txt
+include .isort.cfg
+include .pre-commit-config.yaml
+include CHANGELOG
+include CONTRIBUTING.md
+include dev-requirements.txt
 include LICENSE
 include tox.ini
 include stix2patterns/test/spec_examples.txt

README.rst

@@ -223,15 +223,15 @@ repositories/maintainers-guide#additionalMaintainers>`__.
 .. _currentMaintainers:
 
 Current Maintainers of this TC Open Repository
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 -  `Greg Back <mailto:[email protected]>`__; GitHub ID:
    https://github.com/gtback; WWW: `MITRE <https://www.mitre.org>`__
 -  `Ivan Kirillov <mailto:[email protected]>`__; GitHub ID:
    https://github.com/ikiril01; WWW: `MITRE <https://www.mitre.org>`__
 
 About OASIS TC Open Repositories
------------------------------
+--------------------------------
 
 -  `TC Open Repositories: Overview and
    Resources <https://www.oasis-open.org/resources/open-
@@ -269,4 +269,3 @@ to [email protected].
    :target: https://codecov.io/gh/oasis-open/cti-pattern-validator
 .. |Version| image:: https://img.shields.io/pypi/v/stix2-patterns.svg?maxAge=3600
    :target: https://pypi.python.org/pypi/stix2-patterns/
-

dev-requirements.txt

@@ -0,0 +1 @@
+-e .[dev]

setup.py

@@ -15,17 +15,42 @@ def get_version():
         raise AttributeError("Package does not have a __version__")
 
 
+doc_requires = [
+    'sphinx',
+]
+
+test_requires = [
+    'coverage',
+    'pytest',
+    'pytest-cov',
+]
+
+dev_requires = doc_requires + test_requires + [
+    'bumpversion',
+    'check-manifest',
+    'pre-commit',
+    'readme_renderer',
+    # test_requires are installed into every tox environemnt, so we don't
+    # want to include tox there.
+    'tox',
+]
+
 setup(
     name='stix2-patterns',
     version=get_version(),
-    packages=find_packages(),
     description='Validate STIX 2 Patterns.',
     long_description=readme,
+    url="https://github.com/oasis-open/cti-pattern-validator",
+    author='OASIS Cyber Threat Intelligence Technical Committee',
+    author_email='[email protected]',
+    maintainer='Greg Back',
+    maintainer_email='[email protected]',
+    packages=find_packages(),
     install_requires=[
-        'antlr4-python2-runtime==4.7 ; python_version<"3"',
-        'antlr4-python3-runtime==4.7 ; python_version>="3"',
+        'antlr4-python2-runtime>=4.7 ; python_version<"3"',
+        'antlr4-python3-runtime>=4.7 ; python_version>="3"',
         'six',
-        'typing ; python_version<"3.5" and python_version>="3"'
+        'typing ; python_version<"3.5" and python_version>="3"',
     ],
     entry_points={
         'console_scripts': [
@@ -42,4 +67,9 @@ def get_version():
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
     ],
+    extras_require={
+        'dev': dev_requires,
+        'docs': doc_requires,
+        'test': test_requires,
+    },
 )

stix2patterns/test/test_inspector.py

@@ -1,4 +1,5 @@
 import pytest
+
 from stix2patterns.inspector import INDEX_STAR
 from stix2patterns.pattern import Pattern
 

stix2patterns/test/test_validator.py

@@ -4,6 +4,7 @@
 import os
 
 import pytest
+
 from stix2patterns.validator import validate
 
 TEST_CASE_FILE = os.path.join(os.path.dirname(__file__), 'spec_examples.txt')

tox.ini

@@ -3,13 +3,13 @@ envlist = py27,py34,py35,py36,pycodestyle,isort-check
 
 [testenv]
 deps =
-    -U
-    tox
-    pytest
-    pytest-cov
-    coverage
+    check-manifest
+    readme_renderer
+extras = test
 commands =
-    py.test --cov=stix2patterns stix2patterns/test/ --cov-report term-missing
+    check-manifest
+    python setup.py check -m -r -s
+    pytest --cov=stix2patterns stix2patterns/test/ --cov-report term-missing
 
 passenv = CI TRAVIS TRAVIS_*