update documentation, add new test environments for harness

Author: emmanvg

README.rst

@@ -1,10 +1,10 @@
 python-stix
 ===========
 
-A python library for parsing, manipulating, and generating STIX v1.2 content.
+A python library for parsing, manipulating, and generating `Structured Threat Information eXpression (STIX™) <https://stixproject.github.io/>`_ v1.2.0 content.
 
 :Source: https://github.com/STIXProject/python-stix
-:Documentation: http://stix.readthedocs.org
+:Documentation: https://stix.readthedocs.io/
 :Information: https://stixproject.github.io/
 
 |travis_badge| |landscape_io_badge| |version_badge|
@@ -24,7 +24,7 @@ Installation
 ------------
 
 The python-stix library is hosted on `PyPI
-<https://pypi.python.org/pypi/stix/>`_ and the most recent stable version can be 
+<https://pypi.python.org/pypi/stix/>`_ and the most recent stable version can be
 installed with `pip <https://pypi.python.org/pypi/pip>`_:
 
 ::
@@ -60,13 +60,13 @@ Installation on Windows
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 Download the Lxml wheel for your version of Python from
-http://www.lfd.uci.edu/~gohlke/pythonlibs/#lxml, then install it via "pip install 
+http://www.lfd.uci.edu/~gohlke/pythonlibs/#lxml, then install it via "pip install
 <filename>.whl". For example, to install it on 64-bit Windows running Python 2.7:
 
 ::
 
-    > pip install lxml-3.6.1-cp27-cp27m-win_amd64.whl
-    > pip install stix
+    $ pip install lxml-3.6.1-cp27-cp27m-win_amd64.whl
+    $ pip install stix
 
 Versioning
 ----------

setup.cfg

@@ -1,2 +1,13 @@
+[bumpversion]
+current_version = 1.2.0.7
+parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+).(?P<revision>\d+)
+serialize = {major}.{minor}.{patch}.{revision}
+commit = True
+tag = True
+
+[bumpversion:file:stix/version.py]
+
+[bumpversion:file:docs/index.rst]
+
 [bdist_wheel]
 universal = True

setup.py

@@ -3,6 +3,7 @@
 # Copyright (c) 2017, The MITRE Corporation. All rights reserved.
 # See LICENSE.txt for complete terms.
 
+from io import open  # Allow `encoding` kwarg on Python 2.7
 from os.path import abspath, dirname, join
 
 
@@ -22,7 +23,7 @@ def get_version():
 
 
 def get_long_description():
-    with open('README.rst') as f:
+    with open('README.rst', encoding='utf-8') as f:
         return f.read()
 
 
@@ -45,7 +46,6 @@ def get_long_description():
     url="http://stix.mitre.org",
     packages=find_packages(),
     install_requires=install_requires,
-    license="BSD",
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py34, py35, py36, py37, lxml23, docs, no-maec
+envlist = py27, py34, py35, py36, py37, lxml23, docs, no-maec, packaging
 
 [testenv]
 commands =
@@ -33,10 +33,16 @@ deps =
 commands =
     sphinx-build -W -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html
 
+[testenv:packaging]
+deps =
+  readme_renderer
+commands =
+  python setup.py check -r -s
+
 [travis]
 python =
-  2.7: py27, docs, lxml23, no-maec
+  2.7: py27, docs, lxml23, no-maec, packaging
   3.4: py34, no-maec
   3.5: py35, no-maec
-  3.6: py36, no-maec
+  3.6: py36, no-maec, packaging
   3.7: py37, no-maec