From ea611798830ad139950b241dc0886ac53dd8bbba90b4909f42dfa3838fa801c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 8 Apr 2019 08:32:59 +0000 Subject: [PATCH] Accepting request 692017 from home:jayvdb:branches:devel:languages:python - Remove egg-info requires.txt entry for backports.csv as it isnt a dependency on Python 3. - Remove build and runtime dependency on unicodecsv, which was replaced with backports.csv in the last release. OBS-URL: https://build.opensuse.org/request/show/692017 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-tablib?expand=0&rev=6 --- python-tablib.changes | 8 ++++++++ python-tablib.spec | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/python-tablib.changes b/python-tablib.changes index c40811f..4082288 100644 --- a/python-tablib.changes +++ b/python-tablib.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Apr 6 15:07:34 UTC 2019 - John Vandenberg + +- Remove egg-info requires.txt entry for backports.csv as it isnt + a dependency on Python 3. +- Remove build and runtime dependency on unicodecsv, which was + replaced with backports.csv in the last release. + ------------------------------------------------------------------- Tue Mar 26 10:26:24 UTC 2019 - pgajdos@suse.com diff --git a/python-tablib.spec b/python-tablib.spec index 8a9602c..c7a889e 100644 --- a/python-tablib.spec +++ b/python-tablib.spec @@ -34,7 +34,6 @@ BuildRequires: %{python_module odfpy >= 1.3.5} BuildRequires: %{python_module openpyxl >= 2.4.8} BuildRequires: %{python_module pandas >= 0.20.3} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module unicodecsv >= 0.14.1} BuildRequires: %{python_module xlrd >= 1.1.0} BuildRequires: %{python_module xlwt >= 1.3.0} BuildRequires: %{python_module xml} @@ -44,7 +43,6 @@ BuildRequires: python2-backports.csv Requires: python-PyYAML >= 3.12 Requires: python-odfpy >= 1.3.5 Requires: python-openpyxl >= 2.4.8 -Requires: python-unicodecsv >= 0.14.1 Requires: python-xlrd >= 1.1.0 Requires: python-xlwt >= 1.3.0 Requires: python-xml @@ -77,6 +75,9 @@ find tablib -name "*.py" | xargs sed -i '1 { /^#!/ d }' %install %python_install +# Remove dependency on backports.csv from egg-info, as it isnt +# installed on Python 3, breaking pkg_resources resolver. +sed -i '/backports.csv/d' %{buildroot}%{python3_sitelib}/tablib*egg-info/requires.txt %python_expand %fdupes %{buildroot}%{$python_sitelib} %check