From 3a70749e4ede9b2401fa64abc9df6114bc4ca35d Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Sun, 13 Jun 2021 19:10:17 +0200 Subject: [PATCH] version 1.4.18 Signed-off-by: Nils Philippsen --- .gitignore | 1 + 0001-filter-out-DeprecationWarnings.patch | 33 ------------------ ...9442ed94f0857a62de40e17e588250f0576e.patch | 34 ------------------- python-sqlalchemy.spec | 28 ++++----------- sources | 2 +- 5 files changed, 8 insertions(+), 90 deletions(-) delete mode 100644 0001-filter-out-DeprecationWarnings.patch delete mode 100644 dcdc9442ed94f0857a62de40e17e588250f0576e.patch diff --git a/.gitignore b/.gitignore index 3c7c8ff..dafa12d 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,4 @@ SQLAlchemy-0.6.1.tar.gz /SQLAlchemy-1.3.22.tar.gz /SQLAlchemy-1.4.14.tar.gz /SQLAlchemy-1.4.15.tar.gz +/SQLAlchemy-1.4.18.tar.gz diff --git a/0001-filter-out-DeprecationWarnings.patch b/0001-filter-out-DeprecationWarnings.patch deleted file mode 100644 index 9ae58f7..0000000 --- a/0001-filter-out-DeprecationWarnings.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a4b4548bb64789577aa87145acb66f41f2e55a40 Mon Sep 17 00:00:00 2001 -From: Tomas Hrnciar -Date: Wed, 26 May 2021 13:18:27 +0200 -Subject: [PATCH] filter out DeprecationWarnings - ---- - lib/sqlalchemy/testing/warnings.py | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/lib/sqlalchemy/testing/warnings.py b/lib/sqlalchemy/testing/warnings.py -index 3236ecf..37d0b81 100644 ---- a/lib/sqlalchemy/testing/warnings.py -+++ b/lib/sqlalchemy/testing/warnings.py -@@ -35,6 +35,16 @@ def setup_filters(): - category=DeprecationWarning, - message="The loop argument is deprecated", - ) -+ warnings.filterwarnings( -+ "ignore", -+ category=DeprecationWarning, -+ message="There is no current event loop", -+ ) -+ warnings.filterwarnings( -+ "ignore", -+ category=DeprecationWarning, -+ message="SelectableGroups dict interface is deprecated. Use select.", -+ ) - - # ignore things that are deprecated *as of* 2.0 :) - warnings.filterwarnings( --- -2.31.1 - diff --git a/dcdc9442ed94f0857a62de40e17e588250f0576e.patch b/dcdc9442ed94f0857a62de40e17e588250f0576e.patch deleted file mode 100644 index bd70a49..0000000 --- a/dcdc9442ed94f0857a62de40e17e588250f0576e.patch +++ /dev/null @@ -1,34 +0,0 @@ -From dcdc9442ed94f0857a62de40e17e588250f0576e Mon Sep 17 00:00:00 2001 -From: Mike Bayer -Date: Wed, 2 Jun 2021 23:07:28 -0400 -Subject: [PATCH] delete exception traceback in _expect_raises - -a new segfault is observed in python 3.10.0b2 in conjunction -with asyncio and possibly greenlet. Ensuring the -traceback object is deleted from scope here, which is a -good idea anyway, apparently seems to resolve the issue. - -Change-Id: Ia83bafb088ef19853044f1d436db259cbfd1e5f4 -References: https://github.com/python-greenlet/greenlet/issues/242 ---- - lib/sqlalchemy/testing/assertions.py | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/lib/sqlalchemy/testing/assertions.py b/lib/sqlalchemy/testing/assertions.py -index 9ff2f76eb5..b618021a67 100644 ---- a/lib/sqlalchemy/testing/assertions.py -+++ b/lib/sqlalchemy/testing/assertions.py -@@ -372,6 +372,13 @@ def _expect_raises(except_cls, msg=None, check_context=False): - _assert_proper_exception_context(err) - print(util.text_type(err).encode("utf-8")) - -+ # it's generally a good idea to not carry traceback objects outside -+ # of the except: block, but in this case especially we seem to have -+ # hit some bug in either python 3.10.0b2 or greenlet or both which -+ # this seems to fix: -+ # https://github.com/python-greenlet/greenlet/issues/242 -+ del ec -+ - # assert outside the block so it works for AssertionError too ! - assert success, "Callable did not raise an exception" - diff --git a/python-sqlalchemy.spec b/python-sqlalchemy.spec index 64d7c56..cf0c3c9 100644 --- a/python-sqlalchemy.spec +++ b/python-sqlalchemy.spec @@ -16,29 +16,16 @@ aiosqlite Name: python-sqlalchemy -Version: 1.4.15 +Version: 1.4.18 # cope with pre-release versions containing tildes %global srcversion %{lua: srcversion, num = rpm.expand("%{version}"):gsub("~", ""); print(srcversion);} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Modular and flexible ORM library for python License: MIT URL: http://www.sqlalchemy.org/ Source0: https://files.pythonhosted.org/packages/source/S/%{srcname}/%{srcname}-%{srcversion}.tar.gz -# SQLAlchemy fails with Python 3.10.0b1 due to DeprecationWarnings treated as an error. -# There are two different warnings filtered out: -# DeprecationWarning: SelectableGroups dict interface is deprecated. Use select. -# Upstream report: https://github.com/sqlalchemy/sqlalchemy/issues/6540 -# DeprecationWarning: There is no current event loop -# Upstream report: https://github.com/sqlalchemy/sqlalchemy/issues/6537 -# Downstream report: https://bugzilla.redhat.com/show_bug.cgi?id=1959305 -Patch1: 0001-filter-out-DeprecationWarnings.patch - -# SQLAlchemy segfault with Python 3.10 due to error in greenlet -# Upstream report: https://github.com/python-greenlet/greenlet/issues/242 -Patch2: https://github.com/sqlalchemy/sqlalchemy/commit/dcdc9442ed94f0857a62de40e17e588250f0576e.patch - BuildRequires: gcc BuildRequires: python3-devel >= 3.6 BuildRequires: python3-greenlet >= 1.0 @@ -89,8 +76,6 @@ This package includes the python 3 version of the module. %prep %setup -q -n %{srcname}-%{srcversion} -%patch1 -p1 -%patch2 -p1 # Remove flag for pytest-xdist. (python2-pytest-xdist is a removed dependency.) # (--max-worker-restart=5 would end the test run after 5 crashing tests.) @@ -106,11 +91,7 @@ sed -i -e's/\(addopts = .*\) --max-worker-restart=5/\1/' setup.cfg rm -rf doc/build %check -# One test is disabled due to compatibility issue with Python 3.10, once it is fixed it -# can be enabled again. -# Upstream report: https://github.com/sqlalchemy/sqlalchemy/issues/6543 -# Downstream report: https://bugzilla.redhat.com/show_bug.cgi?id=1959305 -PYTHONPATH=. %{__python3} -m pytest test -k "not test_error_other_loop" \ +PYTHONPATH=. %{__python3} -m pytest test \ %if %{with xdist} --numprocesses=auto %endif @@ -125,6 +106,9 @@ PYTHONPATH=. %{__python3} -m pytest test -k "not test_error_other_loop" \ %{python3_sitearch}/* %changelog +* Sun Jun 13 2021 Nils Philippsen - 1.4.18-1 +- version 1.4.18 + * Thu Jun 03 2021 Python Maint - 1.4.15-2 - Rebuilt for Python 3.10 diff --git a/sources b/sources index 19b41c2..ffa5599 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SQLAlchemy-1.4.15.tar.gz) = b9a640ccfb7caabb88c4891748699442073db2bea6d1e5a33eb508863616c94ddbf162b3ecd5e502daf20d798d20b8ef5b4b29ed679af9161e117a23862327c2 +SHA512 (SQLAlchemy-1.4.18.tar.gz) = 06110bf727fd6d83404da2e031a27163c06059bf9eae4cc5b79ce047b5bab67b54432890091fa03abd9644156b92569001ae78c48c22799ab3bec220d4bbe1a0