From 44da9f2ccb4c0c1ded9287026117bdecc194a564 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Mar 10 2016 09:15:16 +0000 Subject: New upstream --- diff --git a/.gitignore b/.gitignore index d9e905b..8c61573 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /parsedatetime-1.4.tar.gz /parsedatetime-1.5.tar.gz +/parsedatetime-2.1.tar.gz diff --git a/python-parsedatetime.spec b/python-parsedatetime.spec index a503fa8..cddbcd9 100644 --- a/python-parsedatetime.spec +++ b/python-parsedatetime.spec @@ -7,23 +7,28 @@ %endif Name: python-%{realname} -Version: 1.5 -Release: 2%{?dist} +Version: 2.1 +Release: 1%{?dist} Summary: Parse human-readable date/time strings in Python Group: Development/Languages License: ASL 2.0 URL: https://github.com/bear/%{realname} Source0: https://github.com/bear/%{realname}/archive/v%{version}.tar.gz#/%{realname}-%{version}.tar.gz -Patch0: fix-non-executable-script-init.patch +Patch0: tox-use-python34.patch BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-setuptools +BuildRequires: python-nose +BuildRequires: python-tox +BuildRequires: pyicu BuildRequires: epydoc %if %{with python3} BuildRequires: python3-devel +BuildRequires: python3-pyicu BuildRequires: python3-setuptools +BuildRequires: python3-tox %endif %description @@ -50,9 +55,6 @@ strings. %setup -q -n %{realname}-%{version} %patch0 -p1 -# Fixes spurious-executable-perm warning -chmod 644 implementation_notes.txt - %if %{with python3} rm -rf %{py3dir} cp -a . %{py3dir} @@ -88,32 +90,44 @@ popd %endif %check -%{__python2} run_tests.py +tox -e py27 --sitepackages %if %{with python3} pushd %{py3dir} -%{__python3} run_tests.py test +ver=$(python3 -c 'import sys; print("%s.%s" % (sys.version_info.major, sys.version_info.minor))') +if [ $ver == "3.4" ]; then + python3-tox -e py34 --sitepackages +elif [ $ver == "3.5" ]; then + python3-tox -e py35 --sitepackages +else + echo "Wrong python version" + exit 1 +fi + %endif %files %license LICENSE.txt -%doc AUTHORS.txt CHANGES.txt INSTALL.txt README.rst THANKS.txt +%doc AUTHORS.txt CHANGES.txt README.rst %{python2_sitelib}/%{realname} %{python2_sitelib}/%{realname}-%{version}-*.egg-info %files doc -%doc docs/ examples/ implementation_notes.txt locale_date_grouping_notes.txt +%doc docs/ examples/ %if %{with python3} %files -n python3-%{realname} %license LICENSE.txt -%doc AUTHORS.txt CHANGES.txt INSTALL.txt README.rst THANKS.txt +%doc AUTHORS.txt CHANGES.txt README.rst %{python3_sitelib}/%{realname} %{python3_sitelib}/%{realname}*.egg-info %endif %changelog +* Thu Mar 10 2016 Michele Baldessari - 2.1-1 +- New upstream + * Tue Nov 10 2015 Fedora Release Engineering - 1.5-2 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 diff --git a/sources b/sources index 8f0b9dc..577327f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f7b6b8258728ca9aa2ef536b3f221baf parsedatetime-1.5.tar.gz +9054ba8585a94fb68f29d47c14536cc5 parsedatetime-2.1.tar.gz diff --git a/tox-use-python34.patch b/tox-use-python34.patch new file mode 100644 index 0000000..c5ac394 --- /dev/null +++ b/tox-use-python34.patch @@ -0,0 +1,11 @@ +diff -up parsedatetime-2.1/tox.ini.orig parsedatetime-2.1/tox.ini +--- parsedatetime-2.1/tox.ini.orig 2016-03-10 08:51:01.196099858 +0100 ++++ parsedatetime-2.1/tox.ini 2016-03-10 08:51:05.129104799 +0100 +@@ -1,6 +1,6 @@ + [tox] + # this assumes that you have python2.7, python3.5, etc in PATH +-envlist = py27, py35 ++envlist = py27, py34, py35 + + [testenv] + deps = PyICU