Merge pull request #14 from all3fox/config-tox

Configure tox to run tests against both py27 and py36

Author: pombredanne

.gitignore

@@ -21,6 +21,7 @@
 pip-log.txt
 
 # Unit test / coverage reports
+.tox
 .cache
 .coverage
 .coverage.*

README.rst

@@ -1,30 +1,34 @@
-===============================
+==================
 license-expression
-===============================
+==================
 
-license-expression is small utility library to parse, compare, simplify and normalize
+license-expression is a small utility library to parse, compare, simplify and normalize
 license expressions (e.g. SPDX license expressions) using boolean logic such as:
 `GPL-2.0 or later WITH Classpath Exception AND MIT`.
 
-
 See also for details:
 https://spdx.org/sites/cpstandard/files/pages/files/spdxversion2.1.pdf#page=95&zoom=auto
 
 license: apache-2.0
 
 Python: 2.7 and 3.4+
 
-
 Build and tests status
 ======================
 
-+-------+-------------------------------------------------------------------------------+-------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------+
-|Branch |                         **Linux (Travis)**                                    |                         **MacOSX (Travis)**                                   |                         **Windows (AppVeyor)**                                                              |
-+=======+===============================================================================+===============================================================================+=============================================================================================================+
-|       |.. image:: https://api.travis-ci.org/nexB/license-expression.png?branch=master |.. image:: https://api.travis-ci.org/nexB/license-expression.png?branch=master |.. image:: https://ci.appveyor.com/api/projects/status/github/nexB/license-expression?svg=true               |
-|Master |   :target: https://travis-ci.org/nexB/license-expression                      |   :target: https://travis-ci.org/nexB/license-expression                      |   :target: https://ci.appveyor.com/project/nexB/license-expression                                          |
-|       |   :alt: Linux Master branch tests status                                      |   :alt: MacOSX Master branch tests status                                     |   :alt: Windows Master branch tests status                                                                  |
-+-------+-------------------------------------------------------------------------------+-------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------+
++-------+-------------------------------------------+--------------------------------------------+---------------------------------------------+
+|Branch |             **Linux (Travis)**            |            **MacOSX (Travis)**             |            **Windows (AppVeyor)**           |
++=======+===========================================+============================================+=============================================+
+|       |.. image:: travis-master-icon_             |.. image:: travis-master-icon_              |.. image:: appveyor-master-icon_             |
+|Master |   :target: travis-master-link_            |   :target: travis-master-link_             |   :target: appveyor-master-link_            |
+|       |   :alt: Linux Master branch tests status  |   :alt: MacOSX Master branch tests status  |   :alt: Windows Master branch tests status  |
++-------+-------------------------------------------+--------------------------------------------+---------------------------------------------+
+
+.. _travis-master-icon: https://api.travis-ci.org/nexB/license-expression.png?branch=master
+.. _travis-master-link: https://travis-ci.org/nexB/license-expression
+
+.. _appveyor-master-icon: https://ci.appveyor.com/api/projects/status/github/nexB/license-expression?svg=true
+.. _appveyor-master-link: https://ci.appveyor.com/project/nexB/license-expression
 
 
 Source code and download
@@ -42,6 +46,7 @@ Submit bugs and questions at:
 
 Description
 ===========
+
 This module defines a mini language to parse, validate, simplify, normalize and
 compare license expressions using a boolean logic engine.
 
@@ -53,11 +58,12 @@ equivalence and can be normalized or simplified.
 
 The main entry point is the Licensing object.
 
-
 Usage examples
 ==============
 
-For example::
+For example:
+
+.. code-block:: python
 
     >>> from license_expression import Licensing, LicenseSymbol
     >>> licensing = Licensing()
@@ -89,15 +95,17 @@ For example::
     >>> assert expected == licensing.license_symbols(parsed)
     >>> assert expected == licensing.license_symbols(expression)
 
+And expression can be simplified:
 
-And expression can be simplified::
+.. code-block:: python
 
     >>> expression2 = ' GPL-2.0 or (mit and LGPL 2.1) or bsd Or GPL-2.0  or (mit and LGPL 2.1)'
     >>> parsed2 = licensing.parse(expression2)
     >>> assert str(parsed2.simplify()) == 'BSD OR GPL-2.0 OR (LGPL 2.1 AND mit)'
-    
 
-Two expressions can be compared for equivalence and containment::
+Two expressions can be compared for equivalence and containment:
+
+.. code-block:: python
 
     >>> expr1 = licensing.parse(' GPL-2.0 or (LGPL 2.1 and mit) ')
     >>> expr2 = licensing.parse(' (mit and LGPL 2.1)  or GPL-2.0 ')
@@ -117,11 +125,10 @@ Two expressions can be compared for equivalence and containment::
     >>> licensing.contains(expr2, expr4)
     True
 
-    
 Development
 ===========
 
 * Checkout a clone from https://github.com/nexB/license-expression.git
-* Then run `./configure` (or `configure.bat`) and then `source bin/activate`. This will
+* Then run ``./configure`` (or ``configure.bat``) and then ``source bin/activate``. This will
   install all vendored dependencies in a local virtualenv, including development deps.
-* To run the tests, run `py.test -vvs`
+* To run the tests, run ``py.test -vvs``

etc/conf/dev/base.txt

@@ -2,3 +2,5 @@
 py
 colorama
 pytest
+pluggy
+tox

thirdparty/base/certifi-2016.8.8-py2.py3-none-any.whl

@@ -1,13 +1,13 @@
-about_resource: certifi-2016.8.8-py2.py3-none-any.whl
-version: 2016.8.8
+about_resource: certifi-2017.4.17-py2.py3-none-any.whl
+version: 2017.4.17
 description: Python package for providing Mozilla's CA Bundle.
 
-download_url: hhttps://pypi.python.org/packages/dd/ed/e9bf6a9dc79e23c68385c4ea692f0e9e1a7880518872564f88be013b552f/certifi-2016.8.8-py2.py3-none-any.whl#md5=cd6b969efda72327c5178c3ef0946ff2
+download_url: https://pypi.python.org/packages/eb/01/c1f58987b777d6c4ec535b4e004a4a07bfc9db06f0c7533367ca6da8f2a6/certifi-2017.4.17-py2.py3-none-any.whl#md5=7d6198f160686046fd727900adf39f5b
 
+name: certifi
 owner: Kenneth Reitz
 contact: me@kennethreitz.com
 home_url: http://certifi.io/
-name: certifi
 
 dje_license: mpl-2.0
 license_text_file: mpl-2.0.LICENSE

thirdparty/base/certifi-2017.4.17-py2.py3-none-any.whl

@@ -1,14 +1,14 @@
-about_resource: pip-8.1.2-py2.py3-none-any.whl
-version: 8.1.2
-download_url: https://pypi.python.org/packages/9c/32/004ce0852e0a127f07f358b715015763273799bd798956fa930814b60f39/pip-8.1.2-py2.py3-none-any.whl#md5=0570520434c5b600d89ec95393b2650b
+about_resource: pip-9.0.1-py2.py3-none-any.whl (1.3MB)
+download_url: https://pypi.python.org/packages/b6/ac/7015eb97dc749283ffdec1c3a88ddb8ae03b8fad0f0e611408f196358da3/pip-9.0.1-py2.py3-none-any.whl#md5=297dbd16ef53bcef0447d245815f5144
+version: 9.0.1
 
 name: pip
 owner: The pip developers
 contact: python-virtualenv@groups.google.com
 home_url: http://www.pip-installer.org
 
 author_file: pip.AUTHORS
-dje_license: mit, lgpl-2.1
+dje_license: mit, OTHER TODO
 license_text_file: pip.LICENSE
 
 vcs_tool: git