diff --git a/SQLAlchemy-1.2.18.tar.gz b/SQLAlchemy-1.2.18.tar.gz deleted file mode 100644 index 65637d6..0000000 --- a/SQLAlchemy-1.2.18.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8027fa183f5be466030617a497b2d64e0e16c8d615e5a34bdf9fab6f66bf4723 -size 5675143 diff --git a/SQLAlchemy-1.3.0.tar.gz b/SQLAlchemy-1.3.0.tar.gz new file mode 100644 index 0000000..4e90d07 --- /dev/null +++ b/SQLAlchemy-1.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11ead7047ff3f394ed0d4b62aded6c5d970a9b718e1dc6add9f5e79442cc5b14 +size 5862243 diff --git a/python-SQLAlchemy.changes b/python-SQLAlchemy.changes index 38a0be6..27fbe6e 100644 --- a/python-SQLAlchemy.changes +++ b/python-SQLAlchemy.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Mar 6 13:27:40 UTC 2019 - Tomáš Chvátal + +- Add patch to fix test failure from upstream test.patch + +------------------------------------------------------------------- +Wed Mar 6 10:29:05 UTC 2019 - Tomáš Chvátal + +- Update to versrion 1.3.0: + * See https://docs.sqlalchemy.org/en/latest/changelog/migration_13.html + for deprecation list with this version + * For the changes see https://docs.sqlalchemy.org/en/latest/changelog/changelog_13.html + ------------------------------------------------------------------- Fri Feb 22 13:05:14 UTC 2019 - John Vandenberg diff --git a/python-SQLAlchemy.spec b/python-SQLAlchemy.spec index d473b84..1b0a89e 100644 --- a/python-SQLAlchemy.spec +++ b/python-SQLAlchemy.spec @@ -18,34 +18,31 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define oldpython python -%bcond_without tests Name: python-SQLAlchemy -Version: 1.2.18 +Version: 1.3.0 Release: 0 Summary: Database Abstraction Library License: MIT Group: Development/Languages/Python URL: http://www.sqlalchemy.org Source: https://files.pythonhosted.org/packages/source/S/SQLAlchemy/SQLAlchemy-%{version}.tar.gz +Patch0: test.patch # devel is needed for optional C extensions cprocessors.so, cresultproxy.so and cutils.so BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} +BuildRequires: fdupes +BuildRequires: python-rpm-macros +Provides: python-sqlalchemy = %{version} +Obsoletes: python-sqlalchemy < %{version} # SECTION test requirements BuildRequires: %{python_module mock} BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module pytest} # /SECTION -BuildRequires: fdupes -BuildRequires: python-rpm-macros -#BuildRequires: python-pysqlite %ifpython2 Obsoletes: %{oldpython}-sqlalchemy < %{version} Provides: %{oldpython}-sqlalchemy = %{version} %endif -%ifpython3 -Provides: python3-sqlalchemy = %{version} -Obsoletes: python3-sqlalchemy < %{version} -%endif %python_subpackages %description @@ -60,9 +57,7 @@ domain. %package -n %{name}-doc Summary: Documentation for python-SQLAlchemy Group: Documentation/Other -Provides: python-SQLAlchemy-doc = %{version} -Provides: python2-SQLAlchemy-doc = %{version} -Provides: python3-SQLAlchemy-doc = %{version} +Provides: %{python_module SQLAlchemy-doc = %{version}} BuildArch: noarch %description -n %{name}-doc @@ -73,6 +68,7 @@ reference for python-SQLAlchemy. %setup -q -n SQLAlchemy-%{version} rm -rf doc/build # Remove unnecessary scripts for building documentation sed -i 's/\r$//' examples/dynamic_dict/dynamic_dict.py +%patch0 -p1 %build export CFLAGS="%{optflags} -fno-strict-aliasing" @@ -82,10 +78,8 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %python_install %python_expand %fdupes %{buildroot}%{$python_sitearch} -%if %{with tests} %check -%python_expand py.test-%{$python_bin_suffix} -%endif +%python_expand py.test-%{$python_bin_suffix} -v %files %{python_files} %license LICENSE diff --git a/test.patch b/test.patch new file mode 100644 index 0000000..832c23b --- /dev/null +++ b/test.patch @@ -0,0 +1,36 @@ +From 3a2263fe7c244325748820840fb3084630f75705 Mon Sep 17 00:00:00 2001 +From: Mike Bayer +Date: Wed, 06 Mar 2019 08:18:26 -0500 +Subject: [PATCH] Loosen SingletonThreadPoolTest + +This test is non-critical as the SingletonThreadPool is +not production-level robust under multithreaded scenarios in +any case. + +Fixes: #4527 +Change-Id: Ie19ebd69438c97b2d8adb571f8f1b2c56894f7fb +--- + +diff --git a/test/engine/test_pool.py b/test/engine/test_pool.py +index 1aadd47..5979388 100644 +--- a/test/engine/test_pool.py ++++ b/test/engine/test_pool.py +@@ -15,6 +15,7 @@ + from sqlalchemy.testing import fixtures + from sqlalchemy.testing import is_ + from sqlalchemy.testing import is_not_ ++from sqlalchemy.testing import is_true + from sqlalchemy.testing.engines import testing_engine + from sqlalchemy.testing.mock import ANY + from sqlalchemy.testing.mock import call +@@ -1809,7 +1810,9 @@ + threads.append(th) + for th in threads: + th.join(join_timeout) +- eq_(len(p._all_conns), 3) ++ ++ lp = len(p._all_conns) ++ is_true(3 <= lp <=4) + + if strong_refs: + still_opened = len([c for c in sr if not c.close.call_count])