Merge pull request #95 from emmanvg/test-harness

update project test harness and requirements

Author: emmanvg

.travis.yml

@@ -1,17 +1,18 @@
 language: python
-
+sudo: false   # Since this is an older project, this is not the default.
+cache: pip
+dist: xenial
 python:
   - "2.7"
   - "3.4"
   - "3.5"
   - "3.6"
-
+  - "3.7"
 install:
-  - pip install -U tox-travis
-
+  - pip install -U pip setuptools
+  - pip install tox-travis
 script:
   - tox
-
 notifications:
   email:
     - [email protected]

setup.cfg

@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal = True

setup.py

@@ -3,7 +3,7 @@
 # Copyright (c) 2018 - The MITRE Corporation
 # For license information, see the LICENSE.txt file
 
-from io import open  # Allow `encoding` kwarg on Python 2.7
+
 from os.path import abspath, dirname, join
 
 
@@ -12,6 +12,7 @@
 BASE_DIR = dirname(abspath(__file__))
 VERSION_FILE = join(BASE_DIR, 'maec', 'version.py')
 
+
 def get_version():
     with open(VERSION_FILE) as f:
         for line in f.readlines():
@@ -21,14 +22,16 @@ def get_version():
         raise AttributeError("Package does not have a __version__")
 
 
-with open('README.rst', encoding='utf-8') as f:
-    readme = f.read()
+def get_long_description():
+    with open('README.rst') as f:
+        return f.read()
 
 
 install_requires = [
-    'lxml>=2.2.3',
-    'mixbox>=0.0.13',
-    'cybox>=2.1.0.13.dev1,<2.1.1.0',
+    'lxml>=2.2.3 ; python_version == "2.7" or python_version >= "3.5"',
+    'lxml>=2.2.3,<4.4.0 ; python_version > "2.7" and python_version < "3.5"',
+    'mixbox>=1.0.2',
+    'cybox>=2.1.0.13,<2.1.1.0',
 ]
 
 extras_require = {
@@ -48,18 +51,20 @@ def get_version():
     author="MAEC Project",
     author_email="[email protected]",
     description="An API for parsing and creating MAEC content.",
-    long_description=readme,
+    long_description=get_long_description(),
     url="http://maec.mitre.org",
     packages=find_packages(),
     install_requires=install_requires,
     extras_require=extras_require,
+    license="BSD",
     classifiers=[
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
         "Development Status :: 4 - Beta",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: BSD License",

tox.ini

@@ -1,18 +1,21 @@
 [tox]
-envlist = py27,py34,py35,py36
+envlist = py27,py34,py35,py36,py37
 
 [testenv]
 commands =
     nosetests maec
-    sphinx-build -b doctest docs docs/_build/doctest
-    sphinx-build -b html docs docs/_build/html
 deps =
     -rrequirements.txt
 
+[testenv:docs]
+commands =
+    sphinx-build -W -b doctest -d {envtmpdir}/doctrees docs {envtmpdir}/doctest
+    sphinx-build -W -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html
 
 [travis]
 python =
   2.7: py27
   3.4: py34
   3.5: py35
   3.6: py36
+  3.7: py37