From 31089a4de45472d5ba8d982fba5b8fb55d9220bc Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Feb 19 2016 20:55:35 +0000 Subject: 1.17.0 --- diff --git a/.gitignore b/.gitignore index 17f70b5..296c1c1 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /cliff-1.10.0.tar.gz /cliff-1.13.0.tar.gz /cliff-1.15.0.tar.gz +/cliff-1.17.0.tar.gz diff --git a/0001-only-use-unicodecsv-for-python-2.x.patch b/0001-only-use-unicodecsv-for-python-2.x.patch deleted file mode 100644 index 824d230..0000000 --- a/0001-only-use-unicodecsv-for-python-2.x.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 25cce67529d70e3aab8653946fdf1eda12ded9b9 Mon Sep 17 00:00:00 2001 -From: Doug Hellmann -Date: Wed, 23 Sep 2015 19:47:07 +0000 -Subject: [PATCH] only use unicodecsv for python 2.x - -Only use unicodecsv for python 2, since the python 3 module works fine -with unicode data. - -Change-Id: I8b82248e855a6986b7541ca997d8fd56628b17a5 -Related-bug: #1491888 ---- - cliff/formatters/commaseparated.py | 6 +++++- - requirements.txt | 2 +- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/cliff/formatters/commaseparated.py b/cliff/formatters/commaseparated.py -index ea9629d..571eed8 100644 ---- a/cliff/formatters/commaseparated.py -+++ b/cliff/formatters/commaseparated.py -@@ -1,7 +1,11 @@ - """Output formatters using csv format. - """ - --import unicodecsv as csv -+import sys -+if sys.version_info[0] == 3: -+ import csv -+else: -+ import unicodecsv as csv - import os - - from .base import ListFormatter -diff --git a/requirements.txt b/requirements.txt -index 1dda2f0..3f20d16 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -8,5 +8,5 @@ PrettyTable<0.8,>=0.7 - pyparsing>=2.0.1 - six>=1.9.0 - stevedore>=1.5.0 # Apache-2.0 --unicodecsv>=0.8.0 -+unicodecsv>=0.8.0;python_version=='2.7' or python_version=='2.6' - PyYAML>=3.1.0 --- -2.4.3 - diff --git a/python-cliff.spec b/python-cliff.spec index c750eb6..2a86987 100644 --- a/python-cliff.spec +++ b/python-cliff.spec @@ -7,8 +7,8 @@ %{!?upstream_version: %global upstream_version %{version}%{?milestone}} Name: python-cliff -Version: 1.15.0 -Release: 3%{?dist} +Version: 1.17.0 +Release: 1%{?dist} Summary: Command Line Interface Formulation Framework Group: Development/Libraries @@ -16,8 +16,6 @@ License: ASL 2.0 URL: http://pypi.python.org/pypi/cliff Source0: http://pypi.python.org/packages/source/c/cliff/cliff-%{version}.tar.gz -Patch0: 0001-only-use-unicodecsv-for-python-2.x.patch - BuildArch: noarch BuildRequires: python2-devel @@ -94,7 +92,6 @@ http://readthedocs.org/docs/cliff/en/latest/ %prep %setup -q -n %{modname}-%{upstream_version} -%patch0 -p1 # let RPM handle deps rm -f requirements.txt @@ -148,6 +145,9 @@ popd %endif %changelog +* Fri Feb 19 2016 Ralph Bean - 1.17.0-1 +- new version + * Thu Feb 04 2016 Fedora Release Engineering - 1.15.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 4ed1105..0e9cbd3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -23f9187d6d7ffa70d8f725381bb1094f cliff-1.15.0.tar.gz +5eafaa746a944f81c6841608b3f009f6 cliff-1.17.0.tar.gz