From c11da5319d16fafe2c92127fbd96e624f2a66d68 Mon Sep 17 00:00:00 2001 From: huangtianhua Date: Thu, 11 Aug 2022 07:43:28 +0000 Subject: [PATCH] Fix conflict with python-migrate (cherry picked from commit 2f88af9057b67e5d8be6c3f5cd742b86f4339253) --- python-migrate-sqlalchemy-migrate.patch | 15 +++++++++++++++ python-sqlalchemy-migrate.spec | 8 ++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 python-migrate-sqlalchemy-migrate.patch diff --git a/python-migrate-sqlalchemy-migrate.patch b/python-migrate-sqlalchemy-migrate.patch new file mode 100644 index 0000000..70166bb --- /dev/null +++ b/python-migrate-sqlalchemy-migrate.patch @@ -0,0 +1,15 @@ +diff --git a/setup.cfg b/setup.cfg +index cd67566..03c1574 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -27,8 +27,8 @@ packages = + + [entry_points] + console_scripts = +- migrate = migrate.versioning.shell:main +- migrate-repository = migrate.versioning.migrate_repository:main ++ sqlalchemy-migrate = migrate.versioning.shell:main ++ sqlalchemy-migrate-repository = migrate.versioning.migrate_repository:main + + [build_sphinx] + all_files = 1 diff --git a/python-sqlalchemy-migrate.spec b/python-sqlalchemy-migrate.spec index 1ca5ef6..9530c02 100644 --- a/python-sqlalchemy-migrate.spec +++ b/python-sqlalchemy-migrate.spec @@ -1,11 +1,12 @@ %global _empty_manifest_terminate_build 0 Name: python-sqlalchemy-migrate Version: 0.13.0 -Release: 2 +Release: 3 Summary: Database schema migration for SQLAlchemy License: MIT License URL: http://www.openstack.org/ Source0: https://files.pythonhosted.org/packages/36/bb/40f66b12b18fb03da76dcee31df75cca9e54b71d9d8a784bb95bfbadee2c/sqlalchemy-migrate-0.13.0.tar.gz +Patch001: python-migrate-sqlalchemy-migrate.patch BuildArch: noarch Requires: python3-pbr @@ -53,7 +54,7 @@ database change repository mechanism which can be used from the command line as well as from inside python code. %prep -%autosetup -n sqlalchemy-migrate-0.13.0 +%autosetup -n sqlalchemy-migrate-0.13.0 -p1 %build %py3_build @@ -93,5 +94,8 @@ mv %{buildroot}/doclist.lst . %{_docdir}/* %changelog +* Thu Aug 11 2022 huangtianhua - 0.13.0-3 +- Fix conflict with python-migrate + * Mon Nov 23 2020 Python_Bot - Package Spec generated -- Gitee