diff options
author | Monty Taylor <mordred@inaugust.com> | 2013-04-15 14:14:27 -0700 |
---|---|---|
committer | Monty Taylor <mordred@inaugust.com> | 2013-05-03 17:28:26 -0400 |
commit | 91cd062ceefb36e8da76d9a270fa814db16a7b92 (patch) | |
tree | 28fe5e2d1ed0779b38ab29bd6fb6f6e198be1fac | |
parent | 778d76ba2a35a3b94d752e578418310db789985a (diff) | |
download | pbr-91cd062ceefb36e8da76d9a270fa814db16a7b92.tar.gz |
Update to d2to1 0.2.10.
We fixed a string bug upstream which was released, and also added some
additional backwards_compat options.
Change-Id: I636a47952a90e6e0df864dbdc9243b77eeb6d77e
-rw-r--r-- | pbr/hooks.py | 12 | ||||
-rw-r--r-- | requirements.txt | 1 | ||||
-rwxr-xr-x | setup.py | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/pbr/hooks.py b/pbr/hooks.py index dd22501..0cc7c9c 100644 --- a/pbr/hooks.py +++ b/pbr/hooks.py @@ -58,10 +58,14 @@ pbr.packaging.LocalBuildLatex pbr.packaging.DistutilsInstall """ - #config['backwards_compat']['dependency_links'] = parse_dependency_links() - #config['backwards_compat']['include_package_data'] = True - #config['backwards_compat']['tests_require'] = parse_requirements( - # ["test-requirements.txt", "tools/test-requires"]) + backwards_compat = config.get('backwards_compat', dict()) + backwards_compat['dependency_links'] = "\n".join( + packaging.parse_dependency_links()) + backwards_compat['include_package_data'] = 'True' + backwards_compat['tests_require'] = "\n".join( + packaging.parse_requirements( + ["test-requirements.txt", "tools/test-requires"])) + config['backwards_compat'] = backwards_compat files = config.get('files', dict()) package = files.get('packages', metadata['name']).strip() diff --git a/requirements.txt b/requirements.txt index 77ecc09..4a3b096 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ +d2to1>=0.2.10,<0.3 distribute setuptools_git>=0.4 @@ -17,5 +17,5 @@ import setuptools setuptools.setup( - setup_requires=['d2to1'], + setup_requires=['d2to1>=0.2.10,<0.3'], d2to1=True) |