Compare commits

..

No commits in common. "c8-stream-3.8" and "stream-python27-2.7-rhel-8.10.0" have entirely different histories.

4 changed files with 66 additions and 85 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/py-1.8.0.tar.gz /py-1.5.3.tar.gz

View File

@ -1 +1 @@
b8c56a3648e05ed92722e1a040b55354d9f9ce84 SOURCES/py-1.8.0.tar.gz 05b890b22b8ce25ab99aee8e35040bc3f944116e py-1.5.3.tar.gz

View File

@ -3,13 +3,13 @@
%bcond_with docs %bcond_with docs
# the testsuite is curremtly not compatible with pytest 3, see # the testsuite is curremtly not compatible with pytest 3, see
# https://github.com/pytest-dev/py/issues/104 # https://github.com/pytest-dev/py/issues/104
%if 0%{?fedora} || 0%{?rhel} > 7 %if 0%{?fedora} >= 26 || 0%{?rhel} > 7
%bcond_with tests %bcond_with tests
%else %else
%bcond_without tests %bcond_without tests
%endif %endif
%bcond_with python2 %bcond_without python2
%bcond_without python3 %bcond_without python3
%global pytest_version_lb 2.9.0 %global pytest_version_lb 2.9.0
@ -18,18 +18,14 @@
%global srcname py %global srcname py
Name: python-%{srcname} Name: python-%{srcname}
Version: 1.8.0 Version: 1.5.3
Release: 8%{?dist} Release: 6%{?dist}
Summary: Library with cross-python path, ini-parsing, io, code, log facilities Summary: Library with cross-python path, ini-parsing, io, code, log facilities
License: MIT and Public Domain License: MIT and Public Domain
# main package: MIT, except: doc/style.css: Public Domain # main package: MIT, except: doc/style.css: Public Domain
URL: http://py.readthedocs.io/ URL: http://pylib.readthedocs.io/en/stable/
Source: %{pypi_source} Source: https://files.pythonhosted.org/packages/source/p/%{srcname}/%{srcname}-%{version}.tar.gz
BuildArch: noarch BuildArch: noarch
# Exclude i686 arch. Due to a modularity issue it's being added to the
# x86_64 compose of CRB, but we don't want to ship it at all.
# See: https://projects.engineering.redhat.com/browse/RCM-72605
ExcludeArch: i686
%if %{with tests} %if %{with tests}
# needed by the testsuite # needed by the testsuite
@ -52,7 +48,6 @@ following tools and modules:
Summary: Library with cross-python path, ini-parsing, io, code, log facilities Summary: Library with cross-python path, ini-parsing, io, code, log facilities
BuildRequires: python2-devel BuildRequires: python2-devel
BuildRequires: python2-setuptools BuildRequires: python2-setuptools
BuildRequires: python2-setuptools_scm
%if %{with tests} %if %{with tests}
BuildRequires: python2-pytest >= %{pytest_version_lb}, python2-pytest < %{pytest_version_ub} BuildRequires: python2-pytest >= %{pytest_version_lb}, python2-pytest < %{pytest_version_ub}
%endif # with tests %endif # with tests
@ -75,24 +70,23 @@ following tools and modules:
%if %{with python3} %if %{with python3}
%package -n python%{python3_pkgversion}-%{srcname} %package -n python3-%{srcname}
Summary: Library with cross-python path, ini-parsing, io, code, log facilities Summary: Library with cross-python path, ini-parsing, io, code, log facilities
BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python3-devel
BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: python3-setuptools
BuildRequires: python%{python3_pkgversion}-rpm-macros
%if %{with docs} %if %{with docs}
BuildRequires: %{_bindir}/sphinx-build BuildRequires: %{_bindir}/sphinx-build-3
%endif # with_docs %endif # with_docs
%if %{with tests} %if %{with tests}
BuildRequires: python%{python3_pkgversion}-pytest >= %{pytest_version_lb} BuildRequires: python3-pytest >= %{pytest_version_lb}, python3-pytest < %{pytest_version_ub}
BuildRequires: python%{python3_pkgversion}-pytest < %{pytest_version_ub}
%endif # with tests %endif # with tests
Requires: python%{python3_pkgversion}-setuptools Requires: python3-setuptools
%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}} %{?python_provide:%python_provide python3-%{srcname}}
Provides: bundled(python%{python3_pkgversion}-apipkg) = 1.4 Provides: bundled(python3-apipkg) = 1.4
Provides: bundled(python%{python3_pkgversion}-iniconfig) = 1.0.0 Provides: bundled(python3-iniconfig) = 1.0.0
Obsoletes: platform-python-%{srcname} < %{version}-%{release}
%description -n python%{python3_pkgversion}-%{srcname} %description -n python3-%{srcname}
The py lib is a Python development support library featuring the The py lib is a Python development support library featuring the
following tools and modules: following tools and modules:
@ -106,39 +100,50 @@ following tools and modules:
%prep %prep
%autosetup -n %{srcname}-%{version} %setup -qc -n %{srcname}-%{version}
# remove shebangs and fix permissions # remove shebangs and fix permissions
find . \ find %{srcname}-%{version} \
-type f -a \( -name '*.py' -o -name 'py.*' \) \ -type f -a \( -name '*.py' -o -name 'py.*' \) \
-exec sed -i '1{/^#!/d}' {} \; \ -exec sed -i '1{/^#!/d}' {} \; \
-exec chmod u=rw,go=r {} \; -exec chmod u=rw,go=r {} \;
# Remove dependency of setuptools-scm mv %{srcname}-%{version} python2
sed -i "/ *use_scm_version=.*,/d" setup.py cp -a python2 python3
sed -i "s/ *setup_requires=.*/version='%{version}',/" setup.py
%build %build
%if %{with python2} %if %{with python2}
pushd python2
%py2_build %py2_build
popd
%endif # with python2 %endif # with python2
%if %{with python3} %if %{with python3}
pushd python3
%py3_build %py3_build
%if %{with docs} %if %{with docs}
make -C doc html PYTHONPATH=$(pwd) make -C doc html PYTHONPATH=$(pwd) SPHINXBUILD=sphinx-build-3
rm -rf doc/_build/html/.buildinfo
%endif # with docs %endif # with docs
popd
%endif # with python3 %endif # with python3
%install %install
%if %{with python2} %if %{with python2}
pushd python2
%py2_install %py2_install
# remove hidden file
rm -rf doc/_build/html/.buildinfo
popd
%endif # with python2 %endif # with python2
%if %{with python3} %if %{with python3}
pushd python3
%py3_install %py3_install
# remove hidden file
rm -rf doc/_build/html/.buildinfo
popd
%endif # with python3 %endif # with python3
@ -147,14 +152,19 @@ rm -rf doc/_build/html/.buildinfo
# disable failing Subversion checks for now # disable failing Subversion checks for now
%if %{with python2} %if %{with python2}
pushd python2
PYTHONPATH=%{buildroot}%{python2_sitelib} \ PYTHONPATH=%{buildroot}%{python2_sitelib} \
LC_ALL=C.UTF-8 \ LC_ALL="en_US.UTF-8" \
py.test-%{python2_version} -r s -k"-TestWCSvnCommandPath" testing py.test-%{python2_version} -r s -k"-TestWCSvnCommandPath" testing
popd
%endif # with python2 %endif # with python2
%if %{with python3} %if %{with python3}
pushd python3
PYTHONPATH=%{buildroot}%{python3_sitelib} \ PYTHONPATH=%{buildroot}%{python3_sitelib} \
LC_ALL="en_US.UTF-8" \
py.test-%{python3_version} -r s -k"-TestWCSvnCommandPath" testing py.test-%{python3_version} -r s -k"-TestWCSvnCommandPath" testing
popd
%endif # with python3 %endif # with python3
%endif # with tests %endif # with tests
@ -162,21 +172,21 @@ py.test-%{python3_version} -r s -k"-TestWCSvnCommandPath" testing
%if %{with python2} %if %{with python2}
%files -n python2-%{srcname} %files -n python2-%{srcname}
%doc CHANGELOG %doc python2/CHANGELOG
%doc README.rst %doc python2/README.rst
%license LICENSE %license python2/LICENSE
%{python2_sitelib}/py-*.egg-info/ %{python2_sitelib}/py-*.egg-info/
%{python2_sitelib}/py/ %{python2_sitelib}/py/
%endif # with python2 %endif # with python2
%if %{with python3} %if %{with python3}
%files -n python%{python3_pkgversion}-%{srcname} %files -n python3-%{srcname}
%doc CHANGELOG %doc python3/CHANGELOG
%doc README.rst %doc python3/README.rst
%license LICENSE %license python3/LICENSE
%if %{with docs} %if %{with docs}
%doc doc/_build/html %doc python3/doc/_build/html
%endif # with_docs %endif # with_docs
%{python3_sitelib}/py-*.egg-info/ %{python3_sitelib}/py-*.egg-info/
%{python3_sitelib}/py/ %{python3_sitelib}/py/
@ -184,53 +194,23 @@ py.test-%{python3_version} -r s -k"-TestWCSvnCommandPath" testing
%changelog %changelog
* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 1.8.0-8 * Thu Apr 25 2019 Tomas Orsava <torsava@redhat.com> - 1.5.3-6
- Exclude unsupported i686 arch - Bumping due to problems with modular RPM upgrade path
- Resolves: rhbz#1695587
* Tue Nov 19 2019 Lumír Balhar <lbalhar@redhat.com> - 1.8.0-7 * Fri Jul 13 2018 Lumír Balhar <lbalhar@redhat.com> - 1.5.3-5
- Adjusted for Python 3.8 module in RHEL 8 - Python 3 subpackage enabled
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.8.0-6 * Fri Jul 13 2018 Lumír Balhar <lbalhar@redhat.com> - 1.5.3-4
- Rebuilt for Python 3.8.0rc1 (#1748018) - First version for python27 module
* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1.8.0-5 * Fri Jul 13 2018 Petr Viktorin <pviktori@redhat.com> - 1.5.3-3
- Rebuilt for Python 3.8 - Disable the Python 2 subpackage
https://bugzilla.redhat.com/show_bug.cgi?id=1590433
* Wed Aug 14 2019 Miro Hrončok <mhroncok@redhat.com> - 1.8.0-4 * Thu Jun 21 2018 Lumír Balhar <lbalhar@redhat.com> - 1.5.3-2
- Bootstrap for Python 3.8 - Allow build with Python 2
- Remove documentation of Python 2 subpackage
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon Apr 15 2019 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.0-1
- Update to 1.8.0.
- Update spec file.
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.7.0-2
- Drop explicit locale setting for python3, use C.UTF-8 for python2
See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot
* Sun Nov 11 2018 Thomas Moschny <thomas.moschny@gmx.de> - 1.7.0-1
- Update to 1.7.0.
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 1.5.4-2
- Rebuilt for Python 3.7
* Thu Jun 28 2018 Thomas Moschny <thomas.moschny@gmx.de> - 1.5.4-1
- Update to 1.5.4.
- Add BR on setuptools_scm.
* Sat Jun 16 2018 Miro Hrončok <mhroncok@redhat.com> - 1.5.3-3
- Rebuilt for Python 3.7
* Wed Jun 13 2018 Miro Hrončok <mhroncok@redhat.com> - 1.5.3-2
- Bootstrap for Python 3.7
* Thu Mar 22 2018 Thomas Moschny <thomas.moschny@gmx.de> - 1.5.3-1 * Thu Mar 22 2018 Thomas Moschny <thomas.moschny@gmx.de> - 1.5.3-1
- Update to 1.5.3. - Update to 1.5.3.

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (py-1.5.3.tar.gz) = 243c0da94c439163257c525ef00b30fd6d8add5897121ee0b1f19476b50f18823ce2b99a5ab27a9cf47598b538758d0534060123dce0820d2a65d98046548c96