From 14c5132ecc08c8668cf0ff6f3301c6ed78df97e4 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Fri, 20 Jul 2012 10:33:20 -0700 Subject: [PATCH] change bcrypt requirement to py-bcrypt-w32 on windows --- setup.py | 126 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 79 insertions(+), 47 deletions(-) diff --git a/setup.py b/setup.py index 75dff85..c556063 100644 --- a/setup.py +++ b/setup.py @@ -85,7 +85,85 @@ if sys.version_info < (2, 7): 'argparse', # 1.2.1 'ordereddict', # 1.1 ] + +extras = { + + 'db': [ + # + # package # low high + + 'alembic', # 0.3.4 + 'SQLAlchemy', # 0.7.6 + 'Tempita', # 0.5.1 + ], + + 'docs': [ + # + # package # low high + + 'Sphinx', # 1.1.3 + ], + + 'pyramid': [ + # + # package # low high + + # Beaker dependency included here because 'pyramid_beaker' uses incorrect + # case in its requirement declaration. + 'Beaker', # 1.6.3 + + # Pyramid 1.3 introduced 'pcreate' command (and friends) to replace + # deprecated 'paster create' (and friends). + 'pyramid>=1.3a1', # 1.3b2 + + 'FormAlchemy', # 1.4.2 + 'FormEncode', # 1.2.4 + 'Mako', # 0.6.2 + 'pyramid_beaker', # 0.6.1 + 'pyramid_debugtoolbar', # 1.0 + 'pyramid_simpleform', # 0.6.1 + 'pyramid_tm', # 0.3 + 'Tempita', # 0.5.1 + 'transaction', # 1.2.0 + 'waitress', # 0.8.1 + 'WebHelpers', # 1.3 + 'zope.sqlalchemy', # 0.7 + ], + } + +if sys.platform == 'win32': + + extras['db'] += [ + # + # package # low high + + 'py-bcrypt-w32', # 0.2.2 + ] + + extras['pyramid'] += [ + # + # package # low high + + 'py-bcrypt-w32', # 0.2.2 + ] + +else: + + extras['db'] += [ + # + # package # low high + + 'py-bcrypt', # 0.2 + ] + + extras['pyramid'] += [ + # + # package # low high + + 'py-bcrypt', # 0.2 + ] + setup( name = "edbob", @@ -114,53 +192,7 @@ setup( ], install_requires = requires, - - extras_require = { - - 'db': [ - # - # package # low high - - 'alembic', # 0.3.4 - 'py-bcrypt', # 0.2 - 'SQLAlchemy', # 0.7.6 - 'Tempita', # 0.5.1 - ], - - 'docs': [ - # - # package # low high - - 'Sphinx', # 1.1.3 - ], - - 'pyramid': [ - # - # package # low high - - # Beaker dependency included here because 'pyramid_beaker' uses incorrect - # case in its requirement declaration. - 'Beaker', # 1.6.3 - - # Pyramid 1.3 introduced 'pcreate' command (and friends) to replace - # deprecated 'paster create' (and friends). - 'pyramid>=1.3a1', # 1.3b2 - - 'py-bcrypt', # 0.2 - 'FormAlchemy', # 1.4.2 - 'FormEncode', # 1.2.4 - 'Mako', # 0.6.2 - 'pyramid_beaker', # 0.6.1 - 'pyramid_debugtoolbar', # 1.0 - 'pyramid_simpleform', # 0.6.1 - 'pyramid_tm', # 0.3 - 'Tempita', # 0.5.1 - 'transaction', # 1.2.0 - 'waitress', # 0.8.1 - 'WebHelpers', # 1.3 - 'zope.sqlalchemy', # 0.7 - ], - }, + extras_require = extras, packages = find_packages(), include_package_data = True,