From ba87f3b53214e749b956ce0a209ed4dd49e5cc7ea03fa02da4a66afbddce69ae Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sun, 28 Feb 2021 23:12:49 +0000 Subject: [PATCH] Accepting request 875827 from home:bnavigator:branches:devel:languages:python:numeric - Add testdbf_converted.csv to fix a test failure since agate-dbf 0.2.2 -- gh#wireservice/csvkit#1073 - Make rpmlint happy by expanding the u-a install scripts early. (Keep all the cli commands as their own u-a master links.) OBS-URL: https://build.opensuse.org/request/show/875827 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-csvkit?expand=0&rev=23 --- python-csvkit.changes | 8 ++++++++ python-csvkit.spec | 40 +++++++++++++++++----------------------- testdbf_converted.csv | 9 +++++++++ 3 files changed, 34 insertions(+), 23 deletions(-) create mode 100644 testdbf_converted.csv diff --git a/python-csvkit.changes b/python-csvkit.changes index 9e2f580..7ea0d0f 100644 --- a/python-csvkit.changes +++ b/python-csvkit.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Feb 28 20:32:54 UTC 2021 - Ben Greiner + +- Add testdbf_converted.csv to fix a test failure since + agate-dbf 0.2.2 -- gh#wireservice/csvkit#1073 +- Make rpmlint happy by expanding the u-a install scripts early. + (Keep all the cli commands as their own u-a master links.) + ------------------------------------------------------------------- Wed May 27 09:36:51 UTC 2020 - Petr Gajdos diff --git a/python-csvkit.spec b/python-csvkit.spec index d80b96c..008e786 100644 --- a/python-csvkit.spec +++ b/python-csvkit.spec @@ -1,7 +1,7 @@ # # spec file for package python-csvkit # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,8 @@ Summary: A library of utilities for working with CSV License: MIT Group: Development/Languages/Python URL: https://github.com/wireservice/csvkit -Source: https://files.pythonhosted.org/packages/source/c/csvkit/csvkit-%{version}.tar.gz +Source0: https://files.pythonhosted.org/packages/source/c/csvkit/csvkit-%{version}.tar.gz +Source1: https://raw.githubusercontent.com/wireservice/csvkit/5f22e664121b13d9ff005a9206873a8f97431dca/examples/testdbf_converted.csv BuildRequires: %{python_module SQLAlchemy >= 0.9.3} BuildRequires: %{python_module Sphinx >= 1.0.7} BuildRequires: %{python_module aenum} @@ -58,6 +59,10 @@ Aaron Bycoffe. %setup -q -n csvkit-%{version} # find and remove unneeded shebangs find csvkit -name "*.py" | xargs sed -i '1 {/^#!/ d}' +# agate-dbf >= 0.2.2 creates uppercase fieldnames for this example file -- gh#wireservice/csvkit#1073 +%if %{pkg_vcmp python3-agate-dbf >= 0.2.2} +cp %{SOURCE1} examples/testdbf_converted.csv +%endif %build %python_build @@ -74,33 +79,22 @@ export LANG=en_US.UTF-8 %python_exec -m unittest discover -s tests/ -v %post -for b in %{binaries}; do - %python_install_alternative $b -done +%{lua:for b in rpm.expand("%{binaries}"):gmatch("%S+") do + print(rpm.expand("%python_install_alternative " .. b)) +end} %postun -for b in %{binaries}; do - %python_uninstall_alternative $b -done +%{lua:for b in rpm.expand("%{binaries}"):gmatch("%S+") do + print(rpm.expand("%python_uninstall_alternative " .. b)) +end} %files %{python_files} %license COPYING %doc AUTHORS.rst CHANGELOG.rst README.rst -%python_alternative %{_bindir}/csvclean -%python_alternative %{_bindir}/csvcut -%python_alternative %{_bindir}/csvformat -%python_alternative %{_bindir}/csvgrep -%python_alternative %{_bindir}/csvjoin -%python_alternative %{_bindir}/csvjson -%python_alternative %{_bindir}/csvlook -%python_alternative %{_bindir}/csvpy -%python_alternative %{_bindir}/csvsort -%python_alternative %{_bindir}/csvsql -%python_alternative %{_bindir}/csvstack -%python_alternative %{_bindir}/csvstat -%python_alternative %{_bindir}/in2csv -%python_alternative %{_bindir}/sql2csv -%{python_sitelib}/csvkit-%{version}-py*.egg-info +%{lua:for b in rpm.expand("%{binaries}"):gmatch("%S+") do + print(rpm.expand("%python_alternative %{_bindir}/" .. b)) +end} +%{python_sitelib}/csvkit-%{version}*-info %{python_sitelib}/csvkit/ %changelog diff --git a/testdbf_converted.csv b/testdbf_converted.csv new file mode 100644 index 0000000..0522384 --- /dev/null +++ b/testdbf_converted.csv @@ -0,0 +1,9 @@ +STATEFP10,CD111FP,GEOID10,NAMELSAD10,LSAD10,CDSESSN,MTFCC10,FUNCSTAT10,ALAND10,AWATER10,INTPTLAT10,INTPTLON10 +27,8,2708,Congressional District 8,C2,111,G5200,False,71546663636,12416573076,47.2400052,-92.9323194 +27,5,2705,Congressional District 5,C2,111,G5200,False,320220379,15485125,44.9781144,-93.2928317 +27,4,2704,Congressional District 4,C2,111,G5200,False,510623511,58464019,44.9957711,-93.0835230 +27,2,2702,Congressional District 2,C2,111,G5200,False,7826702653,340127460,44.5338366,-93.2513206 +27,1,2701,Congressional District 1,C2,111,G5200,False,34462275389,554678308,43.8952354,-93.9040300 +27,6,2706,Congressional District 6,C2,111,G5200,False,7951908435,431134882,45.3830033,-93.8845885 +27,7,2707,Congressional District 7,C2,111,G5200,False,82410267758,4987979498,46.6966838,-95.6752445 +27,3,2703,Congressional District 3,C2,111,G5200,False,1203647438,126012269,45.0212030,-93.5130863