From 274c1aec91cf9cb6a22375682322e53a01e64d89 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 7 May 2019 17:47:03 -0400 Subject: [PATCH] import python-sqlalchemy-1.3.2-1.module+el8.0.0+2975+e0f02136 --- .gitignore | 2 +- .python-sqlalchemy.metadata | 2 +- ...hemy-1.2.8-ignore-DeprecationWarning.patch | 56 ------------------- .../python-sqlalchemy-1.2.8-sqlite-3.24.patch | 28 ---------- SPECS/python-sqlalchemy.spec | 23 ++++---- 5 files changed, 12 insertions(+), 99 deletions(-) delete mode 100644 SOURCES/python-sqlalchemy-1.2.8-ignore-DeprecationWarning.patch delete mode 100644 SOURCES/python-sqlalchemy-1.2.8-sqlite-3.24.patch diff --git a/.gitignore b/.gitignore index c8b5e65..2daf817 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/SQLAlchemy-1.2.8.tar.gz +SOURCES/SQLAlchemy-1.3.2.tar.gz diff --git a/.python-sqlalchemy.metadata b/.python-sqlalchemy.metadata index eb4e202..917195c 100644 --- a/.python-sqlalchemy.metadata +++ b/.python-sqlalchemy.metadata @@ -1 +1 @@ -db4a2965bc370072ed7bc245d956952bfb634b37 SOURCES/SQLAlchemy-1.2.8.tar.gz +277e64612df80a1fe9c05a33f69928f5de18f5fb SOURCES/SQLAlchemy-1.3.2.tar.gz diff --git a/SOURCES/python-sqlalchemy-1.2.8-ignore-DeprecationWarning.patch b/SOURCES/python-sqlalchemy-1.2.8-ignore-DeprecationWarning.patch deleted file mode 100644 index 78771ed..0000000 --- a/SOURCES/python-sqlalchemy-1.2.8-ignore-DeprecationWarning.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py -index 213f3a0..1518d2b 100644 ---- a/lib/sqlalchemy/util/langhelpers.py -+++ b/lib/sqlalchemy/util/langhelpers.py -@@ -371,7 +371,9 @@ def format_argspec_plus(fn, grouped=True): - else: - # we accept an existing argspec... - spec = fn -- args = inspect.formatargspec(*spec) -+ with warnings.catch_warnings(): -+ warnings.filterwarnings("ignore", category=DeprecationWarning) -+ args = inspect.formatargspec(*spec) - if spec[0]: - self_arg = spec[0][0] - elif spec[1]: -@@ -380,8 +382,10 @@ def format_argspec_plus(fn, grouped=True): - self_arg = None - - if compat.py3k: -- apply_pos = inspect.formatargspec(spec[0], spec[1], -- spec[2], None, spec[4]) -+ with warnings.catch_warnings(): -+ warnings.filterwarnings("ignore", category=DeprecationWarning) -+ apply_pos = inspect.formatargspec(spec[0], spec[1], -+ spec[2], None, spec[4]) - num_defaults = 0 - if spec[3]: - num_defaults += len(spec[3]) -@@ -400,9 +404,11 @@ def format_argspec_plus(fn, grouped=True): - else: - defaulted_vals = () - -- apply_kw = inspect.formatargspec(name_args, spec[1], spec[2], -- defaulted_vals, -- formatvalue=lambda x: '=' + x) -+ with warnings.catch_warnings(): -+ warnings.filterwarnings("ignore", category=DeprecationWarning) -+ apply_kw = inspect.formatargspec(name_args, spec[1], spec[2], -+ defaulted_vals, -+ formatvalue=lambda x: '=' + x) - if grouped: - return dict(args=args, self_arg=self_arg, - apply_pos=apply_pos, apply_kw=apply_kw) -@@ -646,8 +652,10 @@ def monkeypatch_proxied_specials(into_cls, from_cls, skip=None, only=None, - continue - try: - spec = compat.inspect_getargspec(fn) -- fn_args = inspect.formatargspec(spec[0]) -- d_args = inspect.formatargspec(spec[0][1:]) -+ with warnings.catch_warnings(): -+ warnings.filterwarnings("ignore", category=DeprecationWarning) -+ fn_args = inspect.formatargspec(spec[0]) -+ d_args = inspect.formatargspec(spec[0][1:]) - except TypeError: - fn_args = '(self, *args, **kw)' - d_args = '(*args, **kw)' diff --git a/SOURCES/python-sqlalchemy-1.2.8-sqlite-3.24.patch b/SOURCES/python-sqlalchemy-1.2.8-sqlite-3.24.patch deleted file mode 100644 index 9d78f42..0000000 --- a/SOURCES/python-sqlalchemy-1.2.8-sqlite-3.24.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3fd3ac6d554019f54efe1935f3a25cb5939fdad3 Mon Sep 17 00:00:00 2001 -From: Nils Philippsen -Date: Mon, 18 Jun 2018 00:08:38 +0200 -Subject: [PATCH] fix TypeReflectionTest for sqlite 3.24 - -SQLite 3.24 added support for PostgreSQL-style UPSERT. This added two -new keywords 'DO' and 'NOTHING' which made -test_round_trip_direct_type_affinity() fail with a syntax error. ---- - test/dialect/test_sqlite.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/dialect/test_sqlite.py b/test/dialect/test_sqlite.py -index 4c462aed1..d2d563208 100644 ---- a/test/dialect/test_sqlite.py -+++ b/test/dialect/test_sqlite.py -@@ -1637,7 +1637,7 @@ class TypeReflectionTest(fixtures.TestBase): - ("BLOBBER", sqltypes.NullType()), - ("DOUBLE PRECISION", sqltypes.REAL()), - ("FLOATY", sqltypes.REAL()), -- ("NOTHING WE KNOW", sqltypes.NUMERIC()), -+ ("SOMETHING UNKNOWN", sqltypes.NUMERIC()), - ] - - def _fixture_as_string(self, fixture): --- -2.17.1 - diff --git a/SPECS/python-sqlalchemy.spec b/SPECS/python-sqlalchemy.spec index cc032bd..310d08c 100644 --- a/SPECS/python-sqlalchemy.spec +++ b/SPECS/python-sqlalchemy.spec @@ -14,8 +14,8 @@ %global srcname SQLAlchemy Name: python-sqlalchemy -Version: 1.2.8 -Release: 6%{?dist} +Version: 1.3.2 +Release: 1%{?dist} Summary: Modular and flexible ORM library for python Group: Development/Libraries @@ -23,14 +23,6 @@ License: MIT URL: http://www.sqlalchemy.org/ Source0: https://files.pythonhosted.org/packages/source/S/%{srcname}/%{srcname}-%{version}.tar.gz -# There are DeprecationWarnings that prevent the tests from running on Python -# 3.7 Those should be fixed upstream, we ignore them instead -Patch0: python-sqlalchemy-1.2.8-ignore-DeprecationWarning.patch - -# Fix tests for sqlite 3.24 -# https://github.com/zzzeek/sqlalchemy/pull/452 -Patch1: python-sqlalchemy-1.2.8-sqlite-3.24.patch - BuildRequires: gcc %if %{with python2} @@ -108,9 +100,6 @@ This package includes the python 3 version of the module. %prep %setup -n %{srcname}-%{version} -%patch0 -p1 -b .ignore-DeprecationWarning -%patch1 -p1 -b .sqlite-3.24 - %build %{?with_python2:%py2_build} @@ -154,6 +143,14 @@ PYTHONPATH=. %{__python3} -m pytest test %endif # with python3 %changelog +* Fri Apr 05 2019 Charalampos Stratakis - 1.3.2-1 +- Rebase to 1.3.2 to fix CVE-2019-7164 and CVE-2019-7548 +Resolves: rhbz#1693978 + +* Wed Apr 03 2019 Tomas Orsava - 1.2.8-7 +- Bumping due to problems with modular RPM upgrade path (#1695587) +- Related: rhbz#1693974 + * Tue Jul 31 2018 Lumír Balhar - 1.2.8-6 - Switch python3 coditions to bcond