From d56de8b27e93102c8c8671722dc5d84c59fddef6524c1ef89f6c73f61ccba5b5 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 20 May 2024 18:12:28 +0000 Subject: [PATCH 1/2] Accepting request 1174185 from Application:ERP:GNUHealth:Factory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - version 1.5.0 * naming scheme broken upstream * Add MERGE query * Support “UPSERT” with ON CONFLICT clause on INSERT query * Remove default escape char on LIKE and ILIKE * Add GROUPING SETS, CUBE, and ROLLUP clauses for GROUP BY. OBS-URL: https://build.opensuse.org/request/show/1174185 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-sql?expand=0&rev=21 --- python-python-sql.changes | 10 ++++++++++ python-python-sql.spec | 11 +++++++---- python-sql-1.4.3.tar.gz | 3 --- python_sql-1.5.0.tar.gz | 3 +++ 4 files changed, 20 insertions(+), 7 deletions(-) delete mode 100644 python-sql-1.4.3.tar.gz create mode 100644 python_sql-1.5.0.tar.gz diff --git a/python-python-sql.changes b/python-python-sql.changes index 4509042..96ed285 100644 --- a/python-python-sql.changes +++ b/python-python-sql.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed May 15 08:46:55 UTC 2024 - Axel Braun + +- version 1.5.0 + * naming scheme broken upstream + * Add MERGE query + * Support “UPSERT” with ON CONFLICT clause on INSERT query + * Remove default escape char on LIKE and ILIKE + * Add GROUPING SETS, CUBE, and ROLLUP clauses for GROUP BY. + ------------------------------------------------------------------- Sat Jan 13 14:06:41 UTC 2024 - Axel Braun diff --git a/python-python-sql.spec b/python-python-sql.spec index 484f7bc..cbe2459 100644 --- a/python-python-sql.spec +++ b/python-python-sql.spec @@ -1,5 +1,5 @@ # -# spec file +# spec file for package python-python-sql # # Copyright (c) 2024 SUSE LLC # @@ -28,13 +28,15 @@ %define base_name python-sql Name: python-%{base_name} -Version: 1.4.3 +Version: 1.5.0 Release: 0 Summary: Library to write SQL queries License: BSD-3-Clause Group: Development/Languages/Python URL: https://pypi.io/project/python-sql -Source: https://pypi.io/packages/source/p/%{base_name}/%{base_name}-%{version}.tar.gz +## Source: https://pypi.io/packages/source/p/%{base_name}/%{base_name}-%{version}.tar.gz +## Naming scheme broken upsream +Source: https://pypi.io/packages/source/p/%{base_name}/python_sql-%{version}.tar.gz BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} @@ -46,7 +48,8 @@ BuildArch: noarch python-sql is a library to write SQL queries in a pythonic way. %prep -%setup -q -n %{base_name}-%{version} +## %setup -q -n %{base_name}-%{version} +%autosetup -n python_sql-%{version} %build %pyproject_wheel diff --git a/python-sql-1.4.3.tar.gz b/python-sql-1.4.3.tar.gz deleted file mode 100644 index 6709dcc..0000000 --- a/python-sql-1.4.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6260beff835a35d3a0aec4f1da351b0be9caa1a0d94a6cba940a7cd8dcf66269 -size 33404 diff --git a/python_sql-1.5.0.tar.gz b/python_sql-1.5.0.tar.gz new file mode 100644 index 0000000..877a6b1 --- /dev/null +++ b/python_sql-1.5.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f70516b7ead59410c35a5fe791b4252ff8f08942e997b64c8cbcba9d29a26b4 +size 36355 From 3513a618c69ee20f8d104780fec61b2c3608bfab8f8296da9cacc0048287eb50 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 20 May 2024 18:19:52 +0000 Subject: [PATCH 2/2] - Clean up the SPEC file. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-sql?expand=0&rev=22 --- python-python-sql.changes | 5 +++++ python-python-sql.spec | 23 +++++++---------------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/python-python-sql.changes b/python-python-sql.changes index 96ed285..1be02f5 100644 --- a/python-python-sql.changes +++ b/python-python-sql.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 20 18:19:43 UTC 2024 - Matej Cepl + +- Clean up the SPEC file. + ------------------------------------------------------------------- Wed May 15 08:46:55 UTC 2024 - Axel Braun diff --git a/python-python-sql.spec b/python-python-sql.spec index cbe2459..aa6c6c1 100644 --- a/python-python-sql.spec +++ b/python-python-sql.spec @@ -16,30 +16,21 @@ # -%if 0%{?suse_version} >= 1550 -%define pythons python3 -%define mypython python3 -%define mysitelib %python3_sitelib -%else %{?sle15_python_module_pythons} -%define mypython %pythons -%define mysitelib %{expand:%%%{mypython}_sitelib} -%endif - -%define base_name python-sql -Name: python-%{base_name} +Name: python-python-sql Version: 1.5.0 Release: 0 Summary: Library to write SQL queries License: BSD-3-Clause Group: Development/Languages/Python URL: https://pypi.io/project/python-sql -## Source: https://pypi.io/packages/source/p/%{base_name}/%{base_name}-%{version}.tar.gz +## Source: https://pypi.io/packages/source/p/python-sql/python-sql-%%{version}.tar.gz ## Naming scheme broken upsream -Source: https://pypi.io/packages/source/p/%{base_name}/python_sql-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/p/python_sql/python_sql-%{version}.tar.gz BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} +BuildRequires: fdupes BuildRequires: python-rpm-macros BuildArch: noarch %python_subpackages @@ -48,7 +39,6 @@ BuildArch: noarch python-sql is a library to write SQL queries in a pythonic way. %prep -## %setup -q -n %{base_name}-%{version} %autosetup -n python_sql-%{version} %build @@ -56,6 +46,7 @@ python-sql is a library to write SQL queries in a pythonic way. %install %pyproject_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} %check mv sql sql_hide @@ -65,7 +56,7 @@ mv sql_hide sql %files %{python_files} %license COPYRIGHT %doc README.rst -%{mysitelib}/sql -%{mysitelib}/python_sql-%{version}.dist-info +%{python_sitelib}/sql +%{python_sitelib}/python_sql-%{version}.dist-info %changelog