Commit 0cb9cd7a authored by Jason R. Coombs's avatar Jason R. Coombs

setup.py now loads the version from setuptools/__init__.py, limiting the...

setup.py now loads the version from setuptools/__init__.py, limiting the places where release.py must keep in sync.
parent 2de1c553
......@@ -16,7 +16,7 @@ def before_upload():
_linkify('CHANGES.txt', 'CHANGES (linked).txt')
files_with_versions = (
'docs/conf.py', 'setup.py', 'ez_setup.py', 'setuptools/__init__.py',
'docs/conf.py', 'ez_setup.py', 'setuptools/__init__.py',
)
test_info = "Travis-CI tests: http://travis-ci.org/#!/jaraco/setuptools"
......
......@@ -18,9 +18,8 @@ exec(init_file.read(), d)
init_file.close()
SETUP_COMMANDS = d['__all__']
VERSION = "0.9.1"
from setuptools import setup, find_packages
import setuptools
from setuptools.command.build_py import build_py as _build_py
from setuptools.command.test import test as _test
......@@ -94,7 +93,7 @@ if sys.platform == 'win32' or os.environ.get("SETUPTOOLS_INSTALL_WINDOWS_SPECIFI
setup_params = dict(
name="setuptools",
version=VERSION,
version=setuptools.__version__,
description="Easily download, build, install, upgrade, and uninstall "
"Python packages",
author="The fellowship of the packaging",
......@@ -105,7 +104,7 @@ setup_params = dict(
url = "https://pypi.python.org/pypi/setuptools",
test_suite = 'setuptools.tests',
src_root = src_root,
packages = find_packages(),
packages = setuptools.find_packages(),
package_data = package_data,
py_modules = ['pkg_resources', 'easy_install'],
......@@ -196,4 +195,4 @@ setup_params = dict(
)
if __name__ == '__main__':
dist = setup(**setup_params)
dist = setuptools.setup(**setup_params)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment