diff --git a/README.en.md b/README.en.md deleted file mode 100644 index aa9144cb1e8812f608cde156c48e83f91d3e4015..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# python-sqlalchemy - -#### Description -{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index 793e7e034d560fdade95574cdc2650ae14d4f8e4..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# python-sqlalchemy - -#### 介绍 -{**以下是码云平台说明，您可以替换此简介** -码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/SQLAlchemy-1.3.23.tar.gz b/SQLAlchemy-1.3.24.tar.gz similarity index 45% rename from SQLAlchemy-1.3.23.tar.gz rename to SQLAlchemy-1.3.24.tar.gz index 36507514058ce72d78ebf35df9c5bf0e0efad4fd..2a7a47b630bd9ea1e15bdeb3f8d479efe9dab589 100644 Binary files a/SQLAlchemy-1.3.23.tar.gz and b/SQLAlchemy-1.3.24.tar.gz differ diff --git a/sqlalchemy.spec b/sqlalchemy.spec index 51333d8fd5503813923e3867791debf12ebbb0dc..05c6bbaeb6df480f728444519a6a5a9933e277ff 100644 --- a/sqlalchemy.spec +++ b/sqlalchemy.spec @@ -1,14 +1,12 @@ -%global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/.*\\.so$ +%global __provides_exclude_from ^(%{python3_sitearch})/.*\\.so$ Name: python-sqlalchemy -Version: 1.3.23 +Version: 1.3.24 Release: 1 Summary: SQL toolkit and object relational mapper for Python License: MIT URL: http://www.sqlalchemy.org/ -Source0: https://files.pythonhosted.org/packages/ac/cd/f871773f1c1eb043f639b6751d6342539a45da0836bfede6a6889cea5255/SQLAlchemy-1.3.23.tar.gz - -Patch0: tests_overcome_bpo42967.patch +Source0: https://files.pythonhosted.org/packages/c5/ab/81bef2f960abf3cdaf32fbf1994f0c6f5e6a5f1667b5713ed6ebf162b6a2/SQLAlchemy-1.3.24.tar.gz BuildRequires: python3-devel python3-setuptools python3-pytest gcc @@ -64,6 +62,9 @@ PYTHONPATH=. %{__python3} -m pytest test %doc doc examples %changelog +* Wed Dec 22 2021 guozhaorui - 1.3.24-1 +- update to 1.3.24 + * Tue Aug 10 2021 OpenStack_SIG - 1.3.23-1 - update to 1.3.23 diff --git a/tests_overcome_bpo42967.patch b/tests_overcome_bpo42967.patch deleted file mode 100644 index c441b658cfda2dff3571f56465aa0facf0d30504..0000000000000000000000000000000000000000 --- a/tests_overcome_bpo42967.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- - lib/sqlalchemy/engine/url.py | 14 ++++++++++---- - test/dialect/mssql/test_engine.py | 3 ++- - 2 files changed, 12 insertions(+), 5 deletions(-) - ---- a/lib/sqlalchemy/engine/url.py -+++ b/lib/sqlalchemy/engine/url.py -@@ -14,6 +14,7 @@ argument; alternatively, the URL is a pu - be used directly and is also accepted directly by ``create_engine()``. - """ - -+import inspect - import re - - from .interfaces import Dialect -@@ -218,7 +219,7 @@ class URL(object): - return translated - - --def make_url(name_or_url): -+def make_url(name_or_url, separator='&'): - """Given a string or unicode instance, produce a new URL instance. - - The given string is parsed according to the RFC 1738 spec. If an -@@ -226,12 +227,12 @@ def make_url(name_or_url): - """ - - if isinstance(name_or_url, util.string_types): -- return _parse_rfc1738_args(name_or_url) -+ return _parse_rfc1738_args(name_or_url, separator) - else: - return name_or_url - - --def _parse_rfc1738_args(name): -+def _parse_rfc1738_args(name, qs_sep): - pattern = re.compile( - r""" - (?P[\w\+]+):// -@@ -261,7 +262,12 @@ def _parse_rfc1738_args(name): - if len(tokens) > 1: - query = {} - -- for key, value in util.parse_qsl(tokens[1]): -+ if 'separator' in inspect.signature(util.parse_qsl).parameters: -+ qs_dict = util.parse_qsl(tokens[1], separator=qs_sep) -+ else: -+ qs_dict = util.parse_qsl(tokens[1]) -+ -+ for key, value in qs_dict: - if util.py2k: - key = key.encode("ascii") - if key in query: ---- a/test/dialect/mssql/test_engine.py -+++ b/test/dialect/mssql/test_engine.py -@@ -164,7 +164,8 @@ class ParseConnectTest(fixtures.TestBase - u = url.make_url( - "mssql+pyodbc://@server_name/db_name?" - "driver=ODBC+Driver+17+for+SQL+Server;" -- "authentication=ActiveDirectoryIntegrated" -+ "authentication=ActiveDirectoryIntegrated", -+ separator=';' - ) - connection = dialect.create_connect_args(u) - eq_(connection[1], {}) -