Hello community,
here is the log from the commit of package python-Flask-Migrate for
openSUSE:Factory checked in at 2020-03-23 12:52:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-Flask-Migrate (Old)
and /work/SRC/openSUSE:Factory/.python-Flask-Migrate.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Flask-Migrate"
Mon Mar 23 12:52:07 2020 rev:6 rq:787381 version:2.5.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-Flask-Migrate/python-Flask-Migrate.changes
2019-09-17 13:37:28.869842170 +0200
+++
/work/SRC/openSUSE:Factory/.python-Flask-Migrate.new.3160/python-Flask-Migrate.changes
2020-03-23 12:53:15.464058040 +0100
@@ -1,0 +2,7 @@
+Mon Mar 23 09:15:41 UTC 2020 - Tomáš Chvátal <[email protected]>
+
+- Update to 2.5.3:
+ * Support for new python interpreters
+- Remove merged patch pr_290.patch
+
+-------------------------------------------------------------------
Old:
----
Flask-Migrate-2.5.2.tar.gz
pr_290.patch
New:
----
Flask-Migrate-2.5.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-Flask-Migrate.spec ++++++
--- /var/tmp/diff_new_pack.xgkD03/_old 2020-03-23 12:53:16.064058417 +0100
+++ /var/tmp/diff_new_pack.xgkD03/_new 2020-03-23 12:53:16.064058417 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-Flask-Migrate
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,20 +17,22 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%bcond_without python2
Name: python-Flask-Migrate
-Version: 2.5.2
+Version: 2.5.3
Release: 0
Summary: SQLAlchemy database migrations for Flask applications using
Alembic
License: MIT
-Group: Development/Languages/Python
-URL: http://github.com/miguelgrinberg/flask-migrate/
+URL: https://github.com/miguelgrinberg/flask-migrate/
Source:
https://files.pythonhosted.org/packages/source/F/Flask-Migrate/Flask-Migrate-%{version}.tar.gz
-Patch0: pr_290.patch
BuildRequires: %{python_module Flask >= 0.9}
BuildRequires: %{python_module Flask-SQLAlchemy >= 1.0}
BuildRequires: %{python_module Flask-Script >= 0.6}
BuildRequires: %{python_module alembic >= 0.7}
BuildRequires: %{python_module setuptools}
+%if %{with python2}
+BuildRequires: python-pathlib
+%endif
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-Flask >= 0.9
@@ -47,7 +49,6 @@
%prep
%setup -q -n Flask-Migrate-%{version}
-%patch0 -p1
%build
%python_build
@@ -58,7 +59,8 @@
%check
export LC_CTYPE=en_US.UTF-8
-%python_exec setup.py test
+export PYTHONDONTWRITEBYTECODE=1
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} $python -m unittest
discover -v
%files %{python_files}
%doc README.md
++++++ Flask-Migrate-2.5.2.tar.gz -> Flask-Migrate-2.5.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Flask-Migrate-2.5.2/Flask_Migrate.egg-info/PKG-INFO
new/Flask-Migrate-2.5.3/Flask_Migrate.egg-info/PKG-INFO
--- old/Flask-Migrate-2.5.2/Flask_Migrate.egg-info/PKG-INFO 2019-05-25
21:11:40.000000000 +0200
+++ new/Flask-Migrate-2.5.3/Flask_Migrate.egg-info/PKG-INFO 2020-03-14
11:04:08.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: Flask-Migrate
-Version: 2.5.2
+Version: 2.5.3
Summary: SQLAlchemy database migrations for Flask applications using Alembic
Home-page: http://github.com/miguelgrinberg/flask-migrate/
Author: Miguel Grinberg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Flask-Migrate-2.5.2/Flask_Migrate.egg-info/SOURCES.txt
new/Flask-Migrate-2.5.3/Flask_Migrate.egg-info/SOURCES.txt
--- old/Flask-Migrate-2.5.2/Flask_Migrate.egg-info/SOURCES.txt 2019-05-25
21:11:40.000000000 +0200
+++ new/Flask-Migrate-2.5.3/Flask_Migrate.egg-info/SOURCES.txt 2020-03-14
11:04:08.000000000 +0100
@@ -21,11 +21,11 @@
flask_migrate/templates/flask-multidb/env.py
flask_migrate/templates/flask-multidb/script.py.mako
tests/__init__.py
-tests/app.db
tests/app.py
tests/app_compare_type1.py
tests/app_compare_type2.py
tests/app_custom_directory.py
+tests/app_custom_directory_path.py
tests/app_multidb.py
tests/test_migrate.py
tests/test_migrate_flaskcli.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Flask-Migrate-2.5.2/PKG-INFO
new/Flask-Migrate-2.5.3/PKG-INFO
--- old/Flask-Migrate-2.5.2/PKG-INFO 2019-05-25 21:11:40.000000000 +0200
+++ new/Flask-Migrate-2.5.3/PKG-INFO 2020-03-14 11:04:08.327396900 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: Flask-Migrate
-Version: 2.5.2
+Version: 2.5.3
Summary: SQLAlchemy database migrations for Flask applications using Alembic
Home-page: http://github.com/miguelgrinberg/flask-migrate/
Author: Miguel Grinberg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Flask-Migrate-2.5.2/__version__
new/Flask-Migrate-2.5.3/__version__
--- old/Flask-Migrate-2.5.2/__version__ 2019-05-25 21:11:32.000000000 +0200
+++ new/Flask-Migrate-2.5.3/__version__ 2020-03-14 11:03:59.000000000 +0100
@@ -1 +1 @@
-2.5.2
+2.5.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Flask-Migrate-2.5.2/flask_migrate/__init__.py
new/Flask-Migrate-2.5.3/flask_migrate/__init__.py
--- old/Flask-Migrate-2.5.2/flask_migrate/__init__.py 2018-10-05
11:49:19.000000000 +0200
+++ new/Flask-Migrate-2.5.3/flask_migrate/__init__.py 2020-03-14
10:57:33.000000000 +0100
@@ -43,14 +43,14 @@
def __init__(self, app=None, db=None, directory='migrations', **kwargs):
self.configure_callbacks = []
self.db = db
- self.directory = directory
+ self.directory = str(directory)
self.alembic_ctx_kwargs = kwargs
if app is not None and db is not None:
self.init_app(app, db, directory)
def init_app(self, app, db=None, directory=None, **kwargs):
self.db = db or self.db
- self.directory = directory or self.directory
+ self.directory = str(directory or self.directory)
self.alembic_ctx_kwargs.update(kwargs)
if not hasattr(app, 'extensions'):
app.extensions = {}
@@ -69,6 +69,7 @@
def get_config(self, directory=None, x_arg=None, opts=None):
if directory is None:
directory = self.directory
+ directory = str(directory)
config = Config(os.path.join(directory, 'alembic.ini'))
config.set_main_option('script_location', directory)
if config.cmd_opts is None:
@@ -112,7 +113,7 @@
@MigrateCommand.option('-d', '--directory', dest='directory', default=None,
- help=("migration script directory (default is "
+ help=("Migration script directory (default is "
"'migrations')"))
@MigrateCommand.option('--multidb', dest='multidb', action='store_true',
default=False,
@@ -161,7 +162,7 @@
@MigrateCommand.option('-m', '--message', dest='message', default=None,
help='Revision message')
@MigrateCommand.option('-d', '--directory', dest='directory', default=None,
- help=("migration script directory (default is "
+ help=("Migration script directory (default is "
"'migrations')"))
@catch_errors
def revision(directory=None, message=None, autogenerate=False, sql=False,
@@ -169,12 +170,9 @@
rev_id=None):
"""Create a new revision file."""
config = current_app.extensions['migrate'].migrate.get_config(directory)
- if alembic_version >= (0, 7, 0):
- command.revision(config, message, autogenerate=autogenerate, sql=sql,
- head=head, splice=splice, branch_label=branch_label,
- version_path=version_path, rev_id=rev_id)
- else:
- command.revision(config, message, autogenerate=autogenerate, sql=sql)
+ command.revision(config, message, autogenerate=autogenerate, sql=sql,
+ head=head, splice=splice, branch_label=branch_label,
+ version_path=version_path, rev_id=rev_id)
@MigrateCommand.option('--rev-id', dest='rev_id', default=None,
@@ -198,7 +196,7 @@
"output instead"))
@MigrateCommand.option('-m', '--message', dest='message', default=None)
@MigrateCommand.option('-d', '--directory', dest='directory', default=None,
- help=("migration script directory (default is "
+ help=("Migration script directory (default is "
"'migrations')"))
@MigrateCommand.option('-x', '--x-arg', dest='x_arg', default=None,
action='append', help=("Additional arguments consumed "
@@ -209,18 +207,15 @@
"""Alias for 'revision --autogenerate'"""
config = current_app.extensions['migrate'].migrate.get_config(
directory, opts=['autogenerate'], x_arg=x_arg)
- if alembic_version >= (0, 7, 0):
- command.revision(config, message, autogenerate=True, sql=sql,
- head=head, splice=splice, branch_label=branch_label,
- version_path=version_path, rev_id=rev_id)
- else:
- command.revision(config, message, autogenerate=True, sql=sql)
+ command.revision(config, message, autogenerate=True, sql=sql,
+ head=head, splice=splice, branch_label=branch_label,
+ version_path=version_path, rev_id=rev_id)
@MigrateCommand.option('revision', nargs='?', default='head',
help="revision identifier")
@MigrateCommand.option('-d', '--directory', dest='directory', default=None,
- help=("migration script directory (default is "
+ help=("Migration script directory (default is "
"'migrations')"))
@catch_errors
def edit(directory=None, revision='current'):
@@ -243,19 +238,15 @@
@MigrateCommand.option('revisions', nargs='+',
help='one or more revisions, or "heads" for all heads')
@MigrateCommand.option('-d', '--directory', dest='directory', default=None,
- help=("migration script directory (default is "
+ help=("Migration script directory (default is "
"'migrations')"))
@catch_errors
def merge(directory=None, revisions='', message=None, branch_label=None,
rev_id=None):
"""Merge two revisions together. Creates a new migration file"""
- if alembic_version >= (0, 7, 0):
- config = current_app.extensions['migrate'].migrate.get_config(
- directory)
- command.merge(config, revisions, message=message,
- branch_label=branch_label, rev_id=rev_id)
- else:
- raise RuntimeError('Alembic 0.7.0 or greater is required')
+ config = current_app.extensions['migrate'].migrate.get_config(directory)
+ command.merge(config, revisions, message=message,
+ branch_label=branch_label, rev_id=rev_id)
@MigrateCommand.option('--tag', dest='tag', default=None,
@@ -267,7 +258,7 @@
@MigrateCommand.option('revision', nargs='?', default='head',
help="revision identifier")
@MigrateCommand.option('-d', '--directory', dest='directory', default=None,
- help=("migration script directory (default is "
+ help=("Migration script directory (default is "
"'migrations')"))
@MigrateCommand.option('-x', '--x-arg', dest='x_arg', default=None,
action='append', help=("Additional arguments consumed "
@@ -289,7 +280,7 @@
@MigrateCommand.option('revision', nargs='?', default="-1",
help="revision identifier")
@MigrateCommand.option('-d', '--directory', dest='directory', default=None,
- help=("migration script directory (default is "
+ help=("Migration script directory (default is "
"'migrations')"))
@MigrateCommand.option('-x', '--x-arg', dest='x_arg', default=None,
action='append', help=("Additional arguments consumed "
@@ -307,17 +298,13 @@
@MigrateCommand.option('revision', nargs='?', default="head",
help="revision identifier")
@MigrateCommand.option('-d', '--directory', dest='directory', default=None,
- help=("migration script directory (default is "
+ help=("Migration script directory (default is "
"'migrations')"))
@catch_errors
def show(directory=None, revision='head'):
"""Show the revision denoted by the given symbol."""
- if alembic_version >= (0, 7, 0):
- config = current_app.extensions['migrate'].migrate.get_config(
- directory)
- command.show(config, revision)
- else:
- raise RuntimeError('Alembic 0.7.0 or greater is required')
+ config = current_app.extensions['migrate'].migrate.get_config(directory)
+ command.show(config, revision)
@MigrateCommand.option('-i', '--indicate-current', dest='indicate_current',
action='store_true',
@@ -327,7 +314,7 @@
@MigrateCommand.option('-r', '--rev-range', dest='rev_range', default=None,
help='Specify a revision range; format is
[start]:[end]')
@MigrateCommand.option('-d', '--directory', dest='directory', default=None,
- help=("migration script directory (default is "
+ help=("Migration script directory (default is "
"'migrations')"))
@catch_errors
def history(directory=None, rev_range=None, verbose=False,
indicate_current=False):
@@ -335,10 +322,8 @@
config = current_app.extensions['migrate'].migrate.get_config(directory)
if alembic_version >= (0, 9, 9):
command.history(config, rev_range, verbose=verbose,
indicate_current=indicate_current)
- elif alembic_version >= (0, 7, 0):
- command.history(config, rev_range, verbose=verbose)
else:
- command.history(config, rev_range)
+ command.history(config, rev_range, verbose=verbose)
@MigrateCommand.option('--resolve-dependencies', dest='resolve_dependencies',
@@ -347,33 +332,26 @@
@MigrateCommand.option('-v', '--verbose', dest='verbose', action='store_true',
default=False, help='Use more verbose output')
@MigrateCommand.option('-d', '--directory', dest='directory', default=None,
- help=("migration script directory (default is "
+ help=("Migration script directory (default is "
"'migrations')"))
@catch_errors
def heads(directory=None, verbose=False, resolve_dependencies=False):
"""Show current available heads in the script directory"""
- if alembic_version >= (0, 7, 0):
- config = current_app.extensions['migrate'].migrate.get_config(
- directory)
- command.heads(config, verbose=verbose,
- resolve_dependencies=resolve_dependencies)
- else:
- raise RuntimeError('Alembic 0.7.0 or greater is required')
+ config = current_app.extensions['migrate'].migrate.get_config(directory)
+ command.heads(config, verbose=verbose,
+ resolve_dependencies=resolve_dependencies)
@MigrateCommand.option('-v', '--verbose', dest='verbose', action='store_true',
default=False, help='Use more verbose output')
@MigrateCommand.option('-d', '--directory', dest='directory', default=None,
- help=("migration script directory (default is "
+ help=("Migration script directory (default is "
"'migrations')"))
@catch_errors
def branches(directory=None, verbose=False):
"""Show current branch points"""
config = current_app.extensions['migrate'].migrate.get_config(directory)
- if alembic_version >= (0, 7, 0):
- command.branches(config, verbose=verbose)
- else:
- command.branches(config)
+ command.branches(config, verbose=verbose)
@MigrateCommand.option('--head-only', dest='head_only', action='store_true',
@@ -382,16 +360,13 @@
@MigrateCommand.option('-v', '--verbose', dest='verbose', action='store_true',
default=False, help='Use more verbose output')
@MigrateCommand.option('-d', '--directory', dest='directory', default=None,
- help=("migration script directory (default is "
+ help=("Migration script directory (default is "
"'migrations')"))
@catch_errors
def current(directory=None, verbose=False, head_only=False):
"""Display the current revision for each database."""
config = current_app.extensions['migrate'].migrate.get_config(directory)
- if alembic_version >= (0, 7, 0):
- command.current(config, verbose=verbose, head_only=head_only)
- else:
- command.current(config)
+ command.current(config, verbose=verbose, head_only=head_only)
@MigrateCommand.option('--tag', dest='tag', default=None,
@@ -402,7 +377,7 @@
"output instead"))
@MigrateCommand.option('revision', default=None, help="revision identifier")
@MigrateCommand.option('-d', '--directory', dest='directory', default=None,
- help=("migration script directory (default is "
+ help=("Migration script directory (default is "
"'migrations')"))
@catch_errors
def stamp(directory=None, revision='head', sql=False, tag=None):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Flask-Migrate-2.5.2/flask_migrate/cli.py
new/Flask-Migrate-2.5.3/flask_migrate/cli.py
--- old/Flask-Migrate-2.5.2/flask_migrate/cli.py 2018-10-05
11:40:39.000000000 +0200
+++ new/Flask-Migrate-2.5.3/flask_migrate/cli.py 2019-12-08
18:39:20.000000000 +0100
@@ -22,7 +22,7 @@
@db.command()
@click.option('-d', '--directory', default=None,
- help=('migration script directory (default is "migrations")'))
+ help=('Migration script directory (default is "migrations")'))
@click.option('--multidb', is_flag=True,
help=('Support multiple databases'))
@with_appcontext
@@ -33,7 +33,7 @@
@db.command()
@click.option('-d', '--directory', default=None,
- help=('migration script directory (default is "migrations")'))
+ help=('Migration script directory (default is "migrations")'))
@click.option('-m', '--message', default=None, help='Revision message')
@click.option('--autogenerate', is_flag=True,
help=('Populate revision script with candidate migration '
@@ -63,7 +63,7 @@
@db.command()
@click.option('-d', '--directory', default=None,
- help=('migration script directory (default is "migrations")'))
+ help=('Migration script directory (default is "migrations")'))
@click.option('-m', '--message', default=None, help='Revision message')
@click.option('--sql', is_flag=True,
help=('Don\'t emit SQL to database - dump to standard output '
@@ -92,7 +92,7 @@
@db.command()
@click.option('-d', '--directory', default=None,
- help=('migration script directory (default is "migrations")'))
+ help=('Migration script directory (default is "migrations")'))
@click.argument('revision', default='head')
@with_appcontext
def edit(directory, revision):
@@ -102,7 +102,7 @@
@db.command()
@click.option('-d', '--directory', default=None,
- help=('migration script directory (default is "migrations")'))
+ help=('Migration script directory (default is "migrations")'))
@click.option('-m', '--message', default=None, help='Merge revision message')
@click.option('--branch-label', default=None,
help=('Specify a branch label to apply to the new revision'))
@@ -118,12 +118,12 @@
@db.command()
@click.option('-d', '--directory', default=None,
- help=('migration script directory (default is "migrations")'))
+ help=('Migration script directory (default is "migrations")'))
@click.option('--sql', is_flag=True,
help=('Don\'t emit SQL to database - dump to standard output '
'instead'))
@click.option('--tag', default=None,
- help=('Arbitrary "tag" name - can be used by custom "env.py '
+ help=('Arbitrary "tag" name - can be used by custom env.py '
'scripts'))
@click.option('-x', '--x-arg', multiple=True,
help='Additional arguments consumed by custom env.py scripts')
@@ -136,12 +136,12 @@
@db.command()
@click.option('-d', '--directory', default=None,
- help=('migration script directory (default is "migrations")'))
+ help=('Migration script directory (default is "migrations")'))
@click.option('--sql', is_flag=True,
help=('Don\'t emit SQL to database - dump to standard output '
'instead'))
@click.option('--tag', default=None,
- help=('Arbitrary "tag" name - can be used by custom "env.py '
+ help=('Arbitrary "tag" name - can be used by custom env.py '
'scripts'))
@click.option('-x', '--x-arg', multiple=True,
help='Additional arguments consumed by custom env.py scripts')
@@ -154,7 +154,7 @@
@db.command()
@click.option('-d', '--directory', default=None,
- help=('migration script directory (default is "migrations")'))
+ help=('Migration script directory (default is "migrations")'))
@click.argument('revision', default='head')
@with_appcontext
def show(directory, revision):
@@ -164,7 +164,7 @@
@db.command()
@click.option('-d', '--directory', default=None,
- help=('migration script directory (default is "migrations")'))
+ help=('Migration script directory (default is "migrations")'))
@click.option('-r', '--rev-range', default=None,
help='Specify a revision range; format is [start]:[end]')
@click.option('-v', '--verbose', is_flag=True, help='Use more verbose output')
@@ -177,7 +177,7 @@
@db.command()
@click.option('-d', '--directory', default=None,
- help=('migration script directory (default is "migrations")'))
+ help=('Migration script directory (default is "migrations")'))
@click.option('-v', '--verbose', is_flag=True, help='Use more verbose output')
@click.option('--resolve-dependencies', is_flag=True,
help='Treat dependency versions as down revisions')
@@ -189,7 +189,7 @@
@db.command()
@click.option('-d', '--directory', default=None,
- help=('migration script directory (default is "migrations")'))
+ help=('Migration script directory (default is "migrations")'))
@click.option('-v', '--verbose', is_flag=True, help='Use more verbose output')
@with_appcontext
def branches(directory, verbose):
@@ -199,7 +199,7 @@
@db.command()
@click.option('-d', '--directory', default=None,
- help=('migration script directory (default is "migrations")'))
+ help=('Migration script directory (default is "migrations")'))
@click.option('-v', '--verbose', is_flag=True, help='Use more verbose output')
@click.option('--head-only', is_flag=True,
help='Deprecated. Use --verbose for additional output')
@@ -211,12 +211,12 @@
@db.command()
@click.option('-d', '--directory', default=None,
- help=('migration script directory (default is "migrations")'))
+ help=('Migration script directory (default is "migrations")'))
@click.option('--sql', is_flag=True,
help=('Don\'t emit SQL to database - dump to standard output '
'instead'))
@click.option('--tag', default=None,
- help=('Arbitrary "tag" name - can be used by custom "env.py '
+ help=('Arbitrary "tag" name - can be used by custom env.py '
'scripts'))
@click.argument('revision', default='head')
@with_appcontext
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Flask-Migrate-2.5.2/flask_migrate/templates/flask/env.py
new/Flask-Migrate-2.5.3/flask_migrate/templates/flask/env.py
--- old/Flask-Migrate-2.5.2/flask_migrate/templates/flask/env.py
2019-05-19 17:11:53.000000000 +0200
+++ new/Flask-Migrate-2.5.3/flask_migrate/templates/flask/env.py
2019-12-08 18:39:20.000000000 +0100
@@ -23,8 +23,8 @@
# target_metadata = mymodel.Base.metadata
from flask import current_app
config.set_main_option(
- 'sqlalchemy.url', current_app.config.get(
- 'SQLALCHEMY_DATABASE_URI').replace('%', '%%'))
+ 'sqlalchemy.url',
+ str(current_app.extensions['migrate'].db.engine.url).replace('%', '%%'))
target_metadata = current_app.extensions['migrate'].db.metadata
# other values from the config, defined by the needs of env.py,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Flask-Migrate-2.5.2/flask_migrate/templates/flask-multidb/env.py
new/Flask-Migrate-2.5.3/flask_migrate/templates/flask-multidb/env.py
--- old/Flask-Migrate-2.5.2/flask_migrate/templates/flask-multidb/env.py
2019-05-19 17:11:11.000000000 +0200
+++ new/Flask-Migrate-2.5.3/flask_migrate/templates/flask-multidb/env.py
2019-12-08 18:39:20.000000000 +0100
@@ -27,13 +27,15 @@
# from myapp import mymodel
# target_metadata = mymodel.Base.metadata
config.set_main_option(
- 'sqlalchemy.url', current_app.config.get(
- 'SQLALCHEMY_DATABASE_URI').replace('%', '%%'))
+ 'sqlalchemy.url',
+ str(current_app.extensions['migrate'].db.engine.url).replace('%', '%%'))
bind_names = []
-for name, url in current_app.config.get("SQLALCHEMY_BINDS").items():
- context.config.set_section_option(name, "sqlalchemy.url", url.replace(
- '%', '%%'))
- bind_names.append(name)
+for bind in current_app.config.get("SQLALCHEMY_BINDS"):
+ context.config.set_section_option(
+ bind, "sqlalchemy.url",
+ str(current_app.extensions['migrate'].db.get_engine(
+ current_app, bind).url).replace('%', '%%'))
+ bind_names.append(bind)
target_metadata = current_app.extensions['migrate'].db.metadata
Binary files old/Flask-Migrate-2.5.2/tests/app.db and
new/Flask-Migrate-2.5.3/tests/app.db differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Flask-Migrate-2.5.2/tests/app.py
new/Flask-Migrate-2.5.3/tests/app.py
--- old/Flask-Migrate-2.5.2/tests/app.py 2019-05-19 17:22:26.000000000
+0200
+++ new/Flask-Migrate-2.5.3/tests/app.py 2019-12-12 00:11:30.000000000
+0100
@@ -19,5 +19,12 @@
id = db.Column(db.Integer, primary_key=True)
name = db.Column(db.String(128))
+
[email protected]
+def add():
+ db.session.add(User(name='test'))
+ db.session.commit()
+
+
if __name__ == '__main__':
manager.run()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Flask-Migrate-2.5.2/tests/app_custom_directory.py
new/Flask-Migrate-2.5.3/tests/app_custom_directory.py
--- old/Flask-Migrate-2.5.2/tests/app_custom_directory.py 2018-08-12
00:10:47.000000000 +0200
+++ new/Flask-Migrate-2.5.3/tests/app_custom_directory.py 2019-12-12
00:11:34.000000000 +0100
@@ -19,5 +19,11 @@
name = db.Column(db.String(128))
[email protected]
+def add():
+ db.session.add(User(name='test'))
+ db.session.commit()
+
+
if __name__ == '__main__':
manager.run()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Flask-Migrate-2.5.2/tests/app_custom_directory_path.py
new/Flask-Migrate-2.5.3/tests/app_custom_directory_path.py
--- old/Flask-Migrate-2.5.2/tests/app_custom_directory_path.py 1970-01-01
01:00:00.000000000 +0100
+++ new/Flask-Migrate-2.5.3/tests/app_custom_directory_path.py 2020-03-14
10:57:33.000000000 +0100
@@ -0,0 +1,30 @@
+from flask import Flask
+from flask_sqlalchemy import SQLAlchemy
+from flask_script import Manager
+from flask_migrate import Migrate, MigrateCommand
+from pathlib import Path
+
+app = Flask(__name__)
+app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///app.db'
+app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
+
+db = SQLAlchemy(app)
+migrate = Migrate(app, db, directory=Path('temp_folder/temp_migrations'))
+
+manager = Manager(app)
+manager.add_command('db', MigrateCommand)
+
+
+class User(db.Model):
+ id = db.Column(db.Integer, primary_key=True)
+ name = db.Column(db.String(128))
+
+
[email protected]
+def add():
+ db.session.add(User(name='test'))
+ db.session.commit()
+
+
+if __name__ == '__main__':
+ manager.run()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Flask-Migrate-2.5.2/tests/app_multidb.py
new/Flask-Migrate-2.5.3/tests/app_multidb.py
--- old/Flask-Migrate-2.5.2/tests/app_multidb.py 2018-08-12
00:10:47.000000000 +0200
+++ new/Flask-Migrate-2.5.3/tests/app_multidb.py 2019-12-12
00:09:00.000000000 +0100
@@ -24,11 +24,19 @@
id = db.Column(db.Integer, primary_key=True)
name = db.Column(db.String(128))
+
migrate = Migrate(app, db)
manager = Manager(app)
manager.add_command('db', MigrateCommand)
[email protected]
+def add():
+ db.session.add(User(name='test'))
+ db.session.add(Group(name='group'))
+ db.session.commit()
+
+
if __name__ == '__main__':
manager.run()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Flask-Migrate-2.5.2/tests/test_migrate.py
new/Flask-Migrate-2.5.3/tests/test_migrate.py
--- old/Flask-Migrate-2.5.2/tests/test_migrate.py 2019-05-19
17:26:10.000000000 +0200
+++ new/Flask-Migrate-2.5.3/tests/test_migrate.py 2020-03-14
10:57:33.000000000 +0100
@@ -1,8 +1,9 @@
import os
+import shlex
import shutil
-import unittest
import subprocess
-import shlex
+import sys
+import unittest
def run_cmd(cmd):
@@ -53,37 +54,43 @@
self.assertTrue(isinstance(v, int))
def test_migrate_upgrade(self):
- (o, e, s) = run_cmd('python app.py db init')
+ (o, e, s) = run_cmd(sys.executable + ' app.py db init')
self.assertTrue(s == 0)
- (o, e, s) = run_cmd('python app.py db migrate')
+ (o, e, s) = run_cmd(sys.executable + ' app.py db migrate')
self.assertTrue(s == 0)
- (o, e, s) = run_cmd('python app.py db upgrade')
+ (o, e, s) = run_cmd(sys.executable + ' app.py db upgrade')
+ self.assertTrue(s == 0)
+ (o, e, s) = run_cmd(sys.executable + ' app.py add')
self.assertTrue(s == 0)
-
- from .app import db, User
- db.session.add(User(name='test'))
- db.session.commit()
def test_custom_directory(self):
- (o, e, s) = run_cmd('python app_custom_directory.py db init')
+ (o, e, s) = run_cmd(sys.executable + ' app_custom_directory.py db
init')
self.assertTrue(s == 0)
- (o, e, s) = run_cmd('python app_custom_directory.py db migrate')
+ (o, e, s) = run_cmd(sys.executable + ' app_custom_directory.py db
migrate')
self.assertTrue(s == 0)
- (o, e, s) = run_cmd('python app_custom_directory.py db upgrade')
+ (o, e, s) = run_cmd(sys.executable + ' app_custom_directory.py db
upgrade')
+ self.assertTrue(s == 0)
+ (o, e, s) = run_cmd(sys.executable + ' app_custom_directory.py add')
self.assertTrue(s == 0)
- from .app_custom_directory import db, User
- db.session.add(User(name='test'))
- db.session.commit()
+ def test_custom_directory_path(self):
+ (o, e, s) = run_cmd(sys.executable + ' app_custom_directory_path.py db
init')
+ self.assertTrue(s == 0)
+ (o, e, s) = run_cmd(sys.executable + ' app_custom_directory_path.py db
migrate')
+ self.assertTrue(s == 0)
+ (o, e, s) = run_cmd(sys.executable + ' app_custom_directory_path.py db
upgrade')
+ self.assertTrue(s == 0)
+ (o, e, s) = run_cmd(sys.executable + ' app_custom_directory_path.py
add')
+ self.assertTrue(s == 0)
def test_compare_type(self):
- (o, e, s) = run_cmd('python app_compare_type1.py db init')
+ (o, e, s) = run_cmd(sys.executable + ' app_compare_type1.py db init')
self.assertTrue(s == 0)
- (o, e, s) = run_cmd('python app_compare_type1.py db migrate')
+ (o, e, s) = run_cmd(sys.executable + ' app_compare_type1.py db
migrate')
self.assertTrue(s == 0)
- (o, e, s) = run_cmd('python app_compare_type1.py db upgrade')
+ (o, e, s) = run_cmd(sys.executable + ' app_compare_type1.py db
upgrade')
self.assertTrue(s == 0)
- (o, e, s) = run_cmd('python app_compare_type2.py db migrate')
+ (o, e, s) = run_cmd(sys.executable + ' app_compare_type2.py db
migrate')
self.assertTrue(s == 0)
self.assertTrue(b'Detected type change from VARCHAR(length=128) '
b'to String(length=10)' in e)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Flask-Migrate-2.5.2/tests/test_migrate_flaskcli.py
new/Flask-Migrate-2.5.3/tests/test_migrate_flaskcli.py
--- old/Flask-Migrate-2.5.2/tests/test_migrate_flaskcli.py 2019-05-19
17:26:24.000000000 +0200
+++ new/Flask-Migrate-2.5.3/tests/test_migrate_flaskcli.py 2020-03-14
10:57:33.000000000 +0100
@@ -77,6 +77,18 @@
db.session.add(User(name='test'))
db.session.commit()
+ def test_custom_directory_path(self):
+ (o, e, s) = run_cmd('app_custom_directory_path.py', 'flask db init')
+ self.assertTrue(s == 0)
+ (o, e, s) = run_cmd('app_custom_directory_path.py', 'flask db migrate')
+ self.assertTrue(s == 0)
+ (o, e, s) = run_cmd('app_custom_directory_path.py', 'flask db upgrade')
+ self.assertTrue(s == 0)
+
+ from .app_custom_directory_path import db, User
+ db.session.add(User(name='test'))
+ db.session.commit()
+
def test_compare_type(self):
(o, e, s) = run_cmd('app_compare_type1.py', 'flask db init')
self.assertTrue(s == 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Flask-Migrate-2.5.2/tests/test_multidb_migrate.py
new/Flask-Migrate-2.5.3/tests/test_multidb_migrate.py
--- old/Flask-Migrate-2.5.2/tests/test_multidb_migrate.py 2018-08-12
00:10:47.000000000 +0200
+++ new/Flask-Migrate-2.5.3/tests/test_multidb_migrate.py 2019-12-12
00:09:27.000000000 +0100
@@ -1,9 +1,10 @@
import os
-import shutil
-import unittest
-import subprocess
import shlex
+import shutil
import sqlite3
+import subprocess
+import sys
+import unittest
def run_cmd(cmd):
@@ -39,11 +40,11 @@
pass
def test_multidb_migrate_upgrade(self):
- (o, e, s) = run_cmd('python app_multidb.py db init --multidb')
+ (o, e, s) = run_cmd(sys.executable + ' app_multidb.py db init
--multidb')
self.assertTrue(s == 0)
- (o, e, s) = run_cmd('python app_multidb.py db migrate')
+ (o, e, s) = run_cmd(sys.executable + ' app_multidb.py db migrate')
self.assertTrue(s == 0)
- (o, e, s) = run_cmd('python app_multidb.py db upgrade')
+ (o, e, s) = run_cmd(sys.executable + ' app_multidb.py db upgrade')
self.assertTrue(s == 0)
# ensure the tables are in the correct databases
@@ -64,13 +65,11 @@
self.assertIn(('group',), tables)
# ensure the databases can be written to
- from .app_multidb import db, User, Group
- db.session.add(User(name='test'))
- db.session.add(Group(name='group'))
- db.session.commit()
+ (o, e, s) = run_cmd(sys.executable + ' app_multidb.py add')
+ self.assertTrue(s == 0)
# ensure the downgrade works
- (o, e, s) = run_cmd('python app_multidb.py db downgrade')
+ (o, e, s) = run_cmd(sys.executable + ' app_multidb.py db downgrade')
self.assertTrue(s == 0)
conn1 = sqlite3.connect('app1.db')
