From 9d9da86945b1638788b87d58e8625753da702ffc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:16:51 +0000 Subject: [PATCH 01/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- vertica-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vertica-python.spec b/vertica-python.spec index a7a5236..9d359a8 100644 --- a/vertica-python.spec +++ b/vertica-python.spec @@ -3,7 +3,7 @@ Name: vertica-python Version: 0.6.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A native Python adapter for the Vertica database Group: Development/Languages @@ -61,6 +61,9 @@ vertica-python is a native Python adapter for the Vertica %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0.6.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Apr 21 2017 Jakub Jedelsky - 0.6.14-1 - Update to version 0.6.14 From 311096b9f08871b58986722b4a8aa68f44e337e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 17 Dec 2017 12:47:15 -0500 Subject: [PATCH 02/10] Python 2 binary package renamed to python2-vertica --- vertica-python.spec | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/vertica-python.spec b/vertica-python.spec index 9d359a8..338c6bb 100644 --- a/vertica-python.spec +++ b/vertica-python.spec @@ -3,7 +3,7 @@ Name: vertica-python Version: 0.6.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A native Python adapter for the Vertica database Group: Development/Languages @@ -18,22 +18,32 @@ BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-setuptools + + +%global _description\ +vertica-python is a native Python adapter for the Vertica\ +(http://www.vertica.com) database.\ + + +%description %_description + +%package -n python2-vertica +Summary: %summary %if 0%{?rhel} && 0%{?rhel} <= 6 Requires: python-dateutil15 Requires: python-setuptools %else Requires: python-dateutil >= 1.5 %endif - Requires: pytz Requires: python-psycopg2 Requires: python2-future +%{?python_provide:%python_provide python2-vertica} +# Remove before F30 +Provides: vertica-python = %{version}-%{release} +Obsoletes: vertica-python < %{version}-%{release} - -%description -vertica-python is a native Python adapter for the Vertica -(http://www.vertica.com) database. - +%description -n python2-vertica %_description %prep %setup -q -n vertica-python-%{version} @@ -53,7 +63,7 @@ vertica-python is a native Python adapter for the Vertica %{__python2} setup.py install --skip-build --root $RPM_BUILD_ROOT -%files +%files -n python2-vertica %doc README.md LICENSE %{python2_sitelib}/*.egg-info %dir %{python2_sitelib}/vertica_python @@ -61,6 +71,10 @@ vertica-python is a native Python adapter for the Vertica %changelog +* Sun Dec 17 2017 Zbigniew Jędrzejewski-Szmek - 0.6.14-3 +- Python 2 binary package renamed to python2-vertica + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + * Thu Jul 27 2017 Fedora Release Engineering - 0.6.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 4e39e4a03ff23014779a8e6a70db739ba74b810b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:27:18 +0000 Subject: [PATCH 03/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vertica-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vertica-python.spec b/vertica-python.spec index 338c6bb..b3bae4a 100644 --- a/vertica-python.spec +++ b/vertica-python.spec @@ -3,7 +3,7 @@ Name: vertica-python Version: 0.6.14 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A native Python adapter for the Vertica database Group: Development/Languages @@ -71,6 +71,9 @@ Obsoletes: vertica-python < %{version}-%{release} %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0.6.14-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sun Dec 17 2017 Zbigniew Jędrzejewski-Szmek - 0.6.14-3 - Python 2 binary package renamed to python2-vertica See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 From 2218cea3b22517497f94af0fd881caf9b5b50c3c Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Wed, 28 Feb 2018 10:18:34 +0100 Subject: [PATCH 04/10] Update Python 2 dependency declarations to new packaging standards --- vertica-python.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/vertica-python.spec b/vertica-python.spec index b3bae4a..3c56d11 100644 --- a/vertica-python.spec +++ b/vertica-python.spec @@ -3,7 +3,7 @@ Name: vertica-python Version: 0.6.14 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A native Python adapter for the Vertica database Group: Development/Languages @@ -16,7 +16,7 @@ Patch1: vertica-python-0.5.0-crypt_windows.patch BuildArch: noarch BuildRequires: python2-devel -BuildRequires: python-setuptools +BuildRequires: python2-setuptools @@ -33,10 +33,10 @@ Summary: %summary Requires: python-dateutil15 Requires: python-setuptools %else -Requires: python-dateutil >= 1.5 +Requires: python2-dateutil >= 1.5 %endif -Requires: pytz -Requires: python-psycopg2 +Requires: python2-pytz +Requires: python2-psycopg2 Requires: python2-future %{?python_provide:%python_provide python2-vertica} # Remove before F30 @@ -71,6 +71,10 @@ Obsoletes: vertica-python < %{version}-%{release} %changelog +* Wed Feb 28 2018 Iryna Shcherbina - 0.6.14-5 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Fri Feb 09 2018 Fedora Release Engineering - 0.6.14-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From f43c0926b4dd6479df6a0ac59f121f20bcbbdd92 Mon Sep 17 00:00:00 2001 From: Jan Beran Date: Tue, 27 Mar 2018 07:50:37 +0000 Subject: [PATCH 05/10] Update to version 0.7.3 including Python 3 subpackage Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1482977 Patch0 is replaced by the the newer version [https://bugzilla.redhat.com/attachment.cgi?id=1330449] because the original source code had been modified. Patch1 is not required any more because the source code has already been fixed [https://github.com/uber/vertica-python/commit/4ba7fad4001dd494f8e0d63d0ac6d8dda3349dbb]. --- vertica-python.spec | 58 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 49 insertions(+), 9 deletions(-) diff --git a/vertica-python.spec b/vertica-python.spec index 3c56d11..d15762a 100644 --- a/vertica-python.spec +++ b/vertica-python.spec @@ -1,9 +1,15 @@ +%if 0%{?fedora} +%global with_python3 1 +%endif + %{!?__python2: %global __python2 /usr/bin/python2} %{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?py2_build: %global py2_build %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} build --executable="%{__python2} -s"}} +%{!?py2_install: %global py2_install %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} install -O1 --skip-build --root $RPM_BUILD_ROOT}} Name: vertica-python -Version: 0.6.14 -Release: 5%{?dist} +Version: 0.7.3 +Release: 1%{?dist} Summary: A native Python adapter for the Vertica database Group: Development/Languages @@ -11,8 +17,7 @@ License: MIT URL: https://github.com/uber/vertica-python Source0: https://github.com/uber/vertica-python/archive/%{version}.tar.gz # EPEL 6 patch -Patch0: vertica-python-0.2.0-dateutil15.patch -Patch1: vertica-python-0.5.0-crypt_windows.patch +Patch0: vertica-python-0.7.3-dateutil15.patch BuildArch: noarch BuildRequires: python2-devel @@ -45,6 +50,24 @@ Obsoletes: vertica-python < %{version}-%{release} %description -n python2-vertica %_description +%if 0%{?with_python3} + +%package -n python3-vertica +Summary: %summary +BuildRequires: python3-devel +BuildRequires: python3-setuptools +Requires: python3-dateutil >= 1.5 +Requires: python3-setuptools +Requires: python3-pytz +Requires: python3-psycopg2 +Requires: python3-future +%{?python_provide:%python_provide python3-vertica} + +%description -n python3-vertica %_description + +%endif + + %prep %setup -q -n vertica-python-%{version} @@ -52,25 +75,42 @@ Obsoletes: vertica-python < %{version}-%{release} %patch0 -p1 %endif -%patch1 -p1 - %build -%{__python2} setup.py build +%py2_build +%if 0%{?with_python3} +%py3_build +%endif %install -%{__python2} setup.py install --skip-build --root $RPM_BUILD_ROOT +%py2_install +%if 0%{?with_python3} +%py3_install +%endif %files -n python2-vertica -%doc README.md LICENSE +%license LICENSE +%doc README.md %{python2_sitelib}/*.egg-info %dir %{python2_sitelib}/vertica_python %{python2_sitelib}/vertica_python/* +%if 0%{?with_python3} +%files -n python3-vertica +%license LICENSE +%doc README.md +%{python3_sitelib}/*.egg-info +%dir %{python3_sitelib}/vertica_python +%{python3_sitelib}/vertica_python/* +%endif + %changelog +* Tue Mar 27 2018 Jan Beran - 0.7.3-1 +- Update to version 0.7.3 including Python 3 subpackage + * Wed Feb 28 2018 Iryna Shcherbina - 0.6.14-5 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From fad456e3087cc11f6956d4b63146ed95ee306a23 Mon Sep 17 00:00:00 2001 From: Jakub Jedelsky Date: Fri, 20 Apr 2018 17:56:14 +0200 Subject: [PATCH 06/10] Add new source and rename patch file Signed-off-by: Jakub Jedelsky --- .gitignore | 1 + sources | 2 +- vertica-python-0.2.0-dateutil15.patch | 15 --------------- vertica-python-0.7.3-dateutil15.patch | 16 ++++++++++++++++ 4 files changed, 18 insertions(+), 16 deletions(-) delete mode 100644 vertica-python-0.2.0-dateutil15.patch create mode 100644 vertica-python-0.7.3-dateutil15.patch diff --git a/.gitignore b/.gitignore index d435253..4e14438 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /0.5.4.tar.gz /0.5.5.tar.gz /0.6.14.tar.gz +/0.7.3.tar.gz diff --git a/sources b/sources index 2f06f3d..2f6adeb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (0.6.14.tar.gz) = 8dd046eed23fdd7d88fcc971dde185edcb5d2610a01e1749e23518b9f5146f753623c28b123b86a2e0308110fdd826fea47743d1cf1139dc7527ade449339973 +SHA512 (0.7.3.tar.gz) = 61a623f5d4f7ac6ae5393c34152f328e370d82aaaef21126afab973979472bf39774fb5792b6355fb23b5fc3ae52414c210caef97d197ac15c7d12dea8e106fd diff --git a/vertica-python-0.2.0-dateutil15.patch b/vertica-python-0.2.0-dateutil15.patch deleted file mode 100644 index 82d9e71..0000000 --- a/vertica-python-0.2.0-dateutil15.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/vertica_python/vertica/column.py b/vertica_python/vertica/column.py -index cc0bb27..3266d74 100644 ---- a/vertica_python/vertica/column.py -+++ b/vertica_python/vertica/column.py -@@ -5,6 +5,11 @@ from collections import namedtuple - from decimal import Decimal - from datetime import date - from datetime import datetime -+from pkg_resources import require,VersionConflict -+try: -+ require("python_dateutil>=1.5") -+except VersionConflict: -+ pass - from dateutil import parser - from vertica_python import errors diff --git a/vertica-python-0.7.3-dateutil15.patch b/vertica-python-0.7.3-dateutil15.patch new file mode 100644 index 0000000..bdd7ba1 --- /dev/null +++ b/vertica-python-0.7.3-dateutil15.patch @@ -0,0 +1,16 @@ +diff -ru vertica-python-0.7.3.orig/vertica_python/vertica/column.py vertica-python-0.7.3/vertica_python/vertica/column.py +--- vertica-python-0.7.3.orig/vertica_python/vertica/column.py 2017-06-18 22:10:16.000000000 +0200 ++++ vertica-python-0.7.3/vertica_python/vertica/column.py 2017-09-25 09:31:01.837062159 +0200 +@@ -5,6 +5,12 @@ + from datetime import date, datetime + from decimal import Decimal + ++from pkg_resources import require,VersionConflict ++try: ++ require("python_dateutil>=1.5") ++except VersionConflict: ++ pass ++ + import pytz + # noinspection PyCompatibility,PyUnresolvedReferences + from builtins import str From bfa644b0faf46e2ff8696edac41a85fadfb4ab97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 19 Jun 2018 11:30:06 +0200 Subject: [PATCH 07/10] Rebuilt for Python 3.7 --- vertica-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vertica-python.spec b/vertica-python.spec index d15762a..c34cce0 100644 --- a/vertica-python.spec +++ b/vertica-python.spec @@ -9,7 +9,7 @@ Name: vertica-python Version: 0.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A native Python adapter for the Vertica database Group: Development/Languages @@ -108,6 +108,9 @@ Requires: python3-future %changelog +* Tue Jun 19 2018 Miro Hrončok - 0.7.3-2 +- Rebuilt for Python 3.7 + * Tue Mar 27 2018 Jan Beran - 0.7.3-1 - Update to version 0.7.3 including Python 3 subpackage From 2d06d0cd7d5607001143a7a41ae878c3daa5b87b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:30:31 +0000 Subject: [PATCH 08/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vertica-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vertica-python.spec b/vertica-python.spec index c34cce0..61a1db6 100644 --- a/vertica-python.spec +++ b/vertica-python.spec @@ -9,7 +9,7 @@ Name: vertica-python Version: 0.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A native Python adapter for the Vertica database Group: Development/Languages @@ -108,6 +108,9 @@ Requires: python3-future %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.7.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jun 19 2018 Miro Hrončok - 0.7.3-2 - Rebuilt for Python 3.7 From ecbba72ec85a55256bf1f82e6ef272638de9a714 Mon Sep 17 00:00:00 2001 From: Jakub Jedelsky Date: Mon, 3 Sep 2018 14:36:52 +0200 Subject: [PATCH 09/10] Update to version 0.7.4 And add support for python3 for RHEL releases >= 7. Signed-off-by: Jakub Jedelsky --- .gitignore | 1 + sources | 2 +- vertica-python.spec | 35 +++++++++++++++++++++-------------- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 4e14438..fe2765a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /0.5.5.tar.gz /0.6.14.tar.gz /0.7.3.tar.gz +/0.7.4.tar.gz diff --git a/sources b/sources index 2f6adeb..4361d12 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (0.7.3.tar.gz) = 61a623f5d4f7ac6ae5393c34152f328e370d82aaaef21126afab973979472bf39774fb5792b6355fb23b5fc3ae52414c210caef97d197ac15c7d12dea8e106fd +SHA512 (0.7.4.tar.gz) = c40614b724d580bca09b26abdb60c20d26878baee7f462ad0c53051e43071bd9eb953a07ec5c2501c7bc56914b17dc3a6f06b96d826cb5fe607fd4b5cde93081 diff --git a/vertica-python.spec b/vertica-python.spec index 61a1db6..6beda7f 100644 --- a/vertica-python.spec +++ b/vertica-python.spec @@ -1,4 +1,4 @@ -%if 0%{?fedora} +%if 0%{?fedora} || 0%{rhel} >= 7 %global with_python3 1 %endif @@ -8,8 +8,8 @@ %{!?py2_install: %global py2_install %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} install -O1 --skip-build --root $RPM_BUILD_ROOT}} Name: vertica-python -Version: 0.7.3 -Release: 3%{?dist} +Version: 0.7.4 +Release: 1%{?dist} Summary: A native Python adapter for the Vertica database Group: Development/Languages @@ -52,18 +52,21 @@ Obsoletes: vertica-python < %{version}-%{release} %if 0%{?with_python3} -%package -n python3-vertica +%package -n python%{python3_pkgversion}-vertica Summary: %summary -BuildRequires: python3-devel -BuildRequires: python3-setuptools -Requires: python3-dateutil >= 1.5 -Requires: python3-setuptools -Requires: python3-pytz -Requires: python3-psycopg2 -Requires: python3-future -%{?python_provide:%python_provide python3-vertica} +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-setuptools +Requires: python%{python3_pkgversion}-dateutil >= 1.5 +Requires: python%{python3_pkgversion}-setuptools +Requires: python%{python3_pkgversion}-pytz +Requires: python%{python3_pkgversion}-psycopg2 +Requires: python%{python3_pkgversion}-future +%{?python_provide:%python_provide python%{python3_pkgversion}-vertica} +# Remove before F30 +Provides: vertica-python%{python3_pkgversion} = %{version}-%{release} +Obsoletes: vertica-python%{python3_pkgversion} < %{version}-%{release} -%description -n python3-vertica %_description +%description -n python%{python3_pkgversion}-vertica %_description %endif @@ -98,7 +101,7 @@ Requires: python3-future %{python2_sitelib}/vertica_python/* %if 0%{?with_python3} -%files -n python3-vertica +%files -n python%{python3_pkgversion}-vertica %license LICENSE %doc README.md %{python3_sitelib}/*.egg-info @@ -108,6 +111,10 @@ Requires: python3-future %changelog +* Mon Sep 03 2018 Jakub Jedelsky - 0.7.4-1 +- Upgrade to version 0.7.4 +- Build python 3 subpackage even on RHEL >= 7 + * Sat Jul 14 2018 Fedora Release Engineering - 0.7.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 8d91a0bd8e7351721fc85534f0176cb4ab244c1e Mon Sep 17 00:00:00 2001 From: Jakub Jedelsky Date: Tue, 4 Sep 2018 08:42:31 +0200 Subject: [PATCH 10/10] fixup! Update to version 0.7.4 --- vertica-python.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vertica-python.spec b/vertica-python.spec index 6beda7f..c03c2cc 100644 --- a/vertica-python.spec +++ b/vertica-python.spec @@ -1,4 +1,4 @@ -%if 0%{?fedora} || 0%{rhel} >= 7 +%if 0%{?fedora} || 0%{?rhel} >= 7 %global with_python3 1 %endif