From 5d0a14d15411dd34fed968249f2a7becd36a7d5e Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2017 03:26:00 +0000 Subject: import python-py-1.4.32-1.el7 --- diff --git a/.gitignore b/.gitignore index 7247472..34c8dcc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/py-1.4.27.tar.gz +SOURCES/py-1.4.32.tar.gz diff --git a/.python-py.metadata b/.python-py.metadata index ec89d61..25eb9a9 100644 --- a/.python-py.metadata +++ b/.python-py.metadata @@ -1 +1 @@ -2dc0676e4a70838141d894ccb21067dd427ac32d SOURCES/py-1.4.27.tar.gz +ea0dbb0d3cb81893953489da75517ee8eeb1f56e SOURCES/py-1.4.32.tar.gz diff --git a/SOURCES/skip-python3.6-tests.patch b/SOURCES/skip-python3.6-tests.patch new file mode 100644 index 0000000..5e38596 --- /dev/null +++ b/SOURCES/skip-python3.6-tests.patch @@ -0,0 +1,21 @@ +diff --git a/testing/path/common.py b/testing/path/common.py +index 274ced4..7945cd7 100644 +--- a/testing/path/common.py ++++ b/testing/path/common.py +@@ -444,12 +444,14 @@ class CommonFSTests(object): + from py._path.common import fspath + assert fspath(path1) == path1.strpath + +- @py.test.mark.skip("sys.version_info < (3,6)") ++ @py.test.mark.skipif(sys.version_info < (3,6), ++ reason="requires Python 3.6") + def test_fspath_open(self, path1): + f = path1.join('opentestfile') + open(f) + +- @py.test.mark.skip("sys.version_info < (3,6)") ++ @py.test.mark.skipif(sys.version_info < (3,6), ++ reason="requires Python 3.6") + def test_fspath_fsencode(self, path1): + from os import fsencode + assert fsencode(path1) == fsencode(path1.strpath) diff --git a/SPECS/python-py.spec b/SPECS/python-py.spec index bcd80cc..92fa40d 100644 --- a/SPECS/python-py.spec +++ b/SPECS/python-py.spec @@ -9,23 +9,22 @@ # we have a circular (build) dependency with the (new) pytest package # when generating the docs or running the testsuite %global with_docs 1 -%if 0%{?rhel} > 6 -%global run_check 0 -%else %global run_check 1 -%endif %global pytest_version 2.3.1 Name: python-py -Version: 1.4.27 +Version: 1.4.32 Release: 1%{?dist} Summary: Library with cross-python path, ini-parsing, io, code, log facilities Group: Development/Languages License: MIT and Public Domain # main package: MIT, except: doc/style.css: Public Domain -URL: http://pylib.readthedocs.org/ -Source: http://pypi.python.org/packages/source/p/py/py-%{version}.tar.gz +URL: http://py.readthedocs.io +Source: https://files.pythonhosted.org/packages/source/p/py/py-%{version}.tar.gz +# Replace the decorator for skipping the Python 3.6 tests with a compatible one for +# the RHEL 7 version of pytest +Patch0: skip-python3.6-tests.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel @@ -52,6 +51,7 @@ BuildRequires: python3-pytest >= %{pytest_version} # needed by the testsuite BuildRequires: subversion +Provides: python2-py = %{version}-%{release} %description The py lib is a Python development support library featuring the @@ -82,6 +82,7 @@ following tools and modules: %prep %setup -q -n py-%{version} +%patch0 -p1 # remove shebangs and fix permissions find -type f -a \( -name '*.py' -o -name 'py.*' \) \ @@ -145,7 +146,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc CHANGELOG LICENSE README.txt +%doc CHANGELOG LICENSE README.rst %if 0%{?with_docs} %doc doc/_build/html %endif # with_docs @@ -155,7 +156,7 @@ rm -rf %{buildroot} %if 0%{?with_python3} %files -n python3-py %defattr(-,root,root,-) -%doc CHANGELOG LICENSE README.txt +%doc CHANGELOG LICENSE README.rst %if 0%{?with_docs} %doc doc/_build/html %endif # with_docs @@ -164,6 +165,10 @@ rm -rf %{buildroot} %changelog +* Thu Feb 09 2017 Charalampos Stratakis - 1.4.32-1 +- Updated to 1.4.32 +Resolves: rhbz#1389113 + * Mon May 11 2015 Matej Stuchlik - 1.4.27-1 - Updated to 1.4.27 Resolves: rhbz#1219480