From 13006260611688e444ddfa42918304282148238b Mon Sep 17 00:00:00 2001 From: Dominic Ricottone Date: Sat, 1 Apr 2023 12:37:52 -0500 Subject: [PATCH] Major updates Updates to: + py3-srht + builds.sr.ht + git.sr.ht + lists.sr.ht + meta.sr.ht + todo.sr.ht + py3-asyncpg Trying again with the updates to: + py3-ansi2html + py3-atpublic + py3-pygments Re-releasing py3-pgpy. Dropping py3-emailthreads. Updating Alpine Linux to 3.17. --- Dockerfile | 2 +- Makefile | 63 +++++++++---------- pkgsrc/builds.sr.ht/APKBUILD | 8 +-- pkgsrc/git.sr.ht/APKBUILD | 10 +-- pkgsrc/lists.sr.ht/APKBUILD | 9 ++- pkgsrc/meta.sr.ht/APKBUILD | 10 +-- pkgsrc/py3-ansi2html/APKBUILD | 16 +++-- pkgsrc/py3-asyncpg/APKBUILD | 4 +- pkgsrc/py3-atpublic/APKBUILD | 29 ++++++--- pkgsrc/py3-atpublic/pyproject.toml | 97 ++++++++++++++++++++++++++++++ pkgsrc/py3-emailthreads/APKBUILD | 27 --------- pkgsrc/py3-pgpy/APKBUILD | 2 +- pkgsrc/py3-pygments/APKBUILD | 6 +- pkgsrc/py3-srht/APKBUILD | 6 +- pkgsrc/todo.sr.ht/APKBUILD | 8 +-- repositories | 4 +- 16 files changed, 194 insertions(+), 107 deletions(-) create mode 100644 pkgsrc/py3-atpublic/pyproject.toml delete mode 100644 pkgsrc/py3-emailthreads/APKBUILD diff --git a/Dockerfile b/Dockerfile index d4705b4..f4d4432 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.15 +FROM alpine:3.17 # apk COPY repositories /etc/apk/repositories diff --git a/Makefile b/Makefile index 85a5ece..5058263 100644 --- a/Makefile +++ b/Makefile @@ -6,15 +6,19 @@ keys: openssl genrsa -out keys/me@dominic-ricottone.com.rsa 2048 openssl rsa -in keys/me@dominic-ricottone.com.rsa -pubout -out keys/me@dominic-ricottone.com.rsa.pub -BUILDS_SR_HT=pkg/aarch64/builds.sr.ht-0.82.10-r0.apk +BUILDS_SR_HT=pkg/aarch64/builds.sr.ht-0.85.6-r0.apk $(BUILDS_SR_HT): pkgsrc/builds.sr.ht/APKBUILD $(PY3_ANSI2HTML) $(PY3_CELERY) $(PY3_SRHT) podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder builds.sr.ht -GIT_SR_HT=pkg/aarch64/git.sr.ht-0.79.1-r0.apk +GIT_SR_HT=pkg/aarch64/git.sr.ht-0.83.5-r0.apk $(GIT_SR_HT): pkgsrc/git.sr.ht/APKBUILD $(PY3_MINIO) $(PY3_SCMSRHT) podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder git.sr.ht -META_SR_HT=pkg/aarch64/meta.sr.ht-0.60.3-r0.apk +LISTS_SR_HT=pkg/aarch64/lists.sr.ht-0.57.4-r0.apk +$(LISTS_SR_HT): pkgsrc/lists.sr.ht/APKBUILD $(PY3_CELERY) $(PY3_SRHT) $(PY3_AIOSMTPD) $(PY3_ASYNCPG) + podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder lists.sr.ht + +META_SR_HT=pkg/aarch64/meta.sr.ht-0.64.7-r0.apk $(META_SR_HT): pkgsrc/meta.sr.ht/APKBUILD $(PY3_SRHT) $(PY3_ZXCVBN) podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder meta.sr.ht @@ -26,15 +30,15 @@ PY3_AMQP=pkg/aarch64/py3-amqp-5.1.1-r0.apk $(PY3_AMQP): pkgsrc/py3-amqp/APKBUILD $(PY3_VINE) podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-amqp -PY3_ANSI2HTML=pkg/aarch64/py3-ansi2html-1.7.0-r0.apk +PY3_ANSI2HTML=pkg/aarch64/py3-ansi2html-1.8.0-r0.apk $(PY3_ANSI2HTML): pkgsrc/py3-ansi2html/APKBUILD podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-ansi2html -#PY3_ANYJSON=pkg/aarch64/py3-anyjson-0.3.3-r0.apk -#$(PY3_ANYJSON): pkgsrc/py3-anyjson/APKBUILD -# podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-anyjson +PY3_ASYNCPG=pkg/aarch64/py3-asyncpg-0.27.0-r0.apk +$(PY3_ASYNCPG): pkgsrc/py3-asyncpg/APKBUILD + podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-asyncpg -PY3_ATPUBLIC=pkg/aarch64/py3-atpublic-2.3-r2.apk +PY3_ATPUBLIC=pkg/aarch64/py3-atpublic-3.1.1-r0.apk $(PY3_ATPUBLIC): pkgsrc/py3-atpublic/APKBUILD podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-atpublic @@ -94,11 +98,11 @@ PY3_ORDEREDMULTIDICT=pkg/aarch64/py3-orderedmultidict-1.0.1-r0.apk $(PY3_ORDEREDMULTIDICT): pkgsrc/py3-orderedmultidict/APKBUILD podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-orderedmultidict -PY3_PGPY=pkg/aarch64/py3-pgpy-0.5.4-r1.apk +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.11.2-r2.apk +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 @@ -107,14 +111,10 @@ $(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 PY3_SQLALCHEMY_UTILS=pkg/aarch64/py3-sqlalchemy-utils-0.38.3-r0.apk -$(PY3_SQLALCHEMY_UTILS): pkgsrc/py3-sqlalchemy-utils/APKBUILD $(PY3_ANYJSON) $(PY3_INTERVALS) $(PY3_COLOUR) $(PY3_FURL) +$(PY3_SQLALCHEMY_UTILS): pkgsrc/py3-sqlalchemy-utils/APKBUILD $(PY3_INTERVALS) $(PY3_COLOUR) $(PY3_FURL) podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-sqlalchemy-utils -#PY3_SSHPUBKEYS=pkg/aarch64/py3-sshpubkeys-3.3.1-r0.apk -#$(PY3_SSHPUBKEYS): pkgsrc/py3-sshpubkeys/APKBUILD -# podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-sshpubkeys - -PY3_SRHT=pkg/aarch64/py3-srht-0.69.6-r0.apk +PY3_SRHT=pkg/aarch64/py3-srht-0.69.14-r0.apk $(PY3_SRHT): $(PY3_CELERY) $(PY3_HUMANIZE) $(PY3_MISTLETOE) $(PY3_PGPY) $(PY3_PYGMENTS) $(PY3_SQLALCHEMY_UTILS) podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-srht @@ -130,40 +130,41 @@ 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 -TODO_SR_HT=pkg/aarch64/todo.sr.ht-0.72.12-r0.apk +TODO_SR_HT=pkg/aarch64/todo.sr.ht-0.74.5-r0.apk $(TODO_SR_HT): pkgsrc/todo.sr.ht/APKBUILD $(PY3_AIOSMTPD) $(PY3_SRHT) podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder todo.sr.ht -all: $(BUILDS_SR_HT) \ - $(GIT_SR_HT) \ - $(META_SR_HT) \ +all: \ + $(PY3_ATPUBLIC) \ $(PY3_AIOSMTPD) \ + $(PY3_CASE) \ + $(PY3_VINE) \ $(PY3_AMQP) \ $(PY3_ANSI2HTML) \ - $(PY3_ANYJSON) \ - $(PY3_ATPUBLIC) \ + $(PY3_ASYNCPG) \ $(PY3_BILLIARD) \ - $(PY3_CASE) \ - $(PY3_CELERY) \ $(PY3_CLICK_DIDYOUMEAN) \ $(PY3_CLICK_REPL) \ $(PY3_COLOUR) \ + $(PY3_ORDEREDMULTIDICT) \ $(PY3_FURL) \ $(PY3_HUMANIZE) \ + $(PY3_ZXCVBN) \ $(PY3_INFINITY) \ $(PY3_INTERVALS) \ $(PY3_KOMBU) \ $(PY3_MINIO) \ $(PY3_MISTLETOE) \ - $(PY3_ORDEREDMULTIDICT) \ $(PY3_PGPY) \ + $(PY3_WCAG_CONTRAST_RATIO) \ $(PY3_PYGMENTS) \ - $(PY3_SCMSRHT) \ $(PY3_SQLALCHEMY_UTILS) \ - $(PY3_SSHPUBKEYS) \ + $(PY3_CELERY) \ + $(PY3_SCMSRHT) \ $(PY3_SRHT) \ - $(PY3_VINE) \ - $(PY3_WCAG_CONTRAST_RATIO) \ - $(PY3_ZXCVBN) \ - $(TODO_SR_HT) + $(TODO_SR_HT) \ + $(BUILDS_SR_HT) \ + $(GIT_SR_HT) \ + $(LISTS_SR_HT) \ + $(META_SR_HT) diff --git a/pkgsrc/builds.sr.ht/APKBUILD b/pkgsrc/builds.sr.ht/APKBUILD index e018bd8..f216741 100755 --- a/pkgsrc/builds.sr.ht/APKBUILD +++ b/pkgsrc/builds.sr.ht/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Drew DeVault pkgname=builds.sr.ht -pkgver=0.82.10 +pkgver=0.85.6 pkgrel=0 pkgdesc="sr.ht build service" url="https://git.sr.ht/~sircmpwn/builds.sr.ht" @@ -15,7 +15,7 @@ depends=" py3-srht py3-yaml " -makedepends="py-setuptools nodejs sassc go" +makedepends="py-setuptools sassc go minify" subpackages=" $pkgname-images:_images $pkgname-worker:_worker @@ -87,8 +87,8 @@ _nginx() { } sha512sums=" -37f880fed115fa96d70d2eb929c143dfeb6378a1daba8afb1d243e9fbb1b3f8ef81298756728c0773b7ec51c4ad9c9145b8a22d423288cc3bcb8bba26947a22a builds.sr.ht-0.82.10.tar.gz -6a1be43d5e3caa98ebcfc9546cb46a9abf4691a6a772c24ba8872b54c3dca6c65f2615443be74d59f262d0be3b0972a326f659fd860f6fc73e48b08b07283f20 sr.ht-nginx-0.82.10.tar.gz +8c17db53a93e79551370c60379f70a72870b7edb34f93df971255d2f42f15dcf0e88cc42149fbbdaae6553987eaf3ada02f9608b9397e2d9afb5202badd66be8 builds.sr.ht-0.85.6.tar.gz +e6f1507af5a6b83d0e9d9bb11f5193b4a18808285c6470068caa456b6e3b0072fb7066808e6da6ca1eceaa3365d60843c9e1fe8315578158f14622ca6787beb9 sr.ht-nginx-0.85.6.tar.gz d205043f3fe0dc022d25f8714ad5fb095a7dc92a10fe4eb4a1c6d6a500b54692773c1e314e9337a320f9b6043225a9a5a9e50d9a5dc30e7c80305b7ad538ea0f builds.sr.ht.confd ea8b25d92e53d62bff2466d048d9a34482d9d06a2d6bdb828ce9d036009cdb2ca7435c288f79b51860539399acdb3c27eda268e8ec7a7fcfa2969961959b2d0e builds.sr.ht.initd a507ea33f4e87d41d68b42f816914d357ff687e249e424f2278e3c44e980774080377ca5daa02212776095402ba7e271355d427750270005cf6f6db079040a08 builds.sr.ht-api.confd diff --git a/pkgsrc/git.sr.ht/APKBUILD b/pkgsrc/git.sr.ht/APKBUILD index 2f0eeee..0734fce 100644 --- a/pkgsrc/git.sr.ht/APKBUILD +++ b/pkgsrc/git.sr.ht/APKBUILD @@ -1,19 +1,19 @@ # Maintainer: Drew DeVault pkgname=git.sr.ht -pkgver=0.79.1 +pkgver=0.83.5 pkgrel=0 pkgdesc="sr.ht git service" url="https://git.sr.ht/~sircmpwn/git.sr.ht" arch="all" license="AGPLv3" depends=" + git py3-minio py3-pygit2 py3-redis py3-scmsrht - git " -makedepends="py-setuptools nodejs sassc go" +makedepends="py-setuptools sassc go minify" subpackages="$pkgname-openrc $pkgname-nginx:_nginx:noarch" source=" $pkgname-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/$pkgname/archive/$pkgver.tar.gz @@ -69,8 +69,8 @@ _nginx() { } sha512sums=" -793b3e5aa45896213ec6529a711f5fe39db4e9be4c8019f1177dfd21b76d1eae9cc519ea4889266bbebe794316eee21b88a52357a79af3e6ce17839f35fc4741 git.sr.ht-0.79.1.tar.gz -6a1be43d5e3caa98ebcfc9546cb46a9abf4691a6a772c24ba8872b54c3dca6c65f2615443be74d59f262d0be3b0972a326f659fd860f6fc73e48b08b07283f20 sr.ht-nginx-0.79.1.tar.gz +898ef22c923b08114820aad9211ee6370d413c484578ec42901fdeca42dea2d61c4a77455f33fb8ae46ee31348d341e84d9e2f4c9a4f2fc5c583bba6b154a0c9 git.sr.ht-0.83.5.tar.gz +e6f1507af5a6b83d0e9d9bb11f5193b4a18808285c6470068caa456b6e3b0072fb7066808e6da6ca1eceaa3365d60843c9e1fe8315578158f14622ca6787beb9 sr.ht-nginx-0.83.5.tar.gz bab6312b5a6d1bd9808cb6eae2b33f1fc4f544ac286ce9a67f4c07fc8d4679dc81d93f3d1ec7f8adad3dedead9203b5d10ab63aff478fb11780790e7a01a232a git.sr.ht.initd 7462f15928aa24b10e63041b0021aa5a69fa92d071f497d6b1dc353dac3bff30818cb560c6011effbd619d450e8b8c6f8f3ab07a1df9714ea79b00e4d12dcf44 git.sr.ht.confd 370a9f710704d7dfe88632f0ae2b7d2b406621322cab1f87f4f4c3984c741fba616f9c2a806d83e79250dc58aba89161a2db8ca424794dbd2cacbffb6e1a9adb git.sr.ht-api.initd diff --git a/pkgsrc/lists.sr.ht/APKBUILD b/pkgsrc/lists.sr.ht/APKBUILD index 1f883c9..1ff69ed 100644 --- a/pkgsrc/lists.sr.ht/APKBUILD +++ b/pkgsrc/lists.sr.ht/APKBUILD @@ -1,13 +1,12 @@ # Maintainer: Drew DeVault pkgname=lists.sr.ht -pkgver=0.53.10 +pkgver=0.57.4 pkgrel=0 pkgdesc="sr.ht mailing list service" url="https://git.sr.ht/~sircmpwn/lists.sr.ht" arch="all" license="AGPLv3" depends=" - py3-emailthreads py3-pygit2 py3-srht py3-celery @@ -16,7 +15,7 @@ depends=" py3-redis py3-gunicorn " -makedepends="py-setuptools nodejs sassc go" +makedepends="py-setuptools sassc go minify" subpackages="$pkgname-openrc $pkgname-nginx:_nginx" source=" $pkgname-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/$pkgname/archive/$pkgver.tar.gz @@ -79,8 +78,8 @@ _nginx() { } sha512sums=" -f3953f33eae319a0f28d0ee52a3a928bfbe0a7f4b4e6a2293f3ca02fe5a6a87aa78c12c4c0baf18b3c3fc211b93650364ec5b02b7a9f2a74e78d10172d9be7a3 lists.sr.ht-0.53.10.tar.gz -6a1be43d5e3caa98ebcfc9546cb46a9abf4691a6a772c24ba8872b54c3dca6c65f2615443be74d59f262d0be3b0972a326f659fd860f6fc73e48b08b07283f20 sr.ht-nginx-0.53.10.tar.gz +02244a3d1f1a90f2ee16a8c2a9108eb8bae0aaa888de3bdfc3ebf860827679d853b6c424ae1edf2aa875a42f5884402790b8183b0bbc514b3d433f21386343d4 lists.sr.ht-0.57.4.tar.gz +e6f1507af5a6b83d0e9d9bb11f5193b4a18808285c6470068caa456b6e3b0072fb7066808e6da6ca1eceaa3365d60843c9e1fe8315578158f14622ca6787beb9 sr.ht-nginx-0.57.4.tar.gz bc34e789d752eb35f534511eef7ee70f257db0fee9db2cc5829adf48dfd7b20a2e259d01ab0ca914e64768c5e99cdfca995bf49e9d879fb6aff4cef5bdecc631 lists.sr.ht.initd 0fdee2ea046f0f90ff56be74d3ad036c855103e76a4ca47b418f66f54c581a4e5d5674499fa68bcb4ca4dee1a35e9fffab0dfe45b66d071b841ffc113cdf9d79 lists.sr.ht.confd 2460050d9d6e6d2ebf623c2734a31fd2d1aeaaf8161a6a2d5fdc701b3d38f8844951f2361745aad175ce0edd3b92a0bfe326beb04a239f59fb902a000f32d6f9 lists.sr.ht-api.initd diff --git a/pkgsrc/meta.sr.ht/APKBUILD b/pkgsrc/meta.sr.ht/APKBUILD index a55ce28..1dc09c4 100644 --- a/pkgsrc/meta.sr.ht/APKBUILD +++ b/pkgsrc/meta.sr.ht/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Drew DeVault pkgname=meta.sr.ht -pkgver=0.60.3 +pkgver=0.64.7 pkgrel=0 pkgdesc="sr.ht account service" url="https://git.sr.ht/~sircmpwn/meta.sr.ht" @@ -16,7 +16,7 @@ depends=" py3-zxcvbn redis " -makedepends="py-setuptools nodejs sassc go" +makedepends="py-setuptools sassc go minify" subpackages="$pkgname-openrc $pkgname-billing:_billing:noarch $pkgname-nginx:_nginx:noarch" # XXX: Is this sr.ht-nginx URL acceptable? I'm not sure how to version it source=" @@ -59,7 +59,7 @@ package() { } _billing() { - depends="py3-weasyprint py3-html5lib py3-stripe" + depends="py3-stripe" pkgdesc="Extra meta.sr.ht dependencies for billing" mkdir -p "$subpkgdir"/usr/lib/python3.8/site-packages/metasrht touch "$subpkgdir"/usr/lib/python3.8/site-packages/metasrht/.billing @@ -73,8 +73,8 @@ _nginx() { } sha512sums=" -e343f1ea9ad17064bc94cbd6b6eae6cc238ae383f499b8138c2b5e5527a473bc738ab57c1e902422d5cf70609e93f4ef87ac2381a4234cd194d79a8018b039bc meta.sr.ht-0.60.3.tar.gz -6a1be43d5e3caa98ebcfc9546cb46a9abf4691a6a772c24ba8872b54c3dca6c65f2615443be74d59f262d0be3b0972a326f659fd860f6fc73e48b08b07283f20 sr.ht-nginx-0.60.3.tar.gz +efbd7bc658d4cb3da980858dcaed4817329384a23c6d5f929cf1425a3af3199a710344e749e51a6e9108b3bdeb236deda01944d61981ff5b4f8ce39a8347bed0 meta.sr.ht-0.64.7.tar.gz +e6f1507af5a6b83d0e9d9bb11f5193b4a18808285c6470068caa456b6e3b0072fb7066808e6da6ca1eceaa3365d60843c9e1fe8315578158f14622ca6787beb9 sr.ht-nginx-0.64.7.tar.gz f84bb7c0532a27b1a2425726a79b329d4782eb459571c289d793beabfe9334ffbca53bcb19a699e1f0a7d696fe57cf8c0692f72576351d9cf4b9f8f325222eaf meta.sr.ht.initd fbff1755c572da66c351004690530d875c882a65576cc641399e07dfb39e818105be1370f6ba28c6e2774e3868fe3aa3aa17dec51d14547c8db7f1aa685b0ac8 meta.sr.ht.confd 8377026251395fa74980a6733a6715c5dcfa6b893ad846d556479d3170605ba7cbe5dcc1c482f90a20e0b6332732cba9480d198dfcc9d73d2d6e338e5276bc65 meta.sr.ht-api.initd diff --git a/pkgsrc/py3-ansi2html/APKBUILD b/pkgsrc/py3-ansi2html/APKBUILD index 12036cc..ac212da 100644 --- a/pkgsrc/py3-ansi2html/APKBUILD +++ b/pkgsrc/py3-ansi2html/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: Fabian Affolter pkgname=py3-ansi2html _pyname=ansi2html -pkgver=1.7.0 +pkgver=1.8.0 pkgrel=0 pkgdesc="Convert text with ANSI color codes to HTML" url="http://github.com/ralphbean/ansi2html/" arch="noarch" license="LGPL-3.0-or-later" depends="py3-six" -makedepends="py3-setuptools py3-setuptools_scm py3-toml pyproject2setuppy" +makedepends="py3-setuptools_scm py3-wheel py3-installer py3-build" checkdepends="py3-pytest py3-mock py3-nose" replaces="py-ansi2html py2-ansi2html" _pypiprefix="${_pyname%${_pyname#?}}" @@ -17,8 +17,13 @@ source="https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_p builddir="$srcdir"/$_pyname-$pkgver options="!check" # Upstream tests are stupid +prepare() { + sed -i pyproject.toml -e 's/.*setuptools_scm_git_archive.*//g' +} + build() { - python3 -m pyproject2setuppy.main build + export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver + python3 -m build --no-isolation --wheel . } check() { @@ -26,9 +31,10 @@ check() { } package() { - python3 -m pyproject2setuppy.main install --prefix=/usr --root="$pkgdir" + python3 -m installer --destdir="$pkgdir" \ + dist/ansi2html-$pkgver-py3-none-any.whl } sha512sums=" -bcae0de9874899bd8440853b8279f3b2c4ed46e24bf807221ddc9d1bfa39647e2efd178aefc2fd39bad27b53890270b6ff7c150a0b8e74581b8323ef7a16c977 ansi2html-1.7.0.tar.gz +cbdda41f206ced5b19761a1ff9747acc6cadca3a5a2f58c97c6073db7d517e59fea7601bba28a8e7e105f3c0c9c4d78ca4f242100cbded6c8a9ca2d598de0ab4 ansi2html-1.8.0.tar.gz " diff --git a/pkgsrc/py3-asyncpg/APKBUILD b/pkgsrc/py3-asyncpg/APKBUILD index d6cab75..db242f2 100644 --- a/pkgsrc/py3-asyncpg/APKBUILD +++ b/pkgsrc/py3-asyncpg/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Drew DeVault pkgname=py3-asyncpg _pyname=asyncpg -pkgver=0.26.0 +pkgver=0.27.0 pkgrel=0 pkgdesc="An asyncio PostgreSQL driver" url="https://github.com/MagicStack/asyncpg" @@ -28,5 +28,5 @@ package() { } sha512sums=" -ef92316fd430a1819aa8170abd67ecfc1cf29c42cb6dc06cf5047cdd71d4abf441c8b86bacafaaa8c0c0fd7c66daa275e9ed68b00e5166bb27929f25cab1dcbd asyncpg-0.26.0.tar.gz +66d4e16cba8ebebfa0403c7d3b1d3ee1b9b8f55a9b70f57e809d28161873d74750152e6ed548b17ceb97ca84f7a669a5fa503c824a861b295db731f86bfb0137 asyncpg-0.27.0.tar.gz " diff --git a/pkgsrc/py3-atpublic/APKBUILD b/pkgsrc/py3-atpublic/APKBUILD index 64604c4..253116b 100644 --- a/pkgsrc/py3-atpublic/APKBUILD +++ b/pkgsrc/py3-atpublic/APKBUILD @@ -2,31 +2,42 @@ # Maintainer: Drew DeVault pkgname=py3-atpublic _pyname=atpublic -pkgver=2.3 -pkgrel=2 +pkgver=3.1.1 +pkgrel=0 pkgdesc="@public for populating __all__" url="https://gitlab.com/warsaw/public" arch="noarch" license="Apache-2.0" -makedepends="python3-dev py3-setuptools py3-pytest" -checkdepends="py3-sybil py3-pytest-cov" +makedepends="python3-dev py3-setuptools py3-build py3-installer py3-wheel py3-toml" +checkdepends="py3-sybil py3-pytest py3-pytest-cov" _pypiprefix="${_pyname%${_pyname#?}}" -source="https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz" +source=" + https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz + pyproject.toml +" replaces="py-atpublic" builddir="$srcdir"/$_pyname-$pkgver +prepare() { + default_prepare + # Remove pdm garbage + cp "$srcdir"/pyproject.toml "$builddir" +} + build() { - python3 setup.py build + python3 -m build --no-isolation --wheel } check() { - pytest-3 + export PYTHONPATH="$builddir"/src + python3 -m pytest } package() { - python3 setup.py install --prefix=/usr --root="$pkgdir" + python3 -m installer -d"$pkgdir" dist/$_pyname-$pkgver-py3-none-any.whl } sha512sums=" -88c140c7ca0cfe3db791fd43a97f9fc63de979191a026df4d9f7a34a347b657d7d7b6fb7e31a231ac3adbc5e5d014b8e3c3606b93515a6ad42ea3d101b480329 atpublic-2.3.tar.gz +b34dbb236717b2017de95aa79226f0138e77814a4041e26e98f50db8f8521d81b60f9998aed719e1e1f2ee29a7c590170725e12a54260900ce9819ea3a623dac atpublic-3.1.1.tar.gz +a3ef1b33c4872937a659a76450e63f707b10a9193a0246e339d939aff4b643f4db01eb0a962050e7c8267f847c3eacf5b4b15b3ec775840b36ce7977784c33de pyproject.toml " diff --git a/pkgsrc/py3-atpublic/pyproject.toml b/pkgsrc/py3-atpublic/pyproject.toml new file mode 100644 index 0000000..4ee3884 --- /dev/null +++ b/pkgsrc/py3-atpublic/pyproject.toml @@ -0,0 +1,97 @@ +[project] +name = "atpublic" +authors = [ + { name = "Barry Warsaw", email = "barry@python.org" }, +] +description = "Keep all y'all's __all__'s in sync" +readme = "README.rst" +requires-python = ">=3.7" +keywords = [ + "__all__", + "public", + "private", +] +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Development Status :: 6 - Mature", + "Intended Audience :: Developers", + "License :: OSI Approved :: Apache Software License", + "Operating System :: POSIX", + "Operating System :: MacOS :: MacOS X", + "Operating System :: Microsoft :: Windows", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Topic :: Software Development :: Libraries", + "Topic :: Software Development :: Libraries :: Python Modules", + "Topic :: Utilities", +] +dependencies = [] +dynamic = [] +version = "3.1.1" + +[project.license] +text = "Apache-2.0" + +[project.urls] +"Home Page" = "https://public.readthedocs.io" +Documentation = "https://public.readthedocs.io" +Source = "https://gitlab.com/warsaw/public.git" +"Bug Tracker" = "https://gitlab.com/warsaw/public/issues" + +[project.optional-dependencies] + +[tool.pytest.ini_options] +addopts = "--cov=public --cov-report=term --cov-report=xml -p no:doctest" +testpaths = "test docs" + +[tool.coverage.report] +fail_under = 100 +show_missing = true + +[tool.coverage.run] +branch = true +parallel = true + +[tool.isort] +include_trailing_comma = true +known_first_party = "public" +length_sort_straight = true +lines_after_imports = 2 +lines_between_types = 1 +multi_line_output = 3 +order_by_type = false +skip = [ + "conf.py", +] + +[tool.mypy] +mypy_path = "src" +disallow_any_generics = true +disallow_subclassing_any = true +disallow_untyped_calls = false +disallow_untyped_defs = true +disallow_incomplete_defs = true +check_untyped_defs = true +disallow_untyped_decorators = false +no_implicit_optional = true +warn_redundant_casts = true +warn_unused_ignores = true +warn_no_return = true +warn_return_any = true +warn_unreachable = true +implicit_reexport = false +strict_equality = true +show_error_context = true +show_column_numbers = true +show_error_codes = true +pretty = true +show_absolute_path = true +warn_unused_configs = true +verbosity = 0 + +[[tool.mypy.overrides]] +module = [ + "pytest", + "sybil.*", +] +ignore_missing_imports = true diff --git a/pkgsrc/py3-emailthreads/APKBUILD b/pkgsrc/py3-emailthreads/APKBUILD deleted file mode 100644 index 560b3a2..0000000 --- a/pkgsrc/py3-emailthreads/APKBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: Drew DeVault -pkgname=py3-emailthreads -pkgver=0.1.3 -pkgrel=0 -pkgdesc="Python library to parse and format email threads" -url="https://github.com/emersion/python-emailthreads" -arch="noarch" -license="MIT" -depends="python3" -makedepends="py3-setuptools" -checkdepends="py3-pytest" -source="$pkgname-$pkgver.tar.gz::https://github.com/emersion/python-emailthreads/archive/v$pkgver.tar.gz" -builddir="$srcdir/python-emailthreads-${pkgver}" - -build() { - python3 setup.py build -} - -check() { - pytest-3 -} - -package() { - python3 setup.py install --root="$pkgdir" --optimize=1 -} - -sha512sums="a8b8c374704ddf934897a50034da1ebf2dabf221a7e64735be9524088931a02697facc40ef08250f2148c4ea22b8a2f76139eea82d0d7474f822aaac3dee2666 py3-emailthreads-0.1.3.tar.gz" diff --git a/pkgsrc/py3-pgpy/APKBUILD b/pkgsrc/py3-pgpy/APKBUILD index bc735ca..947fff7 100644 --- a/pkgsrc/py3-pgpy/APKBUILD +++ b/pkgsrc/py3-pgpy/APKBUILD @@ -2,7 +2,7 @@ pkgname=py3-pgpy _pyname=PGPy pkgver=0.5.4 -pkgrel=1 +pkgrel=2 pkgdesc="Pretty Good Privacy for Python - a pure Python OpenPGP implementation" url="https://github.com/SecurityInnovation/PGPy" arch="noarch" diff --git a/pkgsrc/py3-pygments/APKBUILD b/pkgsrc/py3-pygments/APKBUILD index 06e6bce..1d68f5e 100644 --- a/pkgsrc/py3-pygments/APKBUILD +++ b/pkgsrc/py3-pygments/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Matt Smith pkgname=py3-pygments _pkgname=Pygments -pkgver=2.11.2 -pkgrel=2 +pkgver=2.13.0 +pkgrel=0 pkgdesc="Syntax highlighting package written in Python" url="https://pygments.org/" arch="noarch" @@ -59,6 +59,6 @@ doc() { } sha512sums=" -606ff0c35fa47882f4c5c3794827132e1ee6ccbb4895ae858f9c93ea0c92b73163c9f4d630b51a8bb782ba0b4944a66d1059ad5d017d3191a0a5b30c1e5b8f9f Pygments-2.11.2.tar.gz +d492acf112423fa997f35d6d3cae18b89bf11619c696879c6df49697dca933b6d54d7cb22907e06812e0a562f03e8ed5ccefde5247bc1c51cf2d3d69e7d65422 Pygments-2.13.0.tar.gz 9787753652d4ae322d8fdb11464a6b1682e77070284a2b173e0087435a6aeb10b7320b327a957363a7eb94ff763446ee451e04dd91b25f901a72128fb2e2bb56 0001-lexers-add-Hare.patch " diff --git a/pkgsrc/py3-srht/APKBUILD b/pkgsrc/py3-srht/APKBUILD index a4be999..370ae6a 100644 --- a/pkgsrc/py3-srht/APKBUILD +++ b/pkgsrc/py3-srht/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Drew DeVault pkgbase=core.sr.ht pkgname=py3-srht -pkgver=0.69.6 +pkgver=0.69.14 pkgrel=0 pkgdesc="sr.ht shared code" url="https://git.sr.ht/~sircmpwn/core.sr.ht" @@ -29,7 +29,7 @@ depends=" " makedepends=" py-setuptools - npm + minify git " source=" @@ -60,5 +60,5 @@ package() { } sha512sums=" -6dd60e92e09a087a1b1c7d7d4f9e5d1e006f36f45dc4dffad17f3db99f837cdaee61e4be408954572d9e58c16878dd4727857e29b4c9131c7b3a39ae2201ca51 core.sr.ht-0.69.6.tar.gz +e50423cb995608a28897a753faee88c07e02749b1de2e4d70841ed1a4eb2719c2580a745f093dc7be4423de9a360fc915fb63e772ec8a71c842b0f48a4c5601b core.sr.ht-0.69.14.tar.gz " diff --git a/pkgsrc/todo.sr.ht/APKBUILD b/pkgsrc/todo.sr.ht/APKBUILD index 1dbc037..5df95ab 100644 --- a/pkgsrc/todo.sr.ht/APKBUILD +++ b/pkgsrc/todo.sr.ht/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Drew DeVault pkgname=todo.sr.ht -pkgver=0.72.12 +pkgver=0.74.5 pkgrel=0 pkgdesc="sr.ht ticket tracking service" url="https://git.sr.ht/~sircmpwn/todo.sr.ht" @@ -11,7 +11,7 @@ depends=" py3-gunicorn py3-srht " -makedepends="py-setuptools nodejs sassc go" +makedepends="py-setuptools sassc go minify" subpackages="$pkgname-openrc $pkgname-nginx:_nginx" source=" $pkgname-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/$pkgname/archive/$pkgver.tar.gz @@ -69,8 +69,8 @@ _nginx() { } sha512sums=" -76a679d8e817f841c01ddd5f82f9c9bca3a6957f70422844b1166f5dba6550bb1d8d284ca92e7e3415b88fab8a6866876ada08272b84583f7149d0c3301e0045 todo.sr.ht-0.72.12.tar.gz -6a1be43d5e3caa98ebcfc9546cb46a9abf4691a6a772c24ba8872b54c3dca6c65f2615443be74d59f262d0be3b0972a326f659fd860f6fc73e48b08b07283f20 sr.ht-nginx-0.72.12.tar.gz +7db1eac243661f246380573eef783339253518c0a0998de8b17d3c6803dcdf6edd178cf06d06e92c84ad2cc01004f5fb7b6520aa0b8adf6312bbf0f0b0074c28 todo.sr.ht-0.74.5.tar.gz +e6f1507af5a6b83d0e9d9bb11f5193b4a18808285c6470068caa456b6e3b0072fb7066808e6da6ca1eceaa3365d60843c9e1fe8315578158f14622ca6787beb9 sr.ht-nginx-0.74.5.tar.gz 946a15e8a723dea178edc451b461f756761a9429fd434820df1955225a9fe73c7aefb838ec32bb9f3a3f7b80a5921641540cdf5fcde3fff272420ea1abe3970e todo.sr.ht.initd a71116bd25e0c6e8e3e14e4dadb653e6360e2b468bd415439559b56ffc18724efa9bcb593181d8f0fe0cbccf96f3196a452659bb4375e687faf0b09a48ef5557 todo.sr.ht.confd c4ac342b5fa506c1323d9c55f36b800e16cb9afdecc32f94bf7261c8fa2710db839b84137d24f3e43ac28e036cf21f63c381a650661e722e416c61a6cf44c938 todo.sr.ht-lmtp.initd diff --git a/repositories b/repositories index b25a0de..2fd46d9 100644 --- a/repositories +++ b/repositories @@ -1,3 +1,3 @@ /home/builder/packages/huttese-pkgsrc -https://dl-cdn.alpinelinux.org/alpine/v3.15/main -https://dl-cdn.alpinelinux.org/alpine/v3.15/community +https://dl-cdn.alpinelinux.org/alpine/v3.17/main +https://dl-cdn.alpinelinux.org/alpine/v3.17/community -- 2.45.2