From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 30 Jul 2015 17:43:05 +0000 (-0400)
Subject: Merge branch 'edit-latest' of https://bitbucket.org/exhuma/alembic into pr46
X-Git-Tag: rel_0_8_0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4da2e156c7eec4d9ac5744ec39b263a801e9523;p=thirdparty%2Fsqlalchemy%2Falembic.git

Merge branch 'edit-latest' of https://bitbucket.org/exhuma/alembic into pr46
---

d4da2e156c7eec4d9ac5744ec39b263a801e9523
diff --cc setup.py
index 9cfd8c3d,aa653cbe..bba22667
--- a/setup.py
+++ b/setup.py
@@@ -15,8 -13,18 +15,9 @@@ readme = os.path.join(os.path.dirname(_
  requires = [
      'SQLAlchemy>=0.7.6',
      'Mako',
+     'python-editor>=0.3',
  ]
  
 -# Hack to prevent "TypeError: 'NoneType' object is not callable" error
 -# in multiprocessing/util.py _exit_function when running `python
 -# setup.py test` (see
 -# http://www.eby-sarna.com/pipermail/peak/2010-May/003357.html)
 -try:
 -    import multiprocessing
 -except ImportError:
 -    pass
 -
  try:
      import argparse
  except ImportError: