Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4c03c47e8a4bd2aad0a63642c1231f8a526fdf25)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4c03c47e8a4bd2aad0a63642c1231f8a526fdf25)
  • Date: Sun, 4 Oct 2015 16:17:57 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

python-pypi/hatta/DETAILS | 5 +---
python-pypi/hatta/HISTORY | 5 ++++
python-pypi/hatta/PRE_BUILD | 6 -----
python-pypi/hatta/locale.patch | 32 ------------------------------
python-pypi/hatta/parser.patch | 23 ---------------------
python-pypi/hatta/template.patch | 41
---------------------------------------
6 files changed, 7 insertions(+), 105 deletions(-)

New commits:
commit 4c03c47e8a4bd2aad0a63642c1231f8a526fdf25
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

hatta: => 1.6.7

diff --git a/python-pypi/hatta/DETAILS b/python-pypi/hatta/DETAILS
index 05096f9..4a22d8d 100755
--- a/python-pypi/hatta/DETAILS
+++ b/python-pypi/hatta/DETAILS
@@ -1,10 +1,9 @@
SPELL=hatta
SPELLX=Hatta
- VERSION=1.6.5
- PATCHLEVEL=1
+ VERSION=1.6.7
SOURCE=${SPELLX}-${VERSION}.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/H/${SPELLX}/$SOURCE
-
SOURCE_HASH=sha512:782d9d679afd3b23cb6f5a4f08e67d97d96b21f0fc248b5eca93655a7c8a45f5b7a30cc30ee811ddf86a62dfd644a301d2fb0aadc4b9f99bf07e836800a28584
+
SOURCE_HASH=sha512:698f76d9292a3aa95aab38fae6cd3917841a6750f18c20f8853ae321faddeae6cbc24f2a6d9fefc95294a61c1189077ae6024e193c2ded1a162c55f0f7945adf
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
WEB_SITE=http://hatta-wiki.org/
LICENSE[0]=GPL
diff --git a/python-pypi/hatta/HISTORY b/python-pypi/hatta/HISTORY
index 35c7b3e..91d74e1 100644
--- a/python-pypi/hatta/HISTORY
+++ b/python-pypi/hatta/HISTORY
@@ -1,3 +1,8 @@
+2015-10-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.6.7
+ * PRE_BUILD: removed, not needed
+ * locale.patch, parser.patch, template.patch: removed, fixed by
upstream
+
2015-02-02 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added missing dependency

diff --git a/python-pypi/hatta/PRE_BUILD b/python-pypi/hatta/PRE_BUILD
deleted file mode 100755
index ad351a8..0000000
--- a/python-pypi/hatta/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p1 < "$SPELL_DIRECTORY/parser.patch" &&
-patch -p0 < "$SPELL_DIRECTORY/template.patch" &&
-patch -p0 < "$SPELL_DIRECTORY/locale.patch"
diff --git a/python-pypi/hatta/locale.patch b/python-pypi/hatta/locale.patch
deleted file mode 100644
index 005c605..0000000
--- a/python-pypi/hatta/locale.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-$OpenBSD$
---- setup.py.orig 2014-12-20 01:24:03.000000000 +0300
-+++ setup.py 2014-12-23 11:15:23.311023035 +0300
-@@ -20,21 +20,21 @@
- tests_require=['py.test', 'lxml', 'pygments'],
- data_files=[
- ('share/locale/ar/LC_MESSAGES', ['locale/ar/LC_MESSAGES/hatta.mo']),
-- ('share/locale/da/LC_MESSAGES', ['locale/cs/LC_MESSAGES/hatta.mo']),
-+ ('share/locale/cs/LC_MESSAGES', ['locale/cs/LC_MESSAGES/hatta.mo']),
- ('share/locale/da/LC_MESSAGES', ['locale/da/LC_MESSAGES/hatta.mo']),
- ('share/locale/de/LC_MESSAGES', ['locale/de/LC_MESSAGES/hatta.mo']),
-- ('share/locale/es/LC_MESSAGES', ['locale/el/LC_MESSAGES/hatta.mo']),
-+ ('share/locale/el/LC_MESSAGES', ['locale/el/LC_MESSAGES/hatta.mo']),
- ('share/locale/es/LC_MESSAGES', ['locale/es/LC_MESSAGES/hatta.mo']),
-- ('share/locale/es/LC_MESSAGES', ['locale/et/LC_MESSAGES/hatta.mo']),
-- ('share/locale/fr/LC_MESSAGES', ['locale/fi/LC_MESSAGES/hatta.mo']),
-+ ('share/locale/et/LC_MESSAGES', ['locale/et/LC_MESSAGES/hatta.mo']),
-+ ('share/locale/fi/LC_MESSAGES', ['locale/fi/LC_MESSAGES/hatta.mo']),
- ('share/locale/fr/LC_MESSAGES', ['locale/fr/LC_MESSAGES/hatta.mo']),
-- ('share/locale/ja/LC_MESSAGES', ['locale/hu/LC_MESSAGES/hatta.mo']),
-+ ('share/locale/hu/LC_MESSAGES', ['locale/hu/LC_MESSAGES/hatta.mo']),
- ('share/locale/ja/LC_MESSAGES', ['locale/ja/LC_MESSAGES/hatta.mo']),
-- ('share/locale/ja/LC_MESSAGES', ['locale/lt/LC_MESSAGES/hatta.mo']),
-+ ('share/locale/lt/LC_MESSAGES', ['locale/lt/LC_MESSAGES/hatta.mo']),
- ('share/locale/pl/LC_MESSAGES', ['locale/pl/LC_MESSAGES/hatta.mo']),
- ('share/locale/ru/LC_MESSAGES', ['locale/ru/LC_MESSAGES/hatta.mo']),
- ('share/locale/sv/LC_MESSAGES', ['locale/sv/LC_MESSAGES/hatta.mo']),
-- ('share/locale/sv/LC_MESSAGES', ['locale/vi/LC_MESSAGES/hatta.mo']),
-+ ('share/locale/vi/LC_MESSAGES', ['locale/vi/LC_MESSAGES/hatta.mo']),
- ('share/doc/hatta/examples', [
- 'examples/hatta.fcg',
- 'examples/hatta.wsgi',
diff --git a/python-pypi/hatta/parser.patch b/python-pypi/hatta/parser.patch
deleted file mode 100644
index d47fd46..0000000
--- a/python-pypi/hatta/parser.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-# HG changeset patch
-# User Radomir Dopieralski <devel AT sheep.art.pl>
-# Date 1419554508 -3600
-# Node ID 097c67f0fd2d3b433000b418def37c32b042c7ce
-# Parent c4b8828458b3764548b2cca48195a173cf2dbe7f
-Fix #109, don't catch parens and quotes in the e-mail link rule
-
-The rules for e-mail addresses allow for pretty much anything in the user
name
-part, but due to practical reasons we will exclude parens and quote symbols,
as
-they are rarely used in that place, but often used around e-mail addresses.
-
-diff --git a/hatta/parser.py b/hatta/parser.py
---- a/hatta/parser.py
-+++ b/hatta/parser.py
-@@ -341,7 +341,7 @@
- return self._line_link(link_target=link_url)
-
- @markup_rules(ur"""(?P<mail_address>(mailto:)?"""
-- ur"""\S+@\S+(\.[^\s.,:;!?()'"\*/=+<>-]+)+)""" , 90)
-+
ur"""[^\s()\[\]<>{}"']+@\S+(\.[^\s.,:;!?()'"\*/=+<>-]+)+)""" , 90)
- def _line_mail(self, mail_address):
- text = mail_address
- if mail_address.startswith(u'mailto:'):
diff --git a/python-pypi/hatta/template.patch
b/python-pypi/hatta/template.patch
deleted file mode 100644
index f56162e..0000000
--- a/python-pypi/hatta/template.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- hatta/config.py.orig 2013-11-11 16:03:04.000000000 +0300
-+++ hatta/config.py 2014-12-23 11:26:37.826040437 +0300
-@@ -24,6 +24,8 @@
- help='Use the repository at DIR', metavar='DIR')
- _add('-t', '--cache-dir', dest='cache_path',
- help='Store cache in DIR', metavar='DIR')
-+_add('-T', '--template-dir', dest='template_path',
-+ help='Use templates in DIR', metavar='DIR')
- _add('-i', '--interface', dest='interface',
- help='Listen on interface INT', metavar='INT')
- _add('-p', '--port', dest='port', type='int',
---- hatta/wiki.py.orig 2013-11-11 16:14:00.000000000 +0300
-+++ hatta/wiki.py 2014-12-23 18:15:27.824078168 +0300
-@@ -52,10 +52,15 @@
- return translation
-
-
--def init_template(translation):
-+def init_template(translation, template_path):
-+ loaders = [ jinja2.PackageLoader('hatta', 'templates') ]
-+
-+ if template_path is not None:
-+ loaders.insert(0,
jinja2.FileSystemLoader(os.path.abspath(template_path)))
-+
- template_env = jinja2.Environment(
- extensions=['jinja2.ext.i18n'],
-- loader=jinja2.PackageLoader('hatta', 'templates'),
-+ loader=jinja2.ChoiceLoader(loaders),
- )
- template_env.autoescape = True
- template_env.install_gettext_translations(translation, True)
-@@ -82,7 +87,8 @@
- self.language = config.get('language')
- translation = init_gettext(self.language)
- self.gettext = translation.ugettext
-- self.template_env = init_template(translation)
-+ self.template_path = config.get('template_path')
-+ self.template_env = init_template(translation, self.template_path)
- self.path = os.path.abspath(config.get('pages_path', 'docs'))
- self.repo_path = config.get('repo_path')
- self.page_charset = config.get('page_charset', 'utf-8')



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4c03c47e8a4bd2aad0a63642c1231f8a526fdf25), Vlad Glagolev, 10/04/2015

Archive powered by MHonArc 2.6.24.

Top of Page