From d51c495478847c4412f8dbd8985d8d35f782ad79 Mon Sep 17 00:00:00 2001 From: Dominic Ricottone Date: Wed, 26 Oct 2022 17:35:14 -0500 Subject: [PATCH] Batch of updates dropped ======= py3-pgpy (?) py3-sshpubkeys py3-anyjson bumped ====== builds.sr.ht git.sr.ht lists.sr.ht (*) meta.sr.ht todo.sr.ht py3-ansi2html py3-asyncpg (*) py3-atpublic py3-furl py3-humanize py3-minio py3-mistletoe py3-pgpy (?) py3-pygments py3-sqlalchemy-utils py3-srht (!) downgraded ========== py3-billiard re-built/re-released ==================== py3-vine *=I don't actually build this package currently, I'm just tracking development. ?=Re-added, but not as a dependency to anything I build. Starting now, this package will be categorized with the *'ed packages. !=Upstream project also re-released as r1. Starting now, I will not blindly follow upstream's release number. --- Makefile | 50 ++++++------- pkgsrc/builds.sr.ht/APKBUILD | 10 +-- pkgsrc/git.sr.ht/APKBUILD | 9 +-- pkgsrc/lists.sr.ht/APKBUILD | 9 +-- pkgsrc/meta.sr.ht/APKBUILD | 10 ++- pkgsrc/py3-ansi2html/APKBUILD | 12 ++-- pkgsrc/py3-asyncpg/APKBUILD | 8 +-- pkgsrc/py3-atpublic/APKBUILD | 30 +++++--- pkgsrc/py3-atpublic/pyproject.toml | 97 +++++++++++++++++++++++++ pkgsrc/py3-billiard/APKBUILD | 6 +- pkgsrc/py3-furl/APKBUILD | 4 +- pkgsrc/py3-humanize/APKBUILD | 4 +- pkgsrc/py3-minio/APKBUILD | 4 +- pkgsrc/py3-mistletoe/APKBUILD | 4 +- pkgsrc/py3-pgpy/APKBUILD | 12 +++- pkgsrc/py3-pgpy/cryptography.patch | 101 +++++++++++++++++++++++++++ pkgsrc/py3-pygments/APKBUILD | 6 +- pkgsrc/py3-sqlalchemy-utils/APKBUILD | 5 +- pkgsrc/py3-srht/APKBUILD | 6 +- pkgsrc/py3-vine/APKBUILD | 2 +- pkgsrc/todo.sr.ht/APKBUILD | 9 +-- 21 files changed, 308 insertions(+), 90 deletions(-) create mode 100644 pkgsrc/py3-atpublic/pyproject.toml create mode 100644 pkgsrc/py3-pgpy/cryptography.patch diff --git a/Makefile b/Makefile index 40f23a9..f958773 100644 --- a/Makefile +++ b/Makefile @@ -6,16 +6,16 @@ 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.7-r0.apk -$(BUILDS_SR_HT): pkgsrc/builds.sr.ht/APKBUILD $(PY3_ANSI2HTML) $(PY3_CELERY) $(PY3_PGPY) $(PY3_SRHT) +BUILDS_SR_HT=pkg/aarch64/builds.sr.ht-0.82.10-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.78.22-r0.apk +GIT_SR_HT=pkg/aarch64/git.sr.ht-0.79.1-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.59.0-r0.apk -$(META_SR_HT): pkgsrc/meta.sr.ht/APKBUILD $(PY3_PGPY) $(PY3_SSHPUBKEYS) $(PY3_SRHT) $(PY3_ZXCVBN) +META_SR_HT=pkg/aarch64/meta.sr.ht-0.60.3-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 PY3_AIOSMTPD=pkg/aarch64/py3-aiosmtpd-1.4.2-r1.apk @@ -26,19 +26,19 @@ 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_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_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 -PY3_BILLIARD=pkg/aarch64/py3-billiard-4.0.0-r0.apk +PY3_BILLIARD=pkg/aarch64/py3-billiard-3.6.4.0-r0.apk $(PY3_BILLIARD): pkgsrc/py3-billiard/APKBUILD podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-billiard @@ -62,11 +62,11 @@ PY3_COLOUR=pkg/aarch64/py3-colour-0.1.5-r0.apk $(PY3_COLOUR): pkgsrc/py3-colour/APKBUILD podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-colour -PY3_FURL=pkg/aarch64/py3-furl-2.1.2-r0.apk +PY3_FURL=pkg/aarch64/py3-furl-2.1.3-r0.apk $(PY3_FURL): pkgsrc/py3-furl/APKBUILD $(PY3_ORDEREDMULTIDICT) podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-furl -PY3_HUMANIZE=pkg/aarch64/py3-humanize-4.0.0-r0.apk +PY3_HUMANIZE=pkg/aarch64/py3-humanize-4.4.0-r0.apk $(PY3_HUMANIZE): pkgsrc/py3-humanize/APKBUILD podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-humanize @@ -82,11 +82,11 @@ PY3_KOMBU=pkg/aarch64/py3-kombu-5.2.4-r0.apk $(PY3_KOMBU): pkgsrc/py3-kombu/APKBUILD podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-kombu -PY3_MINIO=pkg/aarch64/py3-minio-7.1.3-r0.apk +PY3_MINIO=pkg/aarch64/py3-minio-7.1.12-r0.apk $(PY3_MINIO): pkgsrc/py3-minio/APKBUILD podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-minio -PY3_MISTLETOE=pkg/aarch64/py3-mistletoe-0.8.2-r0.apk +PY3_MISTLETOE=pkg/aarch64/py3-mistletoe-0.9.0-r0.apk $(PY3_MISTLETOE): pkgsrc/py3-mistletoe/APKBUILD podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-mistletoe @@ -94,11 +94,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-r0.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_PGPY=pkg/aarch64/py3-pgpy-0.5.4-r1.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 @@ -106,19 +106,19 @@ 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 -PY3_SQLALCHEMY_UTILS=pkg/aarch64/py3-sqlalchemy-utils-0.38.2-r0.apk +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) 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_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.4-r0.apk +PY3_SRHT=pkg/aarch64/py3-srht-0.69.6-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 -PY3_VINE=pkg/aarch64/py3-vine-5.0.0-r0.apk +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 diff --git a/pkgsrc/builds.sr.ht/APKBUILD b/pkgsrc/builds.sr.ht/APKBUILD index 92828d6..e018bd8 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.7 +pkgver=0.82.10 pkgrel=0 pkgdesc="sr.ht build service" url="https://git.sr.ht/~sircmpwn/builds.sr.ht" @@ -11,7 +11,6 @@ depends=" py3-celery py3-gunicorn py3-lxml - py3-pgpy py3-redis py3-srht py3-yaml @@ -41,7 +40,8 @@ options="$options !check" build() { python3 setup.py build - make + pyver="$(python3 --version | cut -d. -f1-2 | cut -d' ' -f2-)" + make SRHT_PATH=/usr/lib/python$pyver/site-packages/srht } package() { @@ -87,8 +87,8 @@ _nginx() { } sha512sums=" -bfb61e6c2411be5b5196025f273bf2e4eb01b2a471f73b108d702e2e5afc54c3dab8b6fa0fbc607d573f5dd1154ec7df125fe94b53ed2ebdba3489bb94709416 builds.sr.ht-0.82.7.tar.gz -6a1be43d5e3caa98ebcfc9546cb46a9abf4691a6a772c24ba8872b54c3dca6c65f2615443be74d59f262d0be3b0972a326f659fd860f6fc73e48b08b07283f20 sr.ht-nginx-0.82.7.tar.gz +37f880fed115fa96d70d2eb929c143dfeb6378a1daba8afb1d243e9fbb1b3f8ef81298756728c0773b7ec51c4ad9c9145b8a22d423288cc3bcb8bba26947a22a builds.sr.ht-0.82.10.tar.gz +6a1be43d5e3caa98ebcfc9546cb46a9abf4691a6a772c24ba8872b54c3dca6c65f2615443be74d59f262d0be3b0972a326f659fd860f6fc73e48b08b07283f20 sr.ht-nginx-0.82.10.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 b22825c..2f0eeee 100644 --- a/pkgsrc/git.sr.ht/APKBUILD +++ b/pkgsrc/git.sr.ht/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Drew DeVault pkgname=git.sr.ht -pkgver=0.78.22 +pkgver=0.79.1 pkgrel=0 pkgdesc="sr.ht git service" url="https://git.sr.ht/~sircmpwn/git.sr.ht" @@ -32,7 +32,8 @@ install="$pkgname.post-install $pkgname.post-upgrade" build() { python3 setup.py build - make + pyver="$(python3 --version | cut -d. -f1-2 | cut -d' ' -f2-)" + make SRHT_PATH=/usr/lib/python$pyver/site-packages/srht } package() { @@ -68,8 +69,8 @@ _nginx() { } sha512sums=" -c047e9ff085b06a2d60ff3a1ed720490e5e2db78053b6421e6ae267db9657b8b02f73497e34e20e9acdfbd557331c3f6dcdee77b641e66738ccc42b27ec4d40e git.sr.ht-0.78.22.tar.gz -6a1be43d5e3caa98ebcfc9546cb46a9abf4691a6a772c24ba8872b54c3dca6c65f2615443be74d59f262d0be3b0972a326f659fd860f6fc73e48b08b07283f20 git.sr.ht-nginx-0.78.22.tar.gz +793b3e5aa45896213ec6529a711f5fe39db4e9be4c8019f1177dfd21b76d1eae9cc519ea4889266bbebe794316eee21b88a52357a79af3e6ce17839f35fc4741 git.sr.ht-0.79.1.tar.gz +6a1be43d5e3caa98ebcfc9546cb46a9abf4691a6a772c24ba8872b54c3dca6c65f2615443be74d59f262d0be3b0972a326f659fd860f6fc73e48b08b07283f20 sr.ht-nginx-0.79.1.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 02eb96b..1f883c9 100644 --- a/pkgsrc/lists.sr.ht/APKBUILD +++ b/pkgsrc/lists.sr.ht/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Drew DeVault pkgname=lists.sr.ht -pkgver=0.50.5 +pkgver=0.53.10 pkgrel=0 pkgdesc="sr.ht mailing list service" url="https://git.sr.ht/~sircmpwn/lists.sr.ht" @@ -39,7 +39,8 @@ install="$pkgname.post-install $pkgname.post-upgrade" build() { python3 setup.py build - make + pyver="$(python3 --version | cut -d. -f1-2 | cut -d' ' -f2-)" + make SRHT_PATH=/usr/lib/python$pyver/site-packages/srht } package() { @@ -78,8 +79,8 @@ _nginx() { } sha512sums=" -673da1fe9ed6047511b3f614225ba3708666142d3661f60c945858b6ce4e1e5d9011db558bbef8086e0da5964d85ee8c6ebb21d1cd70c5bd5a540ad4fa254599 lists.sr.ht-0.50.5.tar.gz -917bbc9a493f6aa756af3f3597f9edf2e25227efe30f6ab635f99a7d9f4ecd6e9f36a7f2b9b40cc95b6e584dd62e1a0badb46e4ff9d3c3d5ce959455b15a95b6 sr.ht-nginx-0.50.5.tar.gz +f3953f33eae319a0f28d0ee52a3a928bfbe0a7f4b4e6a2293f3ca02fe5a6a87aa78c12c4c0baf18b3c3fc211b93650364ec5b02b7a9f2a74e78d10172d9be7a3 lists.sr.ht-0.53.10.tar.gz +6a1be43d5e3caa98ebcfc9546cb46a9abf4691a6a772c24ba8872b54c3dca6c65f2615443be74d59f262d0be3b0972a326f659fd860f6fc73e48b08b07283f20 sr.ht-nginx-0.53.10.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 8b13c6c..a55ce28 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.59.0 +pkgver=0.60.3 pkgrel=0 pkgdesc="sr.ht account service" url="https://git.sr.ht/~sircmpwn/meta.sr.ht" @@ -10,11 +10,9 @@ depends=" py3-bcrypt py3-dnspython py3-gunicorn - py3-pgpy py3-qrcode py3-redis py3-srht - py3-sshpubkeys py3-zxcvbn redis " @@ -75,10 +73,10 @@ _nginx() { } sha512sums=" -6f1ebee27a1d6b44bbf0d032638e7af3a8d950b232a464e731fb62c7f785a19b7685e4154428693bbda9706fdbe01c78b1ff54d5fbfa6593e16851b945f0f7b4 meta.sr.ht-0.59.0.tar.gz -6a1be43d5e3caa98ebcfc9546cb46a9abf4691a6a772c24ba8872b54c3dca6c65f2615443be74d59f262d0be3b0972a326f659fd860f6fc73e48b08b07283f20 sr.ht-nginx-0.59.0.tar.gz +e343f1ea9ad17064bc94cbd6b6eae6cc238ae383f499b8138c2b5e5527a473bc738ab57c1e902422d5cf70609e93f4ef87ac2381a4234cd194d79a8018b039bc meta.sr.ht-0.60.3.tar.gz +6a1be43d5e3caa98ebcfc9546cb46a9abf4691a6a772c24ba8872b54c3dca6c65f2615443be74d59f262d0be3b0972a326f659fd860f6fc73e48b08b07283f20 sr.ht-nginx-0.60.3.tar.gz f84bb7c0532a27b1a2425726a79b329d4782eb459571c289d793beabfe9334ffbca53bcb19a699e1f0a7d696fe57cf8c0692f72576351d9cf4b9f8f325222eaf meta.sr.ht.initd -01ef7929b8a4cb52eed0909b665dade805b6973ed6d30fc8e1aa7b72471a59951495cf7669f7bf80ffae8d681002be7d548bcc2b04365c3295b1c3794b2b9759 meta.sr.ht.confd +fbff1755c572da66c351004690530d875c882a65576cc641399e07dfb39e818105be1370f6ba28c6e2774e3868fe3aa3aa17dec51d14547c8db7f1aa685b0ac8 meta.sr.ht.confd 8377026251395fa74980a6733a6715c5dcfa6b893ad846d556479d3170605ba7cbe5dcc1c482f90a20e0b6332732cba9480d198dfcc9d73d2d6e338e5276bc65 meta.sr.ht-api.initd 36550c28b15fbdf32051591a9231035852916ae701521afa00b7da5959ec08c6eca74714ecea3b8d5f35d41c388aadd61ddfeee9a270cefdadf9be32b0ced145 meta.sr.ht-api.confd 26db23b2302c5a3a3dcb6068f0bc57d932a24ff8bcf288b8d8e1ca2385ee05603eded26e19b73c40adc96b8a0d2fad64c4f28526d69bcbc61981df8acc3efb11 meta.sr.ht-webhooks.initd diff --git a/pkgsrc/py3-ansi2html/APKBUILD b/pkgsrc/py3-ansi2html/APKBUILD index 12036cc..273c9ba 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-setuptools-scm-git-archive py3-wheel py3-installer py3-build" checkdepends="py3-pytest py3-mock py3-nose" replaces="py-ansi2html py2-ansi2html" _pypiprefix="${_pyname%${_pyname#?}}" @@ -18,7 +18,8 @@ builddir="$srcdir"/$_pyname-$pkgver options="!check" # Upstream tests are stupid build() { - python3 -m pyproject2setuppy.main build + export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver + python3 -m build --no-isolation --wheel . } check() { @@ -26,9 +27,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 f3aed21..d6cab75 100644 --- a/pkgsrc/py3-asyncpg/APKBUILD +++ b/pkgsrc/py3-asyncpg/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: Drew DeVault pkgname=py3-asyncpg _pyname=asyncpg -pkgver=0.25.0 -pkgrel=1 +pkgver=0.26.0 +pkgrel=0 pkgdesc="An asyncio PostgreSQL driver" url="https://github.com/MagicStack/asyncpg" arch="all" license="Apache-2.0" -makedepends="python3-dev py3-setuptools cython cython-dev" +makedepends="python3-dev py3-setuptools cython" checkdepends="postgresql postgresql-contrib postgresql-dev" _pypiprefix="${_pyname%${_pyname#?}}" source="https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz" @@ -28,5 +28,5 @@ package() { } sha512sums=" -7afa5ae42c0d5cab93bb1c3266bad11ce2e7c271d7ffd2c5d92e373fd8e06be89e4b18e8fd3ffd7e750e913944630f1ae6c947e20faa63f99ded7d867ad6cd80 asyncpg-0.25.0.tar.gz +ef92316fd430a1819aa8170abd67ecfc1cf29c42cb6dc06cf5047cdd71d4abf441c8b86bacafaaa8c0c0fd7c66daa275e9ed68b00e5166bb27929f25cab1dcbd asyncpg-0.26.0.tar.gz " diff --git a/pkgsrc/py3-atpublic/APKBUILD b/pkgsrc/py3-atpublic/APKBUILD index 64604c4..255f135 100644 --- a/pkgsrc/py3-atpublic/APKBUILD +++ b/pkgsrc/py3-atpublic/APKBUILD @@ -2,31 +2,43 @@ # 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-billiard/APKBUILD b/pkgsrc/py3-billiard/APKBUILD index 2ef8212..33d55cd 100644 --- a/pkgsrc/py3-billiard/APKBUILD +++ b/pkgsrc/py3-billiard/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Drew DeVault pkgname=py3-billiard _pyname=billiard -pkgver=4.0.0 +pkgver=3.6.4.0 pkgrel=0 pkgdesc="Python multiprocessing fork with improvements and bugfixes." url="http://pypi.python.org/pypi/billiard" @@ -26,6 +26,4 @@ package() { python3 setup.py install --root="$pkgdir" --optimize=1 } -sha512sums=" -af208a9bb38b35ecc5f36cf284da85fcab6954bbd213635cc7b82d699ac35bc5343f33b93e603ec358b70f138b432bf7e9f940c1290570ebf02b2227bc46739a billiard-4.0.0.tar.gz -" +sha512sums="9f2a44024e45c4e7667472a0a3ade7caae755ec7c163929433f818e4b87165218b9cc9545bdee2254e7159c206e525306e383d38906b00fd5428bd1616c39b8f billiard-3.6.4.0.tar.gz" diff --git a/pkgsrc/py3-furl/APKBUILD b/pkgsrc/py3-furl/APKBUILD index 75f9bf1..8fc643c 100644 --- a/pkgsrc/py3-furl/APKBUILD +++ b/pkgsrc/py3-furl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Drew DeVault pkgname=py3-furl _pyname=furl -pkgver=2.1.2 +pkgver=2.1.3 pkgrel=0 pkgdesc="Python library that makes manipulating URLs simple." url="https://github.com/gruns/furl" @@ -26,5 +26,5 @@ package() { } sha512sums=" -d788344d129b511d00debe2cd4ee7c555453a0bf5e81444cededf48fe3b51fa2b45cdead6ddffb42837cb8684d085a3b5773b65a82cef87f6b16f60f1fcbc778 furl-2.1.2.tar.gz +ce7455bd1a352243efd9715e80e9f9979631cc058927edcd8c52ccb85d27fd8f32079611bb29c487d2add2d1d941d56e4db75520339dc371b1539811ccefda02 furl-2.1.3.tar.gz " diff --git a/pkgsrc/py3-humanize/APKBUILD b/pkgsrc/py3-humanize/APKBUILD index 5de8889..ec48813 100644 --- a/pkgsrc/py3-humanize/APKBUILD +++ b/pkgsrc/py3-humanize/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Drew DeVault pkgname=py3-humanize _pyname=humanize -pkgver=4.0.0 +pkgver=4.4.0 pkgrel=0 pkgdesc="Humanize is a modest package contains various common humanization utilities" url="https://github.com/jmoiron/humanize" @@ -26,5 +26,5 @@ package() { } sha512sums=" -71c528101b62c883de6474d3c31e97f7f54099c3389f7a88a328ef24b40f7a5667db879badd6154d76ce9bb1390a45404e177c50c7c26064c63b654936ba0514 humanize-4.0.0.tar.gz +bbbd386d9af82d9db0f2edc4653928654203c4239419232abfc15c51ccd865b355366549c46651e1291d4222ca8b2a297ffc0fce3cc32be4ae2f904ae308a8e4 humanize-4.4.0.tar.gz " diff --git a/pkgsrc/py3-minio/APKBUILD b/pkgsrc/py3-minio/APKBUILD index a2bf0b9..85a9531 100644 --- a/pkgsrc/py3-minio/APKBUILD +++ b/pkgsrc/py3-minio/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Drew DeVault pkgname=py3-minio -pkgver=7.1.3 +pkgver=7.1.12 pkgrel=0 pkgdesc="MinIO Python Library for Amazon S3 Compatible Cloud Storage" url="https://pypi.org/project/minio/" @@ -26,5 +26,5 @@ package() { } sha512sums=" -2e94396ad53013b48dd5595b259d3a31e4d7420d3c30b2f168521013dbc2fd9c9530db434ac78d55804ca842cec6ed464349a8f4356793f5321fc1ce1ad10c71 py3-minio-7.1.3.tar.gz +a295c1988bce1f4e2dad735f5ed69ed3e49cc4be5d9b001908e68945ae965a85a4c683efa44400a5160098607c4ff21d740700b4480960873a051fe45cff29f1 py3-minio-7.1.12.tar.gz " diff --git a/pkgsrc/py3-mistletoe/APKBUILD b/pkgsrc/py3-mistletoe/APKBUILD index dbaaf58..28cd09b 100644 --- a/pkgsrc/py3-mistletoe/APKBUILD +++ b/pkgsrc/py3-mistletoe/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Drew DeVault pkgname=py3-mistletoe _pyname=mistletoe -pkgver=0.8.2 +pkgver=0.9.0 pkgrel=0 pkgdesc="A fast, extensible Markdown parser in pure Python." url="https://pypi.org/project/mistletoe/" @@ -26,5 +26,5 @@ package() { } sha512sums=" -523221e07ee0dd375e064140512a9d0c3782591efe3947e1a31d8e4b7fa1c920f816a1318c2db7a20693807ee4c163a0358854f6e7181625911d1eb4f3a99461 mistletoe-0.8.2.tar.gz +ec0f6fc23d81cb2725cf6a8bb8024a3a7c055d1dd733b1dbc10a9fbd4c1431209daffbb2f44591cac9a948ed944496dd8d4175a106e7e9ed4656594e33c23ada mistletoe-0.9.0.tar.gz " diff --git a/pkgsrc/py3-pgpy/APKBUILD b/pkgsrc/py3-pgpy/APKBUILD index 1c18691..bc735ca 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=0 +pkgrel=1 pkgdesc="Pretty Good Privacy for Python - a pure Python OpenPGP implementation" url="https://github.com/SecurityInnovation/PGPy" arch="noarch" @@ -10,7 +10,10 @@ license="BSD" depends="py3-cryptography py3-six py3-asn1" makedepends="py3-setuptools py3-wheel" _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 + cryptography.patch +" builddir="$srcdir/$_pyname-$pkgver" build() { @@ -25,4 +28,7 @@ package() { python3 setup.py install --root="$pkgdir" --optimize=1 } -sha512sums="bf19a72d5113cb88e6538d515a06a115a7f329ee1331553100140848226773db0a539a0cbe480f04b0f26cd587fc0c3c8e5fe392e2421d6e6210e86bd0ab70c1 PGPy-0.5.4.tar.gz" +sha512sums=" +bf19a72d5113cb88e6538d515a06a115a7f329ee1331553100140848226773db0a539a0cbe480f04b0f26cd587fc0c3c8e5fe392e2421d6e6210e86bd0ab70c1 PGPy-0.5.4.tar.gz +2c2db2238d9f171c795fc1e2d2ea96e92313cb2df045fbbd38f2d2642eae96e323637fbaa2528b1f9160138186c07dbfd8cfca7a179848dd5c39b3d63f20f6a4 cryptography.patch +" diff --git a/pkgsrc/py3-pgpy/cryptography.patch b/pkgsrc/py3-pgpy/cryptography.patch new file mode 100644 index 0000000..f2c617e --- /dev/null +++ b/pkgsrc/py3-pgpy/cryptography.patch @@ -0,0 +1,101 @@ +From d84597eb8417a482433ff51dc6b13060d4b2e686 Mon Sep 17 00:00:00 2001 +From: Robert Hofer <1058012+hofrob@users.noreply.github.com> +Date: Wed, 7 Sep 2022 22:26:17 +0200 +Subject: [PATCH] fix removed cryptography.utils.register_interface + +--- + pgpy/_curves.py | 73 +++++++++++++++++++++++++++++++++++-------------- + 1 file changed, 53 insertions(+), 20 deletions(-) + +diff --git a/pgpy/_curves.py b/pgpy/_curves.py +index ce6a9f01..2c6ae468 100644 +--- a/pgpy/_curves.py ++++ b/pgpy/_curves.py +@@ -34,34 +34,67 @@ def _openssl_get_supported_curves(): + return curves + + +-@utils.register_interface(ec.EllipticCurve) +-class BrainpoolP256R1(object): +- name = 'brainpoolP256r1' +- key_size = 256 ++def use_legacy_cryptography_decorator(): ++ """ ++ The decorator utils.register_interface was removed in version 38.0.0. Keep using it ++ if the decorator exists, inherit from `ec.EllipticCurve` otherwise. ++ """ ++ return hasattr(utils, "register_interface") and callable(utils.register_interface) + + +-@utils.register_interface(ec.EllipticCurve) +-class BrainpoolP384R1(object): +- name = 'brainpoolP384r1' +- key_size = 384 ++if use_legacy_cryptography_decorator(): ++ @utils.register_interface(ec.EllipticCurve) ++ class BrainpoolP256R1(object): ++ name = 'brainpoolP256r1' ++ key_size = 256 + + +-@utils.register_interface(ec.EllipticCurve) +-class BrainpoolP512R1(object): +- name = 'brainpoolP512r1' +- key_size = 512 ++ @utils.register_interface(ec.EllipticCurve) ++ class BrainpoolP384R1(object): ++ name = 'brainpoolP384r1' ++ key_size = 384 + + +-@utils.register_interface(ec.EllipticCurve) +-class X25519(object): +- name = 'X25519' +- key_size = 256 ++ @utils.register_interface(ec.EllipticCurve) ++ class BrainpoolP512R1(object): ++ name = 'brainpoolP512r1' ++ key_size = 512 + + +-@utils.register_interface(ec.EllipticCurve) +-class Ed25519(object): +- name = 'ed25519' +- key_size = 256 ++ @utils.register_interface(ec.EllipticCurve) ++ class X25519(object): ++ name = 'X25519' ++ key_size = 256 ++ ++ ++ @utils.register_interface(ec.EllipticCurve) ++ class Ed25519(object): ++ name = 'ed25519' ++ key_size = 256 ++else: ++ class BrainpoolP256R1(ec.EllipticCurve): ++ name = 'brainpoolP256r1' ++ key_size = 256 ++ ++ ++ class BrainpoolP384R1(ec.EllipticCurve): ++ name = 'brainpoolP384r1' ++ key_size = 384 ++ ++ ++ class BrainpoolP512R1(ec.EllipticCurve): ++ name = 'brainpoolP512r1' ++ key_size = 512 ++ ++ ++ class X25519(ec.EllipticCurve): ++ name = 'X25519' ++ key_size = 256 ++ ++ ++ class Ed25519(ec.EllipticCurve): ++ name = 'ed25519' ++ key_size = 256 + + + # add these curves to the _CURVE_TYPES list 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-sqlalchemy-utils/APKBUILD b/pkgsrc/py3-sqlalchemy-utils/APKBUILD index 9428a90..f114f8d 100644 --- a/pkgsrc/py3-sqlalchemy-utils/APKBUILD +++ b/pkgsrc/py3-sqlalchemy-utils/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Drew DeVault pkgname=py3-sqlalchemy-utils _pyname=SQLAlchemy-Utils -pkgver=0.38.2 +pkgver=0.38.3 pkgrel=0 pkgdesc="Various utility functions, new data types and helpers for SQLAlchemy." url="https://github.com/kvesteri/sqlalchemy-utils" @@ -9,7 +9,6 @@ arch="noarch" license="3-Clause-BSD" depends=" python3 - py3-anyjson py3-babel py3-arrow py3-intervals @@ -38,5 +37,5 @@ package() { } sha512sums=" -2dc98549501e3b8fc3ad77aa14f31940e9aa73999d699bb1a2d4be424eb3bff38a3fc8cacf8774e42f816c1b31cc1ccc4e9955cf1dae2fd3a2b9e4e0f0b18cc7 SQLAlchemy-Utils-0.38.2.tar.gz +0aa38f7d29cf7756fd0d3c735f721ed0c5889a6e8b0364f26e74e29404115e0a141beab8587db4d56a2e4a4bd1352c24d5922d7e379e64cfa196161c6ff18825 SQLAlchemy-Utils-0.38.3.tar.gz " diff --git a/pkgsrc/py3-srht/APKBUILD b/pkgsrc/py3-srht/APKBUILD index 9fc0828..a4be999 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.4 +pkgver=0.69.6 pkgrel=0 pkgdesc="sr.ht shared code" url="https://git.sr.ht/~sircmpwn/core.sr.ht" @@ -41,6 +41,8 @@ options="$options !check" prepare() { default_prepare cd "$builddir" + pyver="$(python3 --version | cut -d. -f1-2 | cut -d' ' -f2-)" + sed -e "s/python3.8/python$pyver/" -i srht/Makefile git clone --depth=1 -b v4.1.1 \ https://github.com/twbs/bootstrap srht/scss/bootstrap } @@ -58,5 +60,5 @@ package() { } sha512sums=" -a76bd858fb96f20d9a2036cb48e19fc9f2519d82e87955cb6bb301693cfbc82fd6a5fd99c36930419813e14e7c5ab2a83e983c35145c8d8c22a4774a03636b17 core.sr.ht-0.69.4.tar.gz +6dd60e92e09a087a1b1c7d7d4f9e5d1e006f36f45dc4dffad17f3db99f837cdaee61e4be408954572d9e58c16878dd4727857e29b4c9131c7b3a39ae2201ca51 core.sr.ht-0.69.6.tar.gz " diff --git a/pkgsrc/py3-vine/APKBUILD b/pkgsrc/py3-vine/APKBUILD index 3a542b7..56879c6 100644 --- a/pkgsrc/py3-vine/APKBUILD +++ b/pkgsrc/py3-vine/APKBUILD @@ -2,7 +2,7 @@ pkgname=py3-vine _pyname=vine pkgver=5.0.0 -pkgrel=0 +pkgrel=1 pkgdesc="Promises library for Python" url="https://github.com/celery/vine" arch="noarch" diff --git a/pkgsrc/todo.sr.ht/APKBUILD b/pkgsrc/todo.sr.ht/APKBUILD index 7888f97..1dbc037 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.9 +pkgver=0.72.12 pkgrel=0 pkgdesc="sr.ht ticket tracking service" url="https://git.sr.ht/~sircmpwn/todo.sr.ht" @@ -32,7 +32,8 @@ install="$pkgname.post-install $pkgname.post-upgrade" build() { python3 setup.py build - make + pyver="$(python3 --version | cut -d. -f1-2 | cut -d' ' -f2-)" + make SRHT_PATH=/usr/lib/python$pyver/site-packages/srht } package() { @@ -68,8 +69,8 @@ _nginx() { } sha512sums=" -6509b7e271ad13b3836f2c9c9ed55c8f133fd2cac6345631d79223a48ffd50f2053bdbbe2020bb583f693cd423900fe4bb30a56a28bade1f4e54b1593ad194c0 todo.sr.ht-0.72.9.tar.gz -6a1be43d5e3caa98ebcfc9546cb46a9abf4691a6a772c24ba8872b54c3dca6c65f2615443be74d59f262d0be3b0972a326f659fd860f6fc73e48b08b07283f20 sr.ht-nginx-0.72.9.tar.gz +76a679d8e817f841c01ddd5f82f9c9bca3a6957f70422844b1166f5dba6550bb1d8d284ca92e7e3415b88fab8a6866876ada08272b84583f7149d0c3301e0045 todo.sr.ht-0.72.12.tar.gz +6a1be43d5e3caa98ebcfc9546cb46a9abf4691a6a772c24ba8872b54c3dca6c65f2615443be74d59f262d0be3b0972a326f659fd860f6fc73e48b08b07283f20 sr.ht-nginx-0.72.12.tar.gz 946a15e8a723dea178edc451b461f756761a9429fd434820df1955225a9fe73c7aefb838ec32bb9f3a3f7b80a5921641540cdf5fcde3fff272420ea1abe3970e todo.sr.ht.initd a71116bd25e0c6e8e3e14e4dadb653e6360e2b468bd415439559b56ffc18724efa9bcb593181d8f0fe0cbccf96f3196a452659bb4375e687faf0b09a48ef5557 todo.sr.ht.confd c4ac342b5fa506c1323d9c55f36b800e16cb9afdecc32f94bf7261c8fa2710db839b84137d24f3e43ac28e036cf21f63c381a650661e722e416c61a6cf44c938 todo.sr.ht-lmtp.initd -- 2.45.2