diff --git a/0001-fix-none-type-judge.patch b/0001-fix-none-type-judge.patch deleted file mode 100644 index a36283ddd0a88ca09fad73e8ac727f8a2417e792..0000000000000000000000000000000000000000 --- a/0001-fix-none-type-judge.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 55c30253b61fb3e1fbe6db4b2cb8a487ce908fe6 Mon Sep 17 00:00:00 2001 -From: baizg1107 -Date: Mon, 20 Jun 2022 11:52:47 +0800 -Subject: [PATCH] fix none type judge - ---- - lib/sqlalchemy/engine/base.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py -index 0e695f6..fefc43b 100644 ---- a/lib/sqlalchemy/engine/base.py -+++ b/lib/sqlalchemy/engine/base.py -@@ -152,8 +152,9 @@ class Connection(Connectable): - account current schema translate map. - - """ -- -- name = obj.schema -+ name = None -+ if obj is not None: -+ name = obj.schema - schema_translate_map = self._execution_options.get( - "schema_translate_map", None - ) --- -2.27.0 - diff --git a/SQLAlchemy-1.4.48.tar.gz b/SQLAlchemy-2.0.32.tar.gz similarity index 50% rename from SQLAlchemy-1.4.48.tar.gz rename to SQLAlchemy-2.0.32.tar.gz index e5ed363f6471390c7d0b2adf22cd4e47e846ae2d..825157de2de65c389e9bd2ca0e6b4ccb34315c4a 100644 Binary files a/SQLAlchemy-1.4.48.tar.gz and b/SQLAlchemy-2.0.32.tar.gz differ diff --git a/sqlalchemy.spec b/sqlalchemy.spec index 239c880cfa787b8de6dc1fc2f5ec5443c766f9f5..6d8157bcc4ba9ba2569bab002abf2d5699b6bb37 100644 --- a/sqlalchemy.spec +++ b/sqlalchemy.spec @@ -1,14 +1,15 @@ %global __provides_exclude_from ^(%{python3_sitearch})/.*\\.so$ - +%define debug_package %{nil} Name: python-sqlalchemy -Version: 1.4.48 +Version: 2.0.32 Release: 1 Summary: SQL toolkit and object relational mapper for Python License: MIT URL: http://www.sqlalchemy.org/ Source0: https://files.pythonhosted.org/packages/source/S/SQLAlchemy/SQLAlchemy-%{version}.tar.gz -Patch0: 0001-fix-none-type-judge.patch BuildRequires: python3-devel python3-setuptools python3-pytest gcc python3-greenlet +BuildRequires: python3-pip python3-wheel python3-pdm-pep517 python3-typing-extensions python3-pytest-xdist +BuildRequires: python3-mypy Requires: python3-greenlet %description @@ -42,27 +43,33 @@ The python3-sqlalchemy package contains the python 3 version of the module. %prep %autosetup -n SQLAlchemy-%{version} -p1 +rm -rf doc/build # Remove unnecessary scripts for building documentation +sed -i 's/\r$//' examples/dynamic_dict/dynamic_dict.py + +find . -type f -name ".gitignore" -exec rm {} \; %build -%py3_build +%pyproject_build %install -%py3_install +%pyproject_install -rm -rf doc/build %check -PYTHONPATH=. %{__python3} -m pytest test +PYTHONPATH=. %{__python3} -m pytest -n2 -q %files -n python3-sqlalchemy %license LICENSE %doc README.rst -%{python3_sitearch}/* +%{python3_sitelib}/* %files help %doc doc examples %changelog +* Tue Oct 15 2024 xu_ping <707078654@qq.com> - 2.0.32-1 +- Update to 2.0.32 + * Fri Jun 16 2023 yaoxin - 1.4.48-1 - Update to 1.4.48