Merge branch '474-start-using-setuptools-scm'

# Conflicts:
#	CHANGELOG
#	setup.py
#	tox/__init__.py

Author: obestwalter

CHANGELOG

@@ -1,3 +1,8 @@
+Not released yet
+----
+
+- #474: Start using setuptools_scm for tag based versioning.
+
 2.7.0
 -----
 

doc/Makefile

@@ -12,8 +12,6 @@ PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
 ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 
-SITETARGET=$(shell ./_getdoctarget.py)
-
 .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
 
 help:

doc/_getdoctarget.py

@@ -13,12 +13,14 @@
 
 import sys, os
 
+from pkg_resources import get_distribution
+
+_full_version = get_distribution('tox').version
+release = _full_version.split('+', 1)[0]
 # The short X.Y version.
-sys.path.insert(0, os.path.dirname(__file__))
-import _getdoctarget
+version = '.'.join(release.split('.')[:2])
 
-version = _getdoctarget.get_minor_version_string()
-release = _getdoctarget.get_version_string()
+sys.path.insert(0, os.path.dirname(__file__))
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

doc/conf.py

@@ -84,13 +84,14 @@ def main():
         description='virtualenv-based automation of test activities',
         long_description=get_long_description(),
         url='https://tox.readthedocs.org/',
-        version='2.7.0',
+        use_scm_version=True,
         license='http://opensource.org/licenses/MIT',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
         author='holger krekel',
         author_email='[email protected]',
         packages=['tox'],
         entry_points={'console_scripts': 'tox=tox:cmdline\ntox-quickstart=tox._quickstart:main'},
+        setup_requires=['setuptools_scm'],
         # we use a public tox version to test, see tox.ini's testenv
         # "deps" definition for the required dependencies
         tests_require=['tox'],

setup.py

@@ -1,8 +1,10 @@
-#
-__version__ = '2.7.0'
+from pkg_resources import get_distribution
 
 from .hookspecs import hookspec, hookimpl  # noqa
 
+_full_version = get_distribution('tox').version
+__version__ = _full_version.split('+', 1)[0]
+
 
 class exception:
     class Error(Exception):