diff options
| -rw-r--r-- | docs/conf.py | 10 | ||||
| -rwxr-xr-x | setup.cfg | 8 | ||||
| -rwxr-xr-x | setup.py | 3 | ||||
| -rw-r--r-- | setuptools/__init__.py | 4 | ||||
| -rw-r--r-- | setuptools/version.py | 6 |
5 files changed, 7 insertions, 24 deletions
diff --git a/docs/conf.py b/docs/conf.py index 07d6ad41..72c1ce43 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,11 +18,7 @@ # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. -# Allow Sphinx to find the setup command that is imported below, as referenced above. -import sys, os -sys.path.append(os.path.abspath('..')) - -import setup as setup_script +import setuptools_scm # -- General configuration ----------------------------------------------------- @@ -51,9 +47,9 @@ copyright = '2009-2014, The fellowship of the packaging' # built documents. # # The short X.Y version. -version = setup_script.setup_params['version'] +version = setuptools_scm.get_version(root='..', relative_to=__file__) # The full version, including alpha/beta/rc tags. -release = setup_script.setup_params['version'] +release = version # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -1,8 +1,3 @@ -[bumpversion] -current_version = 22.0.5 -commit = True -tag = True - [egg_info] tag_build = .post tag_date = 1 @@ -22,6 +17,3 @@ formats = gztar zip [wheel] universal = 1 - -[bumpversion:file:setup.py] - @@ -66,7 +66,7 @@ wheel = ['wheel'] if needs_wheel else [] setup_params = dict( name="setuptools", - version="22.0.5", + use_scm_version=True, description="Easily download, build, install, upgrade, and uninstall " "Python packages", author="Python Packaging Authority", @@ -156,6 +156,7 @@ setup_params = dict( 'pytest>=2.8', ] + (['mock'] if sys.version_info[:2] < (3, 3) else []), setup_requires=[ + 'setuptools_scm>=1.9', ] + pytest_runner + wheel, ) diff --git a/setuptools/__init__.py b/setuptools/__init__.py index 67b57e4f..b8cec4c3 100644 --- a/setuptools/__init__.py +++ b/setuptools/__init__.py @@ -10,7 +10,7 @@ from fnmatch import fnmatchcase from setuptools.extern.six.moves import filterfalse, map -import setuptools.version +import pkg_resources from setuptools.extension import Extension from setuptools.dist import Distribution, Feature, _get_unpatched from setuptools.depends import Require @@ -20,7 +20,7 @@ __all__ = [ 'find_packages' ] -__version__ = setuptools.version.__version__ +__version__ = pkg_resources.require('setuptools')[0].version bootstrap_install_from = None diff --git a/setuptools/version.py b/setuptools/version.py deleted file mode 100644 index f2b40722..00000000 --- a/setuptools/version.py +++ /dev/null @@ -1,6 +0,0 @@ -import pkg_resources - -try: - __version__ = pkg_resources.require('setuptools')[0].version -except Exception: - __version__ = 'unknown' |