From f81c8da31e1318b0ab9d5424c06a2039bbef1151 Mon Sep 17 00:00:00 2001
From: Garrett Holmstrom <gholms@devzero.com>
Date: Wed, 19 Mar 2014 16:28:58 -0700
Subject: [PATCH] Version bump (0.2.0-pre1)

---
 requestbuilder/__init__.py |  4 ++--
 requirements.txt           |  2 ++
 requirements26.txt         |  3 +++
 setup.py                   | 15 +++++++++++----
 4 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 requirements.txt
 create mode 100644 requirements26.txt

diff --git a/requestbuilder/__init__.py b/requestbuilder/__init__.py
index fada733..2df694e 100644
--- a/requestbuilder/__init__.py
+++ b/requestbuilder/__init__.py
@@ -18,7 +18,7 @@ import os.path
 import subprocess
 
 
-__version__ = '0.2.0-dev'
+__version__ = '0.2.0-pre1'
 
 if '__file__' in globals():
     # Check if this is a git repo; maybe we can get more precise version info
@@ -30,7 +30,7 @@ if '__file__' in globals():
         git.wait()
         git.stderr.read()
         if git.returncode == 0:
-            __version__ = git.stdout.read().strip()
+            __version__ = git.stdout.read().strip().lstrip('v')
             if type(__version__).__name__ == 'bytes':
                 __version__ = __version__.decode()
     except:
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..c1fbba7
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,2 @@
+requests>=1
+six
diff --git a/requirements26.txt b/requirements26.txt
new file mode 100644
index 0000000..3965a39
--- /dev/null
+++ b/requirements26.txt
@@ -0,0 +1,3 @@
+argparse
+requests>=1
+six
diff --git a/setup.py b/setup.py
index b379650..59d8e50 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012, Eucalyptus Systems, Inc.
+# Copyright (c) 2012-2014, Eucalyptus Systems, Inc.
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
@@ -15,11 +15,19 @@
 from distutils.command.build_py import build_py
 from distutils.command.sdist import sdist
 import os.path
+import sys
+
 from setuptools import find_packages, setup
 
 from requestbuilder import __version__
 
 
+requirements = ['requests>=1',
+                'six']
+if sys.version_info < (2, 7):
+    requirements.append('argparse')
+
+
 class build_py_with_git_version(build_py):
     '''Like build_py, but also hardcoding the version in __init__.__version__
        so it's consistent even outside of the source tree'''
@@ -67,10 +75,9 @@ setup(name='requestbuilder',
       description='Command line-driven HTTP request builder',
       author='Garrett Holmstrom (gholms)',
       author_email='gholms@devzero.com',
+      url='https://github.com/boto/requestbuilder',
       packages=find_packages(),
-      install_requires=['argparse',
-                        'requests>=1',
-                        'six'],
+      install_requires=requirements,
       license='ISC',
       platforms='Posix; MacOS X',
       classifiers=['Development Status :: 3 - Alpha',