From c94e89154fdb69a818641e5f1ea4c99575f5d9c139789d09da37e23aae3e3a41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 12 Mar 2020 07:37:14 +0000 Subject: [PATCH 1/3] - Fix build without python2 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-SQLAlchemy?expand=0&rev=162 --- python-SQLAlchemy.changes | 5 +++++ python-SQLAlchemy.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python-SQLAlchemy.changes b/python-SQLAlchemy.changes index 4e1da01..bc85e92 100644 --- a/python-SQLAlchemy.changes +++ b/python-SQLAlchemy.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 12 07:37:00 UTC 2020 - Tomáš Chvátal + +- Fix build without python2 + ------------------------------------------------------------------- Sun Jan 26 21:18:31 UTC 2020 - Arun Persaud diff --git a/python-SQLAlchemy.spec b/python-SQLAlchemy.spec index ccd7577..af9c0bd 100644 --- a/python-SQLAlchemy.spec +++ b/python-SQLAlchemy.spec @@ -83,7 +83,7 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %license LICENSE %doc CHANGES README.rst README.dialects.rst README.unittests.rst %{python_sitearch}/sqlalchemy/ -%{python_sitearch}/SQLAlchemy-%{version}-py%{py_ver}.egg-info +%{python_sitearch}/SQLAlchemy-%{version}-py*.egg-info %files -n %{name}-doc %doc doc/ From 20d1799fa33385925198ce6bf4bf186e033a0bd9b7f668dd621e71f5c07214c7 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 14 Mar 2020 12:37:55 +0000 Subject: [PATCH 2/3] - update to 1.3.15: * Adjusted the error message emitted by :meth:`.Query.join` when a left hand side can't be located that the :meth:`.Query.select_from` method is the best way to resolve the issue. Also, within the 1.3 series, used a deterministic ordering when determining the FROM clause from a given column entity passed to :class:`.Query` so that the same expression is determined each time. * Fixed regression in 1.3.14 due to :ticket:`4849` where a sys.exc_info() call failed to be invoked correctly when a flush error would occur. Test coverage has been added for this exception case. * Fixed bug where a CTE of an INSERT/UPDATE/DELETE that also uses RETURNING could then not be SELECTed from directly, as the internal state of the compiler would try to treat the outer SELECT as a DELETE statement itself and access nonexistent state. * Fixed regression caused in 1.3.13 by :ticket:`5056` where a refactor of the ORM path registry system made it such that a path could no longer be compared to an empty tuple, which can occur in a particular kind of joined eager loading path. The "empty tuple" use case has been resolved so that the path registry is compared to a path registry in all cases; OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-SQLAlchemy?expand=0&rev=163 --- SQLAlchemy-1.3.13.tar.gz | 3 --- SQLAlchemy-1.3.15.tar.gz | 3 +++ python-SQLAlchemy.changes | 23 +++++++++++++++++++++++ python-SQLAlchemy.spec | 2 +- 4 files changed, 27 insertions(+), 4 deletions(-) delete mode 100644 SQLAlchemy-1.3.13.tar.gz create mode 100644 SQLAlchemy-1.3.15.tar.gz diff --git a/SQLAlchemy-1.3.13.tar.gz b/SQLAlchemy-1.3.13.tar.gz deleted file mode 100644 index 788ec0a..0000000 --- a/SQLAlchemy-1.3.13.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64a7b71846db6423807e96820993fa12a03b89127d278290ca25c0b11ed7b4fb -size 6040899 diff --git a/SQLAlchemy-1.3.15.tar.gz b/SQLAlchemy-1.3.15.tar.gz new file mode 100644 index 0000000..3044166 --- /dev/null +++ b/SQLAlchemy-1.3.15.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4cca4aed606297afbe90d4306b49ad3a4cd36feb3f87e4bfd655c57fd9ef445 +size 6060775 diff --git a/python-SQLAlchemy.changes b/python-SQLAlchemy.changes index bc85e92..ab0279f 100644 --- a/python-SQLAlchemy.changes +++ b/python-SQLAlchemy.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Sat Mar 14 12:26:48 UTC 2020 - Dirk Mueller + +- update to 1.3.15: + * Adjusted the error message emitted by :meth:`.Query.join` when a left hand + side can't be located that the :meth:`.Query.select_from` method is the + best way to resolve the issue. Also, within the 1.3 series, used a + deterministic ordering when determining the FROM clause from a given column + entity passed to :class:`.Query` so that the same expression is determined + each time. + * Fixed regression in 1.3.14 due to :ticket:`4849` where a sys.exc_info() + call failed to be invoked correctly when a flush error would occur. Test + coverage has been added for this exception case. + * Fixed bug where a CTE of an INSERT/UPDATE/DELETE that also uses RETURNING + could then not be SELECTed from directly, as the internal state of the + compiler would try to treat the outer SELECT as a DELETE statement itself + and access nonexistent state. + * Fixed regression caused in 1.3.13 by :ticket:`5056` where a refactor of the + ORM path registry system made it such that a path could no longer be + compared to an empty tuple, which can occur in a particular kind of joined + eager loading path. The "empty tuple" use case has been resolved so that + the path registry is compared to a path registry in all cases; + ------------------------------------------------------------------- Thu Mar 12 07:37:00 UTC 2020 - Tomáš Chvátal diff --git a/python-SQLAlchemy.spec b/python-SQLAlchemy.spec index af9c0bd..db4de77 100644 --- a/python-SQLAlchemy.spec +++ b/python-SQLAlchemy.spec @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define oldpython python Name: python-SQLAlchemy -Version: 1.3.13 +Version: 1.3.15 Release: 0 Summary: Database Abstraction Library License: MIT From 7e5a97dcab0ac219fa30c0f8addee45223e06f0110e1be7668392a55f92ab5c2 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 21 Mar 2020 14:58:35 +0000 Subject: [PATCH 3/3] - Fix build for older distributions by buildrequiring a new-enough pytest OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-SQLAlchemy?expand=0&rev=164 --- python-SQLAlchemy.changes | 1 + python-SQLAlchemy.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/python-SQLAlchemy.changes b/python-SQLAlchemy.changes index ab0279f..ec3e8df 100644 --- a/python-SQLAlchemy.changes +++ b/python-SQLAlchemy.changes @@ -20,6 +20,7 @@ Sat Mar 14 12:26:48 UTC 2020 - Dirk Mueller compared to an empty tuple, which can occur in a particular kind of joined eager loading path. The "empty tuple" use case has been resolved so that the path registry is compared to a path registry in all cases; +- Fix build for older distributions by buildrequiring a new-enough pytest ------------------------------------------------------------------- Thu Mar 12 07:37:00 UTC 2020 - Tomáš Chvátal diff --git a/python-SQLAlchemy.spec b/python-SQLAlchemy.spec index db4de77..bfc707f 100644 --- a/python-SQLAlchemy.spec +++ b/python-SQLAlchemy.spec @@ -36,8 +36,8 @@ Provides: python-sqlalchemy = %{version} Obsoletes: python-sqlalchemy < %{version} # SECTION test requirements BuildRequires: %{python_module mock} +BuildRequires: %{python_module pytest >= 4.4.0} BuildRequires: %{python_module pytest-xdist} -BuildRequires: %{python_module pytest} # /SECTION %ifpython2 Obsoletes: %{oldpython}-sqlalchemy < %{version}