diff --git a/CHANGES.rst b/CHANGES.rst index 988e571..f66ee53 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,9 @@ CHANGES tip (unreleased) ---------------- +1.2.0 (2013.01.27) +------------------ + - Moved primary development from `Bitbucket`_ to `GitHub`_. Bitbucket mirror will continue to receive updates; Bitbucket issue tracker will be closed once all issues tracked in it are resolved. diff --git a/setup.py b/setup.py index e8614e7..1738102 100644 --- a/setup.py +++ b/setup.py @@ -1,32 +1,14 @@ from setuptools import setup, find_packages -import subprocess -import os.path -try: - # don't get confused if our sdist is unzipped in a subdir of some - # other hg repo - if os.path.isdir('.hg'): - p = subprocess.Popen(['hg', 'parents', r'--template={rev}\n'], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) - if not p.returncode: - fh = open('HGREV', 'w') - fh.write(p.communicate()[0].splitlines()[0]) - fh.close() -except (OSError, IndexError): - pass - -try: - hgrev = open('HGREV').read() -except IOError: - hgrev = '' - -long_description = (open('README.rst').read() + + +long_description = (open('README.rst').read() + open('CHANGES.rst').read() + open('TODO.rst').read()) + setup( name='django-model-utils', - version='1.1.0.post%s' % hgrev, + version='1.2.0', description='Django model mixins and utilities', long_description=long_description, author='Carl Meyer',