From 485174224404bdc1d0990a038fb82623d84ef524 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 27 Feb 2015 21:59:21 -0500 Subject: [PATCH] Update to modern pbr d2to1 hasn't been a thing in a VERY long time. We have to update hacking as well beause the hacking this depends on also depends on a very old pbr. Change-Id: I1bf97a5fe1c1ae10f951510c2b95d43b4e9b8b19 --- gerritbot/bot.py | 2 +- requirements.txt | 3 +-- setup.cfg | 4 ---- setup.py | 4 ++-- test-requirements.txt | 2 +- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/gerritbot/bot.py b/gerritbot/bot.py index 9927ce5..4107831 100755 --- a/gerritbot/bot.py +++ b/gerritbot/bot.py @@ -330,7 +330,7 @@ def _main(config): def main(): if len(sys.argv) != 2: - print "Usage: %s CONFIGFILE" % sys.argv[0] + print("Usage: %s CONFIGFILE" % sys.argv[0]) sys.exit(1) config = ConfigParser.ConfigParser({'force_ssl': 'false', diff --git a/requirements.txt b/requirements.txt index d867862..ae11532 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ -d2to1>=0.2.10,<0.3 -pbr>=0.5,<0.6 +pbr>=0.6,!=0.7,<1.0 gerritlib irc diff --git a/setup.cfg b/setup.cfg index e84865a..6a5497c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,10 +16,6 @@ classifier = Programming Language :: Python :: 2.7 Programming Language :: Python :: 2.6 -[global] -setup-hooks = - pbr.hooks.setup_hook - [entry_points] console_scripts = gerritbot = gerritbot.bot:main diff --git a/setup.py b/setup.py index 59a0090..c0a24ea 100644 --- a/setup.py +++ b/setup.py @@ -17,5 +17,5 @@ import setuptools setuptools.setup( - setup_requires=['d2to1', 'pbr'], - d2to1=True) + setup_requires=['pbr'], + pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index e272fe0..bb0ce44 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,2 +1,2 @@ -hacking>=0.5.4,<0.6 +hacking>=0.10.0,<0.11 sphinx>=1.1.2