From 074da2f7e017e725d5d3b05112d1098811e8abfa Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Mon, 17 Feb 2014 11:54:13 +0100 Subject: [PATCH 1/2] argparse is a requirement for python 2.6 Resolves: rhbz#1065824 --- python-tox.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/python-tox.spec b/python-tox.spec index 79f6651..c55f0e6 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -7,7 +7,7 @@ %global pypiname tox Name: python-tox Version: 1.4.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Virtualenv-based automation of test activities # file toxbootstrap.py is licensed under MIT License @@ -21,6 +21,10 @@ BuildRequires: python2-devel BuildRequires: python-setuptools Requires: python-py Requires: python-virtualenv +%if 0%{?rhel}==6 +Requires: python-argparse +%endif + # required for check %if 0%{?fedora} BuildRequires: python-py @@ -74,6 +78,9 @@ TOXENV=py27 %{__python} setup.py test %changelog +* Mon Feb 17 2014 Matthias Runge - 1.4.2-8 +- python 2.6 requires argparse (rhbz#1065824) + * Wed Nov 14 2012 Matthias Runge - 1.4.2-7 - add requires python-py, python-virtualenv (rhbz#876246) From dd772e5daacb16b912a06e8ec4d779af3352bef7 Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Tue, 16 Dec 2014 21:42:36 +0100 Subject: [PATCH 2/2] Revert "Merge branch 'epel7' into el6" This reverts commit 07d6cfea6c19cde3354c51196b43567826ef6213, reversing changes made to 074da2f7e017e725d5d3b05112d1098811e8abfa. --- python-tox.spec | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index 43a006e..c55f0e6 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -6,15 +6,15 @@ %global pypiname tox Name: python-tox -Version: 1.6.1 -Release: 1%{?dist} +Version: 1.4.2 +Release: 8%{?dist} Summary: Virtualenv-based automation of test activities # file toxbootstrap.py is licensed under MIT License License: GPLv2+ and MIT URL: http://codespeak.net/tox Source0: http://pypi.python.org/packages/source/t/%{pypiname}/%{pypiname}-%{version}.zip - +#md5=dc52acf22eb57eaa33e704f8a54e7b34 BuildArch: noarch BuildRequires: python2-devel @@ -78,16 +78,9 @@ TOXENV=py27 %{__python} setup.py test %changelog -* Mon Oct 13 2014 Matthias Runge - 1.6.1-1 -- update to 1.6.1 - -* Mon Feb 17 2014 Matthias Runge - 1.4.2-9 +* Mon Feb 17 2014 Matthias Runge - 1.4.2-8 - python 2.6 requires argparse (rhbz#1065824) -* Thu Feb 14 2013 Fedora Release Engineering - 1.4.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - - * Wed Nov 14 2012 Matthias Runge - 1.4.2-7 - add requires python-py, python-virtualenv (rhbz#876246)