From: zooko <zooko@zooko.com>
Date: Thu, 10 Mar 2011 00:44:05 +0000 (+0530)
Subject: setup: install_requires argparse only if Python version is < 2.7
X-Git-Url: https://git.rkrishnan.org/pf/content/en/service/frontends/provisioning?a=commitdiff_plain;h=c728686b6a07a109b1b78500bf8bbc62f14534e5;p=tahoe-lafs%2Fzfec.git

setup: install_requires argparse only if Python version is < 2.7

Ignore-this: 457da4f3e4c598ec3386527a4620bdeb
Also edit some licensing metadata and Python compatibility metadata.

darcs-hash:061e2de3095bca92e03b8b1b371aa66229cdd1b4
---

diff --git a/zfec/setup.py b/zfec/setup.py
index ac7c313..fdb6785 100755
--- a/zfec/setup.py
+++ b/zfec/setup.py
@@ -2,7 +2,7 @@
 
 # zfec -- fast forward error correction library with Python interface
 #
-# Copyright (C) 2007-2010 Allmydata, Inc.
+# Copyright (C) 2007-2011 Allmydata, Inc.
 # Author: Zooko Wilcox-O'Hearn
 #
 # This file is part of zfec.
@@ -48,7 +48,7 @@ if DEBUGMODE:
 trove_classifiers=[
     "Development Status :: 5 - Production/Stable",
     "Environment :: Console",
-    "License :: OSI Approved :: GNU General Public License (GPL)",
+    "License :: OSI Approved :: GNU General Public License (GPL)", # See README.rst for alternative licensing.
     "License :: DFSG approved",
     "License :: Other/Proprietary License",
     "Intended Audience :: Developers",
@@ -68,6 +68,8 @@ trove_classifiers=[
     "Programming Language :: Python :: 2",
     "Programming Language :: Python :: 2.4",
     "Programming Language :: Python :: 2.5",
+    "Programming Language :: Python :: 2.6",
+    "Programming Language :: Python :: 2.7",
     "Topic :: Utilities",
     "Topic :: System :: Systems Administration",
     "Topic :: System :: Filesystems",
@@ -149,6 +151,11 @@ if readmetext[:3] == '\xef\xbb\xbf':
     # utf-8 "BOM"
     readmetext = readmetext[3:].decode('utf-8')
 
+install_requires=["pyutil >= 1.3.19"]
+
+if sys.version_info < (2, 7):
+    install_requires.append("argparse >= 0.8")
+
 setup(name=PKG,
       version=verstr,
       description='a fast erasure codec which can be used with the command-line, C, Python, or Haskell',
@@ -156,8 +163,8 @@ setup(name=PKG,
       author='Zooko O\'Whielacronx',
       author_email='zooko@zooko.com',
       url='http://tahoe-lafs.org/trac/'+PKG,
-      license='GNU GPL',
-      install_requires=["argparse >= 0.8", "pyutil >= 1.3.19"],
+      license='GNU GPL', # See README.rst for alternative licensing.
+      install_requires=install_requires,
       tests_require=tests_require,
       packages=find_packages(),
       include_package_data=True,