From 9dc0d41d08c1046bc419e33d1749288d34cf544b64ada9c870345d4e793c107a Mon Sep 17 00:00:00 2001 From: Todd R Date: Wed, 23 May 2012 07:13:31 +0000 Subject: [PATCH 1/3] Accepting request 121845 from home:HighwayStar:branches:devel:languages:python update to 0.7.0 version, python3 package added OBS-URL: https://build.opensuse.org/request/show/121845 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Mako?expand=0&rev=7 --- Mako-0.5.0.tar.gz | 3 -- Mako-0.7.0.tar.gz | 3 ++ python-Mako.changes | 6 ++++ python-Mako.spec | 12 ++++--- python3-Mako.changes | 5 +++ python3-Mako.spec | 76 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 97 insertions(+), 8 deletions(-) delete mode 100644 Mako-0.5.0.tar.gz create mode 100644 Mako-0.7.0.tar.gz create mode 100644 python3-Mako.changes create mode 100644 python3-Mako.spec diff --git a/Mako-0.5.0.tar.gz b/Mako-0.5.0.tar.gz deleted file mode 100644 index 580ed3f..0000000 --- a/Mako-0.5.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41eb241ac229aa7095860207f9acbe40ff79cd4080579be9e5c6dd8ec0ad7d19 -size 318717 diff --git a/Mako-0.7.0.tar.gz b/Mako-0.7.0.tar.gz new file mode 100644 index 0000000..5bbc603 --- /dev/null +++ b/Mako-0.7.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a0acef46ab00d355c668addac08b51712e26741c21f7329de6ce8e8fc229f8e +size 398315 diff --git a/python-Mako.changes b/python-Mako.changes index 4e8bc86..5b8843d 100644 --- a/python-Mako.changes +++ b/python-Mako.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 23 05:57:47 UTC 2012 - highwaystar.ru@gmail.com + +- update to version 0.7.0 +- python3 package added + ------------------------------------------------------------------- Thu Nov 10 10:53:53 UTC 2011 - saschpe@suse.de diff --git a/python-Mako.spec b/python-Mako.spec index cb720ac..bf4ded0 100644 --- a/python-Mako.spec +++ b/python-Mako.spec @@ -1,7 +1,7 @@ # # spec file for package python-Mako # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: python-Mako -Version: 0.5.0 +Version: 0.7.0 Release: 0 Url: http://www.makotemplates.org/ Summary: A super-fast Python templating language @@ -60,14 +60,16 @@ python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +mv %{buildroot}%{_bindir}/mako-render %{buildroot}%{_bindir}/mako-render-python%{py3_ver} %check python setup.py test %files %defattr(-,root,root,-) -%doc CHANGES LICENSE README README.py3k examples -%{_bindir}/mako-render -%{python_sitelib}/* +%doc CHANGES LICENSE README.rst examples +%{_bindir}/mako-render-python%{py3_ver} +%{python_sitelib}/mako/ +%{python_sitelib}/Mako-%{version}-py%{py_ver}.egg-info %changelog diff --git a/python3-Mako.changes b/python3-Mako.changes new file mode 100644 index 0000000..e3ff02d --- /dev/null +++ b/python3-Mako.changes @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Wed May 23 06:00:20 UTC 2012 - highwaystar.ru@gmail.com + +- python3-Mako package added + diff --git a/python3-Mako.spec b/python3-Mako.spec new file mode 100644 index 0000000..6aee9e4 --- /dev/null +++ b/python3-Mako.spec @@ -0,0 +1,76 @@ +# +# spec file for package python3-Mako +# +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + + +Name: python3-Mako +Version: 0.7.0 +Release: 0 +Url: http://www.makotemplates.org/ +Summary: A super-fast Python templating language +License: MIT +Group: Development/Languages/Python +Source: http://pypi.python.org/packages/source/M/Mako/Mako-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: python3-devel +BuildRequires: python3-distribute +BuildRequires: python3-MarkupSafe +BuildRequires: python3-nose +BuildRequires: python3-2to3 +Requires: python3-Beaker >= 1.1 +Requires: python3-MarkupSafe + +%if 0%{?suse_version} && 0%{?suse_version} <= 1140 +%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?py3_ver: %global py3_ver %(python3 -c "import sys; version=str(sys.version_info[0]) + '.' + str(sys.version_info[1]); print(version)" 2>/dev/null || echo PYTHON-NOT-FOUND)} +%endif +Requires: python(abi) = %{py3_ver} +%if 0%{?suse_version} && 0%{?suse_version} > 1140 +BuildRequires: python3-base +%endif + +%description +Mako is a template library written in Python. It provides a familiar, non-XML +syntax which compiles into Python modules for maximum performance. Mako's +syntax and API borrows from the best ideas of many others, including Django +templates, Cheetah, Myghty, and Genshi. Conceptually, Mako is an embedded +Python (i.e. Python Server Page) language, which refines the familiar ideas +of componentized layout and inheritance to produce one of the most +straightforward and flexible models available, while also maintaining close +ties to Python calling and scoping semantics. + +%prep +%setup -q -n Mako-%{version} + +%build +2to3 --no-diffs -w mako test scripts/mako-render +python3 setup.py build + +%install +python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} +mv %{buildroot}%{_bindir}/mako-render %{buildroot}%{_bindir}/mako-render-python%{py3_ver} +%check +python3 setup.py test + +%files +%defattr(-,root,root,-) +%doc CHANGES LICENSE README.rst examples +%{_bindir}/mako-render-python%{py3_ver} +%{python3_sitelib}/mako/ +%{python3_sitelib}/Mako-%{version}-py%{py3_ver}.egg-info + +%changelog From b28bff7c3394f47fc62d17df2dee116b17b3b4d1927f20aba469a6b899e7a725 Mon Sep 17 00:00:00 2001 From: Todd R Date: Fri, 25 May 2012 08:35:30 +0000 Subject: [PATCH 2/3] Accepting request 122257 from devel:languages:python3 - Fix building on openSUSE 11.4 - spec file cleanups (forwarded request 122256 from TheBlackCat) OBS-URL: https://build.opensuse.org/request/show/122257 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Mako?expand=0&rev=8 --- python3-Mako.changes | 6 ++++++ python3-Mako.spec | 11 +++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/python3-Mako.changes b/python3-Mako.changes index e3ff02d..b00db8b 100644 --- a/python3-Mako.changes +++ b/python3-Mako.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 25 08:33:12 UTC 2012 - toddrme2178@gmail.com + +- Fix building on openSUSE 11.4 +- spec file cleanups + ------------------------------------------------------------------- Wed May 23 06:00:20 UTC 2012 - highwaystar.ru@gmail.com diff --git a/python3-Mako.spec b/python3-Mako.spec index 6aee9e4..77cbd77 100644 --- a/python3-Mako.spec +++ b/python3-Mako.spec @@ -33,15 +33,15 @@ BuildRequires: python3-nose BuildRequires: python3-2to3 Requires: python3-Beaker >= 1.1 Requires: python3-MarkupSafe - %if 0%{?suse_version} && 0%{?suse_version} <= 1140 %{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %{!?py3_ver: %global py3_ver %(python3 -c "import sys; version=str(sys.version_info[0]) + '.' + str(sys.version_info[1]); print(version)" 2>/dev/null || echo PYTHON-NOT-FOUND)} -%endif -Requires: python(abi) = %{py3_ver} -%if 0%{?suse_version} && 0%{?suse_version} > 1140 +%else BuildRequires: python3-base %endif +Requires: python(abi) = %{py3_ver} +BuildArch: noarch + %description Mako is a template library written in Python. It provides a familiar, non-XML @@ -72,5 +72,8 @@ python3 setup.py test %{_bindir}/mako-render-python%{py3_ver} %{python3_sitelib}/mako/ %{python3_sitelib}/Mako-%{version}-py%{py3_ver}.egg-info +%if 0%{?suse_version} <= 1140 +%dir %{_prefix}/lib/python%{py3_ver} +%endif %changelog From fa442c10364a4ff9f1e939c11e4bf2c2b976532af25c9946cfb5dcb4bebcfc47 Mon Sep 17 00:00:00 2001 From: Todd R Date: Fri, 25 May 2012 11:25:01 +0000 Subject: [PATCH 3/3] Accepting request 122354 from home:TheBlackCat:branches:devel:languages:python Resubmit with improved changelog Switching over to update-alternatives for python 3 would be a huge undertaking and require substantial changes to a large number of packages. I think that is something we can consider for the next openSUSE release, but I think the focus of openSUSE 12.2 should stay on python 2. OBS-URL: https://build.opensuse.org/request/show/122354 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Mako?expand=0&rev=9 --- python-Mako.changes | 68 +++++++++++++++++++++++++++++++++++++++++++- python3-Mako.changes | 63 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 129 insertions(+), 2 deletions(-) diff --git a/python-Mako.changes b/python-Mako.changes index 5b8843d..0e1731c 100644 --- a/python-Mako.changes +++ b/python-Mako.changes @@ -1,8 +1,74 @@ +------------------------------------------------------------------- +Fri May 25 08:33:12 UTC 2012 - toddrme2178@gmail.com + +- Fix building on openSUSE 11.4 +- spec file cleanups + ------------------------------------------------------------------- Wed May 23 05:57:47 UTC 2012 - highwaystar.ru@gmail.com -- update to version 0.7.0 - python3 package added +- Update to 0.7.0 + - Added new "loop" variable to templates, is provided within a % + for block to provide info about the loop such as index, + first/last, odd/even, etc. A migration path is also provided + for legacy templates via the "enable_loop" argument available + on Template, TemplateLookup, and <%page>. + - Added a real check for "reserved" names, that is names which + are never pulled from the context and cannot be passed to the + template.render() method. Current names are "context", "loop", + "UNDEFINED". + - The html_error_template() will now apply Pygments highlighting + to the source code displayed in the traceback, if Pygments if + available. + - Added support for context managers, + i.e. "% with x as e:/ % endwith" support. + - Added class-level flag to CacheImpl "pass_context"; when True, + the keyword argument 'context' will be passed to + get_or_create() containing the Mako Context object. + - Added Jinja2 to the example benchmark suite + - Bugfixes +- Update to 0.6.2 + - Bugfixes +- Update to 0.6.1 + - Bugfixes +- Update to 0.6.0 + - Template caching has been converted into a plugin system, + whereby the usage of Beaker is just the default plugin. + Template and TemplateLookup now accept a string "cache_impl" + parameter which refers to the name of a cache plugin, + defaulting to the name 'beaker'. New plugins can be registered + as pkg_resources entrypoints under the group "mako.cache", or + registered directly using mako.cache.register_plugin(). The + core plugin is the mako.cache.CacheImpl class. + - Added support for Beaker cache regions in templates. Usage of + regions should be considered as superseding the very obsolete + idea of passing in backend options, timeouts, etc. within + templates. + - The 'put' method on Cache is now 'set'. 'put' is there for + backwards compatibility. + - The <%def>, <%block> and <%page> tags now accept any argument + named "cache_*", and the key minus the "cache_" prefix will be + passed as keyword arguments to the CacheImpl methods. + - Template and TemplateLookup now accept an argument cache_args, + which refers to a dictionary containing cache parameters. The + cache_dir, cache_url, cache_type, cache_timeout arguments are + deprecated (will probably never be removed, however) and can be + passed now as cache_args={'url':, 'type':'memcached', + 'timeout':50, 'dir':'/path/to/some/directory'} + - Can now refer to context variables within extra arguments to + <%block>, <%def>, + i.e. <%block name="foo" cache_key="${somekey}">. Filters can + also be used in this way, + i.e. <%def name="foo()" filter="myfilter"> then + template.render(myfilter=some_callable) + - Added "--var name=value" option to the mako-render script, + allows passing of kw to the template from the command line. + - Added module_writer argument to Template, TemplateLookup, + allows a callable to be passed which takes over the writing of + the template's module source file, so that special + environment-specific steps can be taken. + - Bugfixes ------------------------------------------------------------------- Thu Nov 10 10:53:53 UTC 2011 - saschpe@suse.de diff --git a/python3-Mako.changes b/python3-Mako.changes index b00db8b..3ff0c35 100644 --- a/python3-Mako.changes +++ b/python3-Mako.changes @@ -7,5 +7,66 @@ Fri May 25 08:33:12 UTC 2012 - toddrme2178@gmail.com ------------------------------------------------------------------- Wed May 23 06:00:20 UTC 2012 - highwaystar.ru@gmail.com -- python3-Mako package added +- python3 package added +- Update to 0.7.0 + - Added new "loop" variable to templates, is provided within a % + for block to provide info about the loop such as index, + first/last, odd/even, etc. A migration path is also provided + for legacy templates via the "enable_loop" argument available + on Template, TemplateLookup, and <%page>. + - Added a real check for "reserved" names, that is names which + are never pulled from the context and cannot be passed to the + template.render() method. Current names are "context", "loop", + "UNDEFINED". + - The html_error_template() will now apply Pygments highlighting + to the source code displayed in the traceback, if Pygments if + available. + - Added support for context managers, + i.e. "% with x as e:/ % endwith" support. + - Added class-level flag to CacheImpl "pass_context"; when True, + the keyword argument 'context' will be passed to + get_or_create() containing the Mako Context object. + - Added Jinja2 to the example benchmark suite + - Bugfixes +- Update to 0.6.2 + - Bugfixes +- Update to 0.6.1 + - Bugfixes +- Update to 0.6.0 + - Template caching has been converted into a plugin system, + whereby the usage of Beaker is just the default plugin. + Template and TemplateLookup now accept a string "cache_impl" + parameter which refers to the name of a cache plugin, + defaulting to the name 'beaker'. New plugins can be registered + as pkg_resources entrypoints under the group "mako.cache", or + registered directly using mako.cache.register_plugin(). The + core plugin is the mako.cache.CacheImpl class. + - Added support for Beaker cache regions in templates. Usage of + regions should be considered as superseding the very obsolete + idea of passing in backend options, timeouts, etc. within + templates. + - The 'put' method on Cache is now 'set'. 'put' is there for + backwards compatibility. + - The <%def>, <%block> and <%page> tags now accept any argument + named "cache_*", and the key minus the "cache_" prefix will be + passed as keyword arguments to the CacheImpl methods. + - Template and TemplateLookup now accept an argument cache_args, + which refers to a dictionary containing cache parameters. The + cache_dir, cache_url, cache_type, cache_timeout arguments are + deprecated (will probably never be removed, however) and can be + passed now as cache_args={'url':, 'type':'memcached', + 'timeout':50, 'dir':'/path/to/some/directory'} + - Can now refer to context variables within extra arguments to + <%block>, <%def>, + i.e. <%block name="foo" cache_key="${somekey}">. Filters can + also be used in this way, + i.e. <%def name="foo()" filter="myfilter"> then + template.render(myfilter=some_callable) + - Added "--var name=value" option to the mako-render script, + allows passing of kw to the template from the command line. + - Added module_writer argument to Template, TemplateLookup, + allows a callable to be passed which takes over the writing of + the template's module source file, so that special + environment-specific steps can be taken. + - Bugfixes