Update to 0.29.0; Cleanups and fixes
Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
This commit is contained in:
Igor Gnatenko
parent
aa4ca484f1
commit
0a308dc20a
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/wheel-0.22.0.tar.gz
|
||||
/wheel-0.24.0.tar.gz
|
||||
/wheel-0.26.0.tar.gz
|
||||
/wheel-0.29.0.tar.gz
|
||||
|
||||
@ -1,134 +1,96 @@
|
||||
%global pypi_name wheel
|
||||
%if 0%{?rhel} > 7 || 0%{?fedora} >= 16
|
||||
%bcond_without python3
|
||||
%else
|
||||
%bcond_with python3
|
||||
|
||||
%if 0%{?rhel} < 7
|
||||
%global rhel6 1
|
||||
%endif
|
||||
|
||||
%endif
|
||||
|
||||
Name: python-%{pypi_name}
|
||||
Version: 0.26.0
|
||||
Release: 3%{?dist}
|
||||
Version: 0.29.0
|
||||
Release: 1%{?dist}
|
||||
Summary: A built-package format for Python
|
||||
|
||||
License: MIT
|
||||
URL: https://bitbucket.org/pypa/wheel
|
||||
Source0: https://pypi.python.org/packages/source/w/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
|
||||
Source0: https://files.pythonhosted.org/packages/source/%(n=%{pypi_name}; echo ${n:0:1})/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: python-setuptools
|
||||
%global _description \
|
||||
A built-package format for Python.\
|
||||
\
|
||||
A wheel is a ZIP-format archive with a specially formatted filename and the\
|
||||
.whl extension. It is designed to contain all the files for a PEP 376\
|
||||
compatible install in a way that is very close to the on-disk format.
|
||||
|
||||
BuildRequires: pytest
|
||||
BuildRequires: python-jsonschema
|
||||
%description %{_description}
|
||||
|
||||
%package -n python2-%{pypi_name}
|
||||
Summary: %{summary}
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-setuptools
|
||||
BuildRequires: python2-pytest
|
||||
BuildRequires: pyxdg
|
||||
BuildRequires: python-keyring
|
||||
%if 0%{?rhel6}
|
||||
BuildRequires: python-argparse
|
||||
Requires: python-argparse
|
||||
%endif
|
||||
BuildRequires: python-jsonschema
|
||||
|
||||
%if %{with python3}
|
||||
%description -n python2-%{pypi_name} %{_description}
|
||||
|
||||
Python 2 version.
|
||||
|
||||
%package -n python3-%{pypi_name}
|
||||
Summary: %{summary}
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-pytest
|
||||
BuildRequires: python3-pyxdg
|
||||
BuildRequires: python3-keyring
|
||||
BuildRequires: python3-jsonschema
|
||||
%endif # if with_python3
|
||||
|
||||
%description -n python3-%{pypi_name} %{_description}
|
||||
|
||||
%description
|
||||
A built-package format for Python.
|
||||
|
||||
A wheel is a ZIP-format archive with a specially formatted filename and the
|
||||
.whl extension. It is designed to contain all the files for a PEP 376
|
||||
compatible install in a way that is very close to the on-disk format.
|
||||
|
||||
%if 0%{with python3}
|
||||
%package -n python3-%{pypi_name}
|
||||
Summary: A built-package format for Python
|
||||
|
||||
%description -n python3-%{pypi_name}
|
||||
A built-package format for Python.
|
||||
|
||||
A wheel is a ZIP-format archive with a specially formatted filename and the
|
||||
.whl extension. It is designed to contain all the files for a PEP 376
|
||||
compatible install in a way that is very close to the on-disk format.
|
||||
|
||||
This is package contains Python 3 version of the package.
|
||||
%endif # with_python3
|
||||
|
||||
Python 3 version.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{pypi_name}-%{version}
|
||||
|
||||
%autosetup -n %{pypi_name}-%{version}
|
||||
# remove unneeded shebangs
|
||||
sed -ie '1d' %{pypi_name}/{egg2wheel,wininst2wheel}.py
|
||||
|
||||
%if %{with python3}
|
||||
rm -rf %{py3dir}
|
||||
cp -a . %{py3dir}
|
||||
%endif # with_python3
|
||||
|
||||
|
||||
%build
|
||||
%{__python} setup.py build
|
||||
|
||||
%if %{with python3}
|
||||
pushd %{py3dir}
|
||||
%{__python3} setup.py build
|
||||
popd
|
||||
%endif # with_python3
|
||||
|
||||
%py2_build
|
||||
%py3_build
|
||||
|
||||
%install
|
||||
# Must do the subpackages' install first because the scripts in /usr/bin are
|
||||
# overwritten with every setup.py install (and we want the python2 version
|
||||
# to be the default for now).
|
||||
%if %{with python3}
|
||||
pushd %{py3dir}
|
||||
%{__python3} setup.py install --skip-build --root %{buildroot}
|
||||
popd
|
||||
pushd %{buildroot}%{_bindir}
|
||||
for f in $(ls); do mv $f python3-$f; done
|
||||
popd
|
||||
%endif # with_python3
|
||||
|
||||
%{__python} setup.py install --skip-build --root %{buildroot}
|
||||
%py2_install
|
||||
mv %{buildroot}%{_bindir}/%{pypi_name}{,-%{python2_version}}
|
||||
ln -s %{pypi_name}-%{python2_version} %{buildroot}%{_bindir}/%{pypi_name}-2
|
||||
%py3_install
|
||||
mv %{buildroot}%{_bindir}/%{pypi_name}{,-%{python3_version}}
|
||||
ln -s %{pypi_name}-%{python3_version} %{buildroot}%{_bindir}/%{pypi_name}-3
|
||||
|
||||
ln -s %{pypi_name}-2 %{buildroot}%{_bindir}/%{pypi_name}
|
||||
|
||||
%check
|
||||
# remove setup.cfg that makes pytest require pytest-cov (unnecessary dep)
|
||||
rm setup.cfg
|
||||
PYTHONPATH=$(pwd) py.test --ignore build %{?rhel6:-k 'not test_keygen'}
|
||||
# no test for Python 3, no python3-jsonschema yet
|
||||
%if %{with python3}
|
||||
pushd %{py3dir}
|
||||
rm setup.cfg
|
||||
PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore build
|
||||
popd
|
||||
%endif # with_python3
|
||||
PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-2 -v --ignore build
|
||||
PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -v --ignore build
|
||||
|
||||
|
||||
%files
|
||||
%doc LICENSE.txt CHANGES.txt README.txt
|
||||
%{_bindir}/wheel
|
||||
%{python_sitelib}/%{pypi_name}*
|
||||
%exclude %{python_sitelib}/%{pypi_name}/test
|
||||
%if %{with python3}
|
||||
%files -n python2-%{pypi_name}
|
||||
%license LICENSE.txt
|
||||
%doc CHANGES.txt README.txt
|
||||
%{_bindir}/%{pypi_name}
|
||||
%{_bindir}/%{pypi_name}-2
|
||||
%{_bindir}/%{pypi_name}-%{python2_version}
|
||||
%{python2_sitelib}/%{pypi_name}*
|
||||
%exclude %{python2_sitelib}/%{pypi_name}/test
|
||||
|
||||
%files -n python3-%{pypi_name}
|
||||
%doc LICENSE.txt CHANGES.txt README.txt
|
||||
%{_bindir}/python3-wheel
|
||||
%license LICENSE.txt
|
||||
%doc CHANGES.txt README.txt
|
||||
%{_bindir}/%{pypi_name}-3
|
||||
%{_bindir}/%{pypi_name}-%{python3_version}
|
||||
%{python3_sitelib}/%{pypi_name}*
|
||||
%exclude %{python3_sitelib}/%{pypi_name}/test
|
||||
%endif # with_python3
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Aug 10 2016 Igor Gnatenko <ignatenko@redhat.com> - 0.29.0-1
|
||||
- Update to 0.29.0
|
||||
- Cleanups and fixes
|
||||
|
||||
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.26.0-3
|
||||
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user