[packages/python-Mako] - updated to 1.1.0 - removed obsolete mock patch
qboosh
qboosh at pld-linux.org
Wed Oct 30 05:53:26 CET 2019
commit 2d3d2243ff56e738799babe6242cd82e05bd679d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Oct 30 05:53:20 2019 +0100
- updated to 1.1.0
- removed obsolete mock patch
python-Mako-mock.patch | 20 -----------------
python-Mako.spec | 59 ++++++++++++++++++++++++++++++--------------------
2 files changed, 35 insertions(+), 44 deletions(-)
---
diff --git a/python-Mako.spec b/python-Mako.spec
index 474b115..bbe17b9 100644
--- a/python-Mako.spec
+++ b/python-Mako.spec
@@ -1,3 +1,4 @@
+# TODO: beaker, dogpile.cache, lingua for tests
#
# Conditional build:
%bcond_without python2 # CPython 2.x module
@@ -7,34 +8,37 @@
%define fname Mako
Summary: Templating system for Python
Summary(pl.UTF-8): System szablonów dla języka Python
-Name: python-%{fname}
-Version: 1.0.7
-Release: 3
+Name: python-Mako
+Version: 1.1.0
+Release: 1
License: MIT
Group: Libraries/Python
#Source0Download: https://pypi.org/simple/mako/
-Source0: https://files.pythonhosted.org/packages/source/M/Mako/%{fname}-%{version}.tar.gz
-# Source0-md5: 5836cc997b1b773ef389bf6629c30e65
-Patch0: %{name}-mock.patch
+Source0: https://files.pythonhosted.org/packages/source/M/Mako/Mako-%{version}.tar.gz
+# Source0-md5: 6c3f2da0b74af529a4c4a537d0848bf2
URL: http://www.makotemplates.org/
%if %{with python2}
-BuildRequires: python >= 1:2.6
-BuildRequires: python-devel >= 1:2.6
+BuildRequires: python >= 1:2.7
+BuildRequires: python-devel >= 1:2.7
BuildRequires: python-setuptools
%if %{with tests}
+BuildRequires: python-babel
BuildRequires: python-markupsafe >= 0.9.2
BuildRequires: python-mock
-BuildRequires: python-pytest
+BuildRequires: python-pygments >= 1.4
+BuildRequires: python-pytest >= 3.1.0
%endif
%endif
%if %{with python3}
-BuildRequires: python3 >= 1:3.3
-BuildRequires: python3-devel >= 1:3.3
-BuildRequires: python3-modules >= 1:3.3
+BuildRequires: python3 >= 1:3.4
+BuildRequires: python3-devel >= 1:3.4
+BuildRequires: python3-modules >= 1:3.4
BuildRequires: python3-setuptools
%if %{with tests}
+BuildRequires: python3-babel
BuildRequires: python3-markupsafe >= 0.9.2
-BuildRequires: python3-pytest
+BuildRequires: python3-pygments >= 1.4
+BuildRequires: python3-pytest >= 3.1.0
%endif
%endif
BuildRequires: rpm-pythonprov
@@ -53,18 +57,18 @@ Mako jest biblioteką szablonów napisaną w języku Python. Zapewnia
przyjazną, nie XML-ową składnię, która jest kompilowana do modułów
Pythona dla zwiększenia wydajności.
-%package -n python3-%{fname}
+%package -n python3-Mako
Summary: Templating system for Python
Summary(pl.UTF-8): System szablonów dla języka Python
Group: Libraries/Python
Requires: python3-modules >= 1:3.3
-%description -n python3-%{fname}
+%description -n python3-Mako
Mako is a template library written in Python. It provides a familiar,
non-XML syntax which compiles into Python modules for maximum
performance.
-%description -n python3-%{fname} -l pl.UTF-8
+%description -n python3-Mako -l pl.UTF-8
Mako jest biblioteką szablonów napisaną w języku Python. Zapewnia
przyjazną, nie XML-ową składnię, która jest kompilowana do modułów
Pythona dla zwiększenia wydajności.
@@ -81,16 +85,23 @@ Documentation for Python Mako module.
Dokumentacja do modułu Pythona Mako.
%prep
-%setup -qn %{fname}-%{version}
-%patch0 -p1
+%setup -q -n Mako-%{version}
%build
%if %{with python2}
-%py_build %{?with_tests:test}
+%py_build
+
+%if %{with tests}
+%{__python} -m pytest test
+%endif
%endif
%if %{with python3}
-%py3_build %{?with_tests:test}
+%py3_build
+
+%if %{with tests}
+%{__python3} -m pytest test
+%endif
%endif
%install
@@ -121,21 +132,21 @@ rm -rf $RPM_BUILD_ROOT
%if %{with python2}
%files
%defattr(644,root,root,755)
-%doc CHANGES LICENSE README.rst
+%doc AUTHORS CHANGES LICENSE README.rst
%attr(755,root,root) %{_bindir}/mako-render
%attr(755,root,root) %{_bindir}/mako-render-2
%{py_sitescriptdir}/mako
-%{py_sitescriptdir}/%{fname}-%{version}-py*.egg-info
+%{py_sitescriptdir}/Mako-%{version}-py*.egg-info
%{_examplesdir}/%{name}-%{version}
%endif
%if %{with python3}
-%files -n python3-%{fname}
+%files -n python3-Mako
%defattr(644,root,root,755)
%doc CHANGES LICENSE README.rst
%attr(755,root,root) %{_bindir}/mako-render-3
%{py3_sitescriptdir}/mako
-%{py3_sitescriptdir}/%{fname}-%{version}-py*.egg-info
+%{py3_sitescriptdir}/Mako-%{version}-py*.egg-info
%endif
%files doc
diff --git a/python-Mako-mock.patch b/python-Mako-mock.patch
deleted file mode 100644
index abe094e..0000000
--- a/python-Mako-mock.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Mako-1.0.7/setup.py.orig 2017-07-13 18:12:05.000000000 +0200
-+++ Mako-1.0.7/setup.py 2018-06-24 11:10:04.082459984 +0200
-@@ -47,6 +47,8 @@
- sys.exit(errno)
-
-
-+mock_deps = ["mock"] if sys.version_info < (3, 3) else []
-+
- setup(name='Mako',
- version=VERSION,
- description="A super-fast templating language that borrows the \
-@@ -68,7 +70,7 @@
- url='http://www.makotemplates.org/',
- license='MIT',
- packages=find_packages('.', exclude=['examples*', 'test*']),
-- tests_require=['pytest', 'mock'],
-+ tests_require=['pytest'] + mock_deps,
- cmdclass={'test': PyTest},
- zip_safe=False,
- install_requires=install_requires,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-Mako.git/commitdiff/2d3d2243ff56e738799babe6242cd82e05bd679d
More information about the pld-cvs-commit
mailing list