From e6dd75525a1063be57085c3638b0a78c6e88dc97 Mon Sep 17 00:00:00 2001
From: jab <jab@math.brown.edu>
Date: Sat, 30 May 2015 16:26:26 -0400
Subject: [PATCH] prepare 0.9.0rc0

---
 MANIFEST.in        |  2 +-
 VERSION            |  1 -
 bidict/VERSION     |  1 +
 docs/changelog.rst |  2 +-
 docs/conf.py       |  2 +-
 setup.py           | 17 +++++++++++------
 6 files changed, 15 insertions(+), 10 deletions(-)
 delete mode 100644 VERSION
 create mode 100644 bidict/VERSION

diff --git a/MANIFEST.in b/MANIFEST.in
index b107d2e..53f3d50 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,2 @@
 include README.rst
-include VERSION
+include bidict/VERSION
diff --git a/VERSION b/VERSION
deleted file mode 100644
index c70836c..0000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.9.0-dev
diff --git a/bidict/VERSION b/bidict/VERSION
new file mode 100644
index 0000000..c9e9a68
--- /dev/null
+++ b/bidict/VERSION
@@ -0,0 +1 @@
+0.9.0rc0
diff --git a/docs/changelog.rst b/docs/changelog.rst
index e0f8447..9feefab 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -3,7 +3,7 @@
 Changelog
 =========
 
-0.9.0 (not yet released)
+0.9.0rc0 (2015-05-30)
 ----------------------------
 
 - Add a Changelog!
diff --git a/docs/conf.py b/docs/conf.py
index ece2e93..f1153bb 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -59,7 +59,7 @@ copyright = u'2015 ' + author
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
-with io.open('../VERSION', encoding='utf8') as f:
+with io.open(os.path.abspath('../bidict/VERSION'), encoding='utf8') as f:
     # The full version, including alpha/beta/rc tags.
     release = f.read().strip()
 
diff --git a/setup.py b/setup.py
index 91d936c..d0032f9 100644
--- a/setup.py
+++ b/setup.py
@@ -1,16 +1,21 @@
 from io import open
 from setuptools import setup, Command
+from warnings import warn
 
 try:
-    with open('VERSION', encoding='utf8') as f:
-        version = f.read()
-except:
+    with open('bidict/VERSION', encoding='utf8') as f:
+        version = f.read().strip()
+except Exception as e:
     version = '999999'
+    warn('Could not open bidict/VERSION, using bogus version (%s): %r' %
+         (version, e))
 try:
     with open('README.rst', encoding='utf8') as f:
         long_description = f.read()
-except:
+except Exception as e:
     long_description = 'See https://bidict.readthedocs.org'
+    warn('Could not open README.rst, using provisional long_description '
+         '(%r): %r' % (long_description, e))
 
 tests_require = [
     'tox',
@@ -44,8 +49,8 @@ setup(
     keywords='dict, dictionary, mapping, bidirectional, bijection, bijective, injective, two-way, 2-way, double, inverse, reverse',
     url='https://github.com/jab/bidict',
     license='ISCL',
-    py_modules=['bidict'],
-    data_files=[('', ['VERSION'])],
+    packages=['bidict'],
+    package_data=dict(bidict=['VERSION']),
     zip_safe=True,
     classifiers=[
         'Development Status :: 4 - Beta',