]> git.ipfire.org Git - thirdparty/sqlalchemy/alembic.git/commitdiff
Merge branch 'edit-latest' of https://bitbucket.org/exhuma/alembic into pr46
authorMike Bayer <mike_mp@zzzcomputing.com>
Thu, 30 Jul 2015 17:43:05 +0000 (13:43 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Thu, 30 Jul 2015 17:43:05 +0000 (13:43 -0400)
1  2 
alembic/command.py
setup.py
tests/test_command.py

Simple merge
diff --cc setup.py
index 9cfd8c3d38d255397576624540a98506e5e979f5,aa653cbe18ebe7982e11e6f4e3df71a3f193c0a4..bba22667443cc0cf47b58daa00816a0997429a49
+++ 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:
Simple merge