@@ 1,4 1,4 @@
-image:
+image: Dockerfile
podman build . --tag builder
keys:
@@ 102,10 102,6 @@ PY3_PGPY=pkg/aarch64/py3-pgpy-0.5.4-r2.apk
$(PY3_PGPY): pkgsrc/py3-pgpy/APKBUILD
podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-pgpy
-PY3_PYGMENTS=pkg/aarch64/py3-pygments-2.13.0-r0.apk
-$(PY3_PYGMENTS): pkgsrc/py3-pygments/APKBUILD $(PY3_WCAG_CONTRAST_RATIO)
- podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-pygments
-
PY3_SCMSRHT=pkg/aarch64/py3-scmsrht-0.22.22-r0.apk
$(PY3_SCMSRHT): pkgsrc/py3-scmsrht/APKBUILD $(BUILDS_SR_HT) $(PY3_SRHT)
podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-scmsrht
@@ 122,10 118,6 @@ PY3_VINE=pkg/aarch64/py3-vine-5.0.0-r1.apk
$(PY3_VINE): pkgsrc/py3-vine/APKBUILD $(PY3_CASE)
podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-vine
-PY3_WCAG_CONTRAST_RATIO=pkg/aarch64/py3-wcag-contrast-ratio-0.9-r0.apk
-$(PY3_WCAG_CONTRAST_RATIO): pkgsrc/py3-wcag-contrast-ratio/APKBUILD
- podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-wcag-contrast-ratio
-
PY3_ZXCVBN=pkg/aarch64/py3-zxcvbn-4.4.28-r0.apk
$(PY3_ZXCVBN): pkgsrc/py3-zxcvbn/APKBUILD
podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-zxcvbn
@@ 156,8 148,6 @@ all: \
$(PY3_MINIO) \
$(PY3_MISTLETOE) \
$(PY3_PGPY) \
- $(PY3_WCAG_CONTRAST_RATIO) \
- $(PY3_PYGMENTS) \
$(PY3_SQLALCHEMY_UTILS) \
$(PY3_CELERY) \
$(PY3_SCMSRHT) \
@@ 1,101 0,0 @@
-From d5d3351836fde35cbbad374d50685353eb38ddbc Mon Sep 17 00:00:00 2001
-From: Drew DeVault <sir@cmpwn.com>
-Date: Fri, 4 Feb 2022 13:09:04 +0100
-Subject: [PATCH] lexers: add Hare
-
----
- pygments/lexers/_mapping.py | 1 +
- pygments/lexers/hare.py | 69 +++++++++++++++++++++++++++++++++++++
- 2 files changed, 70 insertions(+)
- create mode 100644 pygments/lexers/hare.py
-
-diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py
-index 40120a87..873b30f8 100644
---- a/pygments/lexers/_mapping.py
-+++ b/pygments/lexers/_mapping.py
-@@ -198,6 +198,7 @@ LEXERS = {
- 'HamlLexer': ('pygments.lexers.html', 'Haml', ('haml',), ('*.haml',), ('text/x-haml',)),
- 'HandlebarsHtmlLexer': ('pygments.lexers.templates', 'HTML+Handlebars', ('html+handlebars',), ('*.handlebars', '*.hbs'), ('text/html+handlebars', 'text/x-handlebars-template')),
- 'HandlebarsLexer': ('pygments.lexers.templates', 'Handlebars', ('handlebars',), (), ()),
-+ 'HareLexer': ('pygments.lexers.hare', 'Hare', ('hare',), ('*.ha',), ('text/x-hare',)),
- 'HaskellLexer': ('pygments.lexers.haskell', 'Haskell', ('haskell', 'hs'), ('*.hs',), ('text/x-haskell',)),
- 'HaxeLexer': ('pygments.lexers.haxe', 'Haxe', ('haxe', 'hxsl', 'hx'), ('*.hx', '*.hxsl'), ('text/haxe', 'text/x-haxe', 'text/x-hx')),
- 'HexdumpLexer': ('pygments.lexers.hexdump', 'Hexdump', ('hexdump',), (), ()),
-diff --git a/pygments/lexers/hare.py b/pygments/lexers/hare.py
-new file mode 100644
-index 00000000..f501d670
---- /dev/null
-+++ b/pygments/lexers/hare.py
-@@ -0,0 +1,69 @@
-+"""
-+ :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
-+ :license: BSD, see LICENSE for details.
-+"""
-+
-+import re
-+
-+from pygments.lexer import RegexLexer, include, bygroups, inherit, words, \
-+ default
-+from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
-+ Number, Punctuation
-+
-+__all__ = ['HareLexer']
-+
-+class HareLexer(RegexLexer):
-+ name = 'Hare'
-+ aliases = ['hare']
-+ filenames = ['*.ha']
-+ mimetypes = ['text/x-hare']
-+
-+ _ws = r'(?:\s|//.*?\n|/[*].*?[*]/)+'
-+ _ws1 = r'\s*(?:/[*].*?[*]/\s*)?'
-+
-+ tokens = {
-+ 'whitespace': [
-+ (r'^use.*;', Comment.Preproc),
-+ (r'@[a-z]+', Comment.Preproc),
-+ (r'\n', Text),
-+ (r'\s+', Text),
-+ (r'//.*?$', Comment.Single),
-+ ],
-+ 'statements': [
-+ (r'"', String, 'string'),
-+ (r'`[^`]*`', String),
-+ (r"'(\\.|\\[0-7]{1,3}|\\x[a-fA-F0-9]{1,2}|[^\\\'\n])'", String.Char),
-+ (r'(\d+\.\d*|\.\d+|\d+)[eE][+-]?\d+[LlUu]*', Number.Float),
-+ (r'(\d+\.\d*|\.\d+|\d+[fF])[fF]?', Number.Float),
-+ (r'0x[0-9a-fA-F]+[LlUu]*', Number.Hex),
-+ (r'0o[0-7]+[LlUu]*', Number.Oct),
-+ (r'\d+[zui]?(\d+)?', Number.Integer),
-+ (r'[~!%^&*+=|?:<>/-]', Operator),
-+ (words('as', 'is'), Operator),
-+ (r'[()\[\],.{};]', Punctuation),
-+ (words(('abort', 'alloc', 'append', 'assert', 'case', 'char',
-+ 'const', 'def', 'defer', 'delete', 'else', 'enum', 'export',
-+ 'fn', 'for', 'free', 'if', 'let', 'len', 'match', 'offset',
-+ 'return', 'static', 'struct', 'switch', 'type', 'union',
-+ 'yield', 'vastart', 'vaarg', 'vaend'),
-+ suffix=r'\b'), Keyword),
-+ (r'(bool|int|uint|uintptr|u8|u16|u32|u64|i8|i16|i32|i64|f32|f64|null|void|nullable|rune|size|valist)\b',
-+ Keyword.Type),
-+ (r'(true|false|null)\b', Name.Builtin),
-+ ('[a-zA-Z_]\w*', Name),
-+ ],
-+ 'string': [
-+ (r'"', String, '#pop'),
-+ (r'\\([\\abfnrtv"\']|x[a-fA-F0-9]{2,4}|'
-+ r'u[a-fA-F0-9]{4}|U[a-fA-F0-9]{8}|[0-7]{1,3})', String.Escape),
-+ (r'[^\\"\n]+', String), # all other characters
-+ (r'\\', String), # stray backslash
-+ ],
-+ 'root': [
-+ include('whitespace'),
-+ include('statements'),
-+ ],
-+ }
-+
-+ def __init__(self, **options):
-+ RegexLexer.__init__(self, **options)
---
-2.35.1
-