Update tox/travis; add Python 3.6 support.

Author: gtback

.travis.yml

@@ -1,21 +1,15 @@
 language: python
 python:
-  - 3.5
-
-env:
-  - TOXENV=py26
-  - TOXENV=py27
-  - TOXENV=py33
-  - TOXENV=py34
-  - TOXENV=py35
-  - TOXENV=lxml23
-
+  - "2.6"
+  - "2.7"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.6"
 install:
-  - pip install -U tox
-
+  - pip install tox-travis
 script:
   - tox
-
 notifications:
   email:
     - stix-commits-list@lists.mitre.org

requirements.txt

@@ -1 +1,7 @@
--e .[docs,test]
+maec>=4.1.0.13.dev4,<4.1.1.0  # For tests that include MAEC
+nose==1.3.7
+sphinx==1.3.6
+sphinx_rtd_theme==0.2.4
+tox==2.7.0
+
+-e .

setup.py

@@ -24,18 +24,6 @@ def get_version():
 with open('README.rst') as f:
     readme = f.read()
 
-extras_require = {
-    'docs': [
-        'Sphinx==1.3.1',
-        'sphinx_rtd_theme==0.1.8',
-    ],
-    'test': [
-        'nose==1.3.0',
-        'tox==1.6.1',
-        'maec>=4.1.0.13,<4.1.1.0'
-    ],
-}
-
 
 install_requires = [
     'lxml>=2.3',
@@ -55,12 +43,18 @@ def get_version():
     url="http://stix.mitre.org",
     packages=find_packages(),
     install_requires=install_requires,
-    extras_require=extras_require,
     classifiers=[
-        "Programming Language :: Python",
-        "Development Status :: 4 - Beta",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: BSD License",
-        "Operating System :: OS Independent",
+        'Development Status :: 5 - Production/Stable',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: BSD License',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ]
 )

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py33, py34, py35, lxml23
+envlist = py26, py27, py33, py34, py35, py36, lxml23
 
 [testenv]
 commands =
@@ -18,9 +18,16 @@ basepython =
 commands =
     nosetests stix
 deps =
+    # Pin specific versions of LXML and python-dateutil
     lxml==2.3
     python-dateutil==1.4.1
-    mixbox>=1.0.1
-    cybox>=2.1.0.13,<2.1.1.0
-    maec>=4.1.0.13,<4.1.1.0
-    nose
+    -rrequirements.txt
+
+[travis]
+python =
+  2.6: py26, lxml23
+  2.7: py27, docs
+  3.3: py33
+  3.4: py34
+  3.5: py35
+  3.6: py36