From 5227293f32cf5072200e1d4aa78c9a434f272472 Mon Sep 17 00:00:00 2001 From: Dominic Ricottone Date: Thu, 28 Mar 2024 15:43:42 -0500 Subject: [PATCH] Alpine 3.19 Updates to many packages, including several which can be dropped from vendoring. Some updates top the Makefile recipes. Many tips for future me in the README. --- Makefile | 16 +-- README.md | 66 ++++++++++++ src/builds.sr.ht/APKBUILD | 2 +- src/git.sr.ht/APKBUILD | 8 +- src/git.sr.ht/git.sr.ht.gunicorn.conf.py | 7 ++ src/lists.sr.ht/APKBUILD | 8 +- src/lists.sr.ht/lists.sr.ht.gunicorn.conf.py | 7 ++ src/meta.sr.ht/APKBUILD | 12 +-- src/meta.sr.ht/meta.sr.ht.gunicorn.conf.py | 7 ++ src/py3-aiosmtpd/APKBUILD | 6 +- src/py3-amqp/APKBUILD | 30 ------ src/py3-amqp/LICENSE.txt | 26 ----- src/py3-ansi2html/APKBUILD | 4 +- src/py3-asyncpg/APKBUILD | 32 ------ src/py3-asyncpg/LICENSE.txt | 26 ----- src/py3-atpublic/APKBUILD | 9 +- src/py3-atpublic/pyproject.toml | 2 +- src/py3-billiard/APKBUILD | 43 +++++--- src/py3-case/APKBUILD | 31 ------ src/py3-case/LICENSE.txt | 26 ----- src/py3-celery/7446.patch | 34 ------- src/py3-celery/APKBUILD | 6 +- src/py3-click-didyoumean/APKBUILD | 28 ----- src/py3-click-didyoumean/LICENSE.txt | 26 ----- src/py3-click-repl/APKBUILD | 30 ------ src/py3-click-repl/LICENSE.txt | 26 ----- src/py3-colour/APKBUILD | 42 -------- src/py3-colour/LICENSE.txt | 26 ----- src/py3-colour/setup.cfg | 40 -------- src/py3-colour/setup.py | 57 ----------- src/py3-humanize/APKBUILD | 30 ------ src/py3-humanize/LICENSE.txt | 26 ----- src/py3-kombu/APKBUILD | 32 ------ src/py3-kombu/LICENSE.txt | 26 ----- src/py3-minio/APKBUILD | 13 ++- src/py3-mistletoe/APKBUILD | 4 +- src/py3-pgpy/APKBUILD | 34 ------- src/py3-pgpy/LICENSE.txt | 26 ----- src/py3-pgpy/cryptography.patch | 101 ------------------- src/py3-scmsrht/APKBUILD | 4 +- src/py3-sqlalchemy-utils/APKBUILD | 4 +- src/py3-srht/APKBUILD | 7 +- src/py3-vine/APKBUILD | 32 ------ src/py3-vine/LICENSE.txt | 26 ----- src/py3-zxcvbn/APKBUILD | 30 ------ src/py3-zxcvbn/LICENSE.txt | 26 ----- src/todo.sr.ht/APKBUILD | 10 +- src/todo.sr.ht/todo.sr.ht-webhooks.initd | 2 +- src/todo.sr.ht/todo.sr.ht.gunicorn.conf.py | 7 ++ 49 files changed, 184 insertions(+), 939 deletions(-) delete mode 100644 src/py3-amqp/APKBUILD delete mode 100644 src/py3-amqp/LICENSE.txt delete mode 100644 src/py3-asyncpg/APKBUILD delete mode 100644 src/py3-asyncpg/LICENSE.txt delete mode 100644 src/py3-case/APKBUILD delete mode 100644 src/py3-case/LICENSE.txt delete mode 100644 src/py3-celery/7446.patch delete mode 100644 src/py3-click-didyoumean/APKBUILD delete mode 100644 src/py3-click-didyoumean/LICENSE.txt delete mode 100644 src/py3-click-repl/APKBUILD delete mode 100644 src/py3-click-repl/LICENSE.txt delete mode 100644 src/py3-colour/APKBUILD delete mode 100644 src/py3-colour/LICENSE.txt delete mode 100644 src/py3-colour/setup.cfg delete mode 100644 src/py3-colour/setup.py delete mode 100644 src/py3-humanize/APKBUILD delete mode 100644 src/py3-humanize/LICENSE.txt delete mode 100644 src/py3-kombu/APKBUILD delete mode 100644 src/py3-kombu/LICENSE.txt delete mode 100644 src/py3-pgpy/APKBUILD delete mode 100644 src/py3-pgpy/LICENSE.txt delete mode 100644 src/py3-pgpy/cryptography.patch delete mode 100644 src/py3-vine/APKBUILD delete mode 100644 src/py3-vine/LICENSE.txt delete mode 100644 src/py3-zxcvbn/APKBUILD delete mode 100644 src/py3-zxcvbn/LICENSE.txt diff --git a/Makefile b/Makefile index 8ecd1da..c086315 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -REPO=/hdd/media/pkg/alpine/v3.17 +REPO=admin-arch4:/tank/data/pkg/alpine/v3.19 ls: simple-builder -repository $(REPO)/x86_64 @@ -8,20 +8,20 @@ clean: rm -rf pkg pkg: - mkdir -p pkg/src/x86_64 - rsync --recursive --update --times --verbose $(REPO)/x86_64 ./pkg/src/ - mkdir -p pkg/src/aarch64 - rsync --recursive --update --times --verbose $(REPO)/aarch64 ./pkg/src/ + mkdir -p pkg/x86_64 + rsync --recursive --update --times --verbose $(REPO)/x86_64 ./src/ + mkdir -p pkg/aarch64 + rsync --recursive --update --times --verbose $(REPO)/aarch64 ./src/ PWD=$(dir $(abspath $(lastword $(MAKEFILE_LIST)))) shell: docker run --rm --interactive --tty --entrypoint sh \ --mount type=bind,src=$(PWD)src,dst=/home/builder/src \ --mount type=bind,src=$(PWD)pkg,dst=/home/builder/packages/src \ - $(MOUNTS) apkbuilder + $(MOUNTS) registry.intra.dominic-ricottone.com/apkbuilder:latest build: pkg - simple-builder -repository $(REPO)/x86_64 -build - simple-builder -repository $(REPO)/aarch64 -build + DOCKER_API_VERSION=1.44 simple-builder -repository $(REPO)/x86_64 -build + DOCKER_API_VERSION=1.44 simple-builder -repository $(REPO)/aarch64 -build .PHONY: clean ls shell build diff --git a/README.md b/README.md index ceaf9ec..5790b26 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,72 @@ On success, built packages are automatically pushed to the repository. Address failures as needed. +## Tips + +Sometimes image resolution is a bit weird. + +``` +panic: Error response from daemon: No such image: [...]/apkbuilder:latest + +panic: Error response from daemon: image with reference [...]/apkbuilder:latest was found but does not match the specified platform: wanted linux/arm64, actual: linux/amd64 +``` + +Try re-logging into the registry. + +``` +docker login REGISTRYURL +``` + +--- + +A true build failure will look like: + +``` +panic: Build failed + +goroutine 1 [running]: +main.main() + [...]/main.go:160 +0x19f +``` + +Try running manually. + +``` +$ make shell +~ $ /home/builder/build.sh PACKAGENAME +``` + +--- + +If build failures are propogating from setuid, +the fundamental issue is with `binfmt` configuration on your local machine. + +``` +abuild-apk: setuid(0) failed: Operation not permitted +``` + +Try: + +``` +docker run --rm --privileged multiarch/qemu-user-static --reset -p yes --credential yes` +``` + +--- + +If the Docker daemon has an incompatible version to the builder client, +an error message will be propogated. + +``` +panic: Error response from daemon: client version 1.45 is too new. Maximum supported API version is 1.44 +``` + +Set an environment variable to use a compatible API version. + +``` +export DOCKER_API_VERSION=1.44 +``` + + ## License I share the contents of this repository under the BSD 3 clause license, except diff --git a/src/builds.sr.ht/APKBUILD b/src/builds.sr.ht/APKBUILD index ba6d128..1eb39d0 100755 --- a/src/builds.sr.ht/APKBUILD +++ b/src/builds.sr.ht/APKBUILD @@ -88,7 +88,7 @@ _nginx() { sha512sums=" 8c17db53a93e79551370c60379f70a72870b7edb34f93df971255d2f42f15dcf0e88cc42149fbbdaae6553987eaf3ada02f9608b9397e2d9afb5202badd66be8 builds.sr.ht-0.85.6.tar.gz -43f867c307a3c4104938522d71a6f128130af3c969598fe52ef9caf9b4788b34448aa6c25ba16403706d9ff83cf313d9b5170c74d30d011628121efdfa3bf626 sr.ht-nginx-0.85.6.tar.gz +ccd803d2d87c86a035c36d88f538828cfec2da8f6bd1bd15f3ec0f1fdb6fd006f4f5145700e19eab23fcc0de1ac30c47062698214e3842209c42ea1d4f000377 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/src/git.sr.ht/APKBUILD b/src/git.sr.ht/APKBUILD index 5040084..ed91e1b 100644 --- a/src/git.sr.ht/APKBUILD +++ b/src/git.sr.ht/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Drew DeVault pkgname=git.sr.ht -pkgver=0.83.5 +pkgver=0.85.8 pkgrel=0 pkgdesc="sr.ht git service" url="https://git.sr.ht/~sircmpwn/git.sr.ht" @@ -69,13 +69,13 @@ _nginx() { } sha512sums=" -898ef22c923b08114820aad9211ee6370d413c484578ec42901fdeca42dea2d61c4a77455f33fb8ae46ee31348d341e84d9e2f4c9a4f2fc5c583bba6b154a0c9 git.sr.ht-0.83.5.tar.gz -43f867c307a3c4104938522d71a6f128130af3c969598fe52ef9caf9b4788b34448aa6c25ba16403706d9ff83cf313d9b5170c74d30d011628121efdfa3bf626 sr.ht-nginx-0.83.5.tar.gz +1a91f88e31bc9bee6b653ac2ab9ce41f7bf69c4ce571acecef92a654218b53aa80d28e262b86f8fc13025e2e3ccb68481b72b80531887d0cc6f457ff0f13c106 git.sr.ht-0.85.8.tar.gz +ccd803d2d87c86a035c36d88f538828cfec2da8f6bd1bd15f3ec0f1fdb6fd006f4f5145700e19eab23fcc0de1ac30c47062698214e3842209c42ea1d4f000377 sr.ht-nginx-0.85.8.tar.gz bab6312b5a6d1bd9808cb6eae2b33f1fc4f544ac286ce9a67f4c07fc8d4679dc81d93f3d1ec7f8adad3dedead9203b5d10ab63aff478fb11780790e7a01a232a git.sr.ht.initd 7462f15928aa24b10e63041b0021aa5a69fa92d071f497d6b1dc353dac3bff30818cb560c6011effbd619d450e8b8c6f8f3ab07a1df9714ea79b00e4d12dcf44 git.sr.ht.confd 370a9f710704d7dfe88632f0ae2b7d2b406621322cab1f87f4f4c3984c741fba616f9c2a806d83e79250dc58aba89161a2db8ca424794dbd2cacbffb6e1a9adb git.sr.ht-api.initd 938a8aefdea3e4c6a9b15ac1c10d789282443c5b6cd1fee662d86af261cf69d8b67435f3bcececcd64544bd147addbd2792fcdbf67b9a36975e0e5e00f337719 git.sr.ht-api.confd 4038c7375d50ab393d076d31d776e82a2fcd54d6edcd55eb864fcc8d7254646799b4ee05a2e1f75f3a79e660e802a0fa05d9e34c16870aebe33dbf8191ed386a git.sr.ht-webhooks.initd acd385323da772e1163b690eafca3b3a59e13bf236bb279c08a383a9ab2b356b4f1b7dce18f235882ba79c8ac35a6fa7594aad260962b38f7df70886e4fcace5 git.sr.ht-webhooks.confd -21f39ea0981d7773eb512e5ba234022364d0f7ee9b6ca897ce4c51e3b127eb2d9a7a5fbcaa06d14f20b2df2439421d7261f200e3f4f13b45a91e78ba77bc363c git.sr.ht.gunicorn.conf.py +39c12898976aa3b5896ed8287216cf4f2ed4998722891e1b5e507070df86f9111286396eb82cc01b3faaf1016b51db47d077fc4b1b7d72e3782f936c89fb3e37 git.sr.ht.gunicorn.conf.py " diff --git a/src/git.sr.ht/git.sr.ht.gunicorn.conf.py b/src/git.sr.ht/git.sr.ht.gunicorn.conf.py index aa3e7ae..ce18c2c 100644 --- a/src/git.sr.ht/git.sr.ht.gunicorn.conf.py +++ b/src/git.sr.ht/git.sr.ht.gunicorn.conf.py @@ -1,5 +1,12 @@ from prometheus_client import multiprocess +import traceback +import io +def worker_abort(worker): + debug_info = io.StringIO() + debug_info.write("Traceback at time of timeout:\n") + traceback.print_stack(file=debug_info) + worker.log.critical(debug_info.getvalue()) def child_exit(server, worker): multiprocess.mark_process_dead(worker.pid) diff --git a/src/lists.sr.ht/APKBUILD b/src/lists.sr.ht/APKBUILD index 33c6436..2a4f762 100644 --- a/src/lists.sr.ht/APKBUILD +++ b/src/lists.sr.ht/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Drew DeVault pkgname=lists.sr.ht -pkgver=0.57.4 +pkgver=0.57.15 pkgrel=0 pkgdesc="sr.ht mailing list service" url="https://git.sr.ht/~sircmpwn/lists.sr.ht" @@ -78,8 +78,8 @@ _nginx() { } sha512sums=" -02244a3d1f1a90f2ee16a8c2a9108eb8bae0aaa888de3bdfc3ebf860827679d853b6c424ae1edf2aa875a42f5884402790b8183b0bbc514b3d433f21386343d4 lists.sr.ht-0.57.4.tar.gz -43f867c307a3c4104938522d71a6f128130af3c969598fe52ef9caf9b4788b34448aa6c25ba16403706d9ff83cf313d9b5170c74d30d011628121efdfa3bf626 sr.ht-nginx-0.57.4.tar.gz +b6b8c973c416a6fc06ce6f203dc96fe8daf9b9ce114c08d96d3abf965be322ec30be461d38ea00fc7404f1d3cfc62f73c7fc2e334c0d000366a719a99b32889c lists.sr.ht-0.57.15.tar.gz +ccd803d2d87c86a035c36d88f538828cfec2da8f6bd1bd15f3ec0f1fdb6fd006f4f5145700e19eab23fcc0de1ac30c47062698214e3842209c42ea1d4f000377 sr.ht-nginx-0.57.15.tar.gz bc34e789d752eb35f534511eef7ee70f257db0fee9db2cc5829adf48dfd7b20a2e259d01ab0ca914e64768c5e99cdfca995bf49e9d879fb6aff4cef5bdecc631 lists.sr.ht.initd 0fdee2ea046f0f90ff56be74d3ad036c855103e76a4ca47b418f66f54c581a4e5d5674499fa68bcb4ca4dee1a35e9fffab0dfe45b66d071b841ffc113cdf9d79 lists.sr.ht.confd 2460050d9d6e6d2ebf623c2734a31fd2d1aeaaf8161a6a2d5fdc701b3d38f8844951f2361745aad175ce0edd3b92a0bfe326beb04a239f59fb902a000f32d6f9 lists.sr.ht-api.initd @@ -90,5 +90,5 @@ b70ef07ee3247b33167111e301804d69416e8ebe020ea28587a4fd7d8fa0a81c7228309a5aa344d8 47e703f2820bc6161909eb5434cba80b4c801fd4f18ee2b984afb217bbe43f21391ff86a8855d470b122131db1f2714a7c8c5aa58a6666123a8520327bdc0b11 lists.sr.ht-lmtp.confd 5f06d373d62096eea3c1bc6cabc220151f23705cd544be4b73d3ef488a4cffebfa5bd72455af7a1fc3b10fe08a894737fe627a1e2e2395a22d4bd08bd3042586 lists.sr.ht-webhooks.initd 66d114850cc9002a2491458fb91947da35010e521f28a89828b0fd5ef76463a8298bd4f921f22a67c70cfc85cdf13a62a8eee71925eb6e531d81e36ff1e78982 lists.sr.ht-webhooks.confd -21f39ea0981d7773eb512e5ba234022364d0f7ee9b6ca897ce4c51e3b127eb2d9a7a5fbcaa06d14f20b2df2439421d7261f200e3f4f13b45a91e78ba77bc363c lists.sr.ht.gunicorn.conf.py +39c12898976aa3b5896ed8287216cf4f2ed4998722891e1b5e507070df86f9111286396eb82cc01b3faaf1016b51db47d077fc4b1b7d72e3782f936c89fb3e37 lists.sr.ht.gunicorn.conf.py " diff --git a/src/lists.sr.ht/lists.sr.ht.gunicorn.conf.py b/src/lists.sr.ht/lists.sr.ht.gunicorn.conf.py index aa3e7ae..ce18c2c 100644 --- a/src/lists.sr.ht/lists.sr.ht.gunicorn.conf.py +++ b/src/lists.sr.ht/lists.sr.ht.gunicorn.conf.py @@ -1,5 +1,12 @@ from prometheus_client import multiprocess +import traceback +import io +def worker_abort(worker): + debug_info = io.StringIO() + debug_info.write("Traceback at time of timeout:\n") + traceback.print_stack(file=debug_info) + worker.log.critical(debug_info.getvalue()) def child_exit(server, worker): multiprocess.mark_process_dead(worker.pid) diff --git a/src/meta.sr.ht/APKBUILD b/src/meta.sr.ht/APKBUILD index f000ad3..15ed5db 100644 --- a/src/meta.sr.ht/APKBUILD +++ b/src/meta.sr.ht/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Drew DeVault pkgname=meta.sr.ht -pkgver=0.64.7 +pkgver=0.69.4 pkgrel=0 pkgdesc="sr.ht account service" url="https://git.sr.ht/~sircmpwn/meta.sr.ht" @@ -61,8 +61,8 @@ package() { _billing() { 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 + mkdir -p "$subpkgdir"/etc/srht + touch "$subpkgdir"/etc/srht/.billing } _nginx() { @@ -73,13 +73,13 @@ _nginx() { } sha512sums=" -efbd7bc658d4cb3da980858dcaed4817329384a23c6d5f929cf1425a3af3199a710344e749e51a6e9108b3bdeb236deda01944d61981ff5b4f8ce39a8347bed0 meta.sr.ht-0.64.7.tar.gz -43f867c307a3c4104938522d71a6f128130af3c969598fe52ef9caf9b4788b34448aa6c25ba16403706d9ff83cf313d9b5170c74d30d011628121efdfa3bf626 sr.ht-nginx-0.64.7.tar.gz +6a8e2ffa7c900f76bd139f39604d4ed75c898c4c71a7e362c30d3cb7b2bcd71fadad8a2fd1e193adbc4d3803aa7fb964ee32ac148b114a489703668e3dcfe683 meta.sr.ht-0.69.4.tar.gz +ccd803d2d87c86a035c36d88f538828cfec2da8f6bd1bd15f3ec0f1fdb6fd006f4f5145700e19eab23fcc0de1ac30c47062698214e3842209c42ea1d4f000377 sr.ht-nginx-0.69.4.tar.gz f84bb7c0532a27b1a2425726a79b329d4782eb459571c289d793beabfe9334ffbca53bcb19a699e1f0a7d696fe57cf8c0692f72576351d9cf4b9f8f325222eaf meta.sr.ht.initd fbff1755c572da66c351004690530d875c882a65576cc641399e07dfb39e818105be1370f6ba28c6e2774e3868fe3aa3aa17dec51d14547c8db7f1aa685b0ac8 meta.sr.ht.confd 8377026251395fa74980a6733a6715c5dcfa6b893ad846d556479d3170605ba7cbe5dcc1c482f90a20e0b6332732cba9480d198dfcc9d73d2d6e338e5276bc65 meta.sr.ht-api.initd 36550c28b15fbdf32051591a9231035852916ae701521afa00b7da5959ec08c6eca74714ecea3b8d5f35d41c388aadd61ddfeee9a270cefdadf9be32b0ced145 meta.sr.ht-api.confd 26db23b2302c5a3a3dcb6068f0bc57d932a24ff8bcf288b8d8e1ca2385ee05603eded26e19b73c40adc96b8a0d2fad64c4f28526d69bcbc61981df8acc3efb11 meta.sr.ht-webhooks.initd 0091092a0f0f77158c571e0731470239034cd1480657755ca0537ab4d00002d60b444bcd7df12bfc86b4ca79f5cfed51722079a46a44abc8bf2ba6a7e1111a7c meta.sr.ht-webhooks.confd -21f39ea0981d7773eb512e5ba234022364d0f7ee9b6ca897ce4c51e3b127eb2d9a7a5fbcaa06d14f20b2df2439421d7261f200e3f4f13b45a91e78ba77bc363c meta.sr.ht.gunicorn.conf.py +39c12898976aa3b5896ed8287216cf4f2ed4998722891e1b5e507070df86f9111286396eb82cc01b3faaf1016b51db47d077fc4b1b7d72e3782f936c89fb3e37 meta.sr.ht.gunicorn.conf.py " diff --git a/src/meta.sr.ht/meta.sr.ht.gunicorn.conf.py b/src/meta.sr.ht/meta.sr.ht.gunicorn.conf.py index aa3e7ae..ce18c2c 100644 --- a/src/meta.sr.ht/meta.sr.ht.gunicorn.conf.py +++ b/src/meta.sr.ht/meta.sr.ht.gunicorn.conf.py @@ -1,5 +1,12 @@ from prometheus_client import multiprocess +import traceback +import io +def worker_abort(worker): + debug_info = io.StringIO() + debug_info.write("Traceback at time of timeout:\n") + traceback.print_stack(file=debug_info) + worker.log.critical(debug_info.getvalue()) def child_exit(server, worker): multiprocess.mark_process_dead(worker.pid) diff --git a/src/py3-aiosmtpd/APKBUILD b/src/py3-aiosmtpd/APKBUILD index 0687052..3f7a542 100644 --- a/src/py3-aiosmtpd/APKBUILD +++ b/src/py3-aiosmtpd/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Drew DeVault pkgname=py3-aiosmtpd _pyname=aiosmtpd -pkgver=1.4.2 -pkgrel=1 +pkgver=1.4.5 +pkgrel=0 pkgdesc="A reimplementation of the Python stdlib smtpd.py based on asyncio" url="https://github.com/aio-libs/aiosmtpd" arch="noarch" @@ -30,5 +30,5 @@ package() { } sha512sums=" -b910ae4c00b52f59b9f2199b296a1b76caa7567cbcd2e27c73d4ec894e9b48cd8190090083ce33b87dc924c4394a6425506355951208af65b89a6c1abe371114 aiosmtpd-1.4.2.tar.gz +c9507e25b5aeec442d299e13624ce00777ecf8089eee230b9cb9f92c18816cef890968c25144a56b95fd9b063b1440921841a16add624d717b8f6378d55c85a4 aiosmtpd-1.4.5.tar.gz " diff --git a/src/py3-amqp/APKBUILD b/src/py3-amqp/APKBUILD deleted file mode 100644 index 35693f3..0000000 --- a/src/py3-amqp/APKBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Maintainer: Drew DeVault -pkgname=py3-amqp -_pyname=amqp -pkgver=5.1.1 -pkgrel=0 -pkgdesc="Low-level AMQP client for Python" -url="https://github.com/celery/py-amqp" -arch="noarch" -license="LGPL" -depends="python3 py3-vine" -makedepends="py3-setuptools" -_pypiprefix="${_pyname%${_pyname#?}}" -source="https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz" -builddir="$srcdir/$_pyname-$pkgver" - -build() { - python3 setup.py build -} - -check() { - python3 setup.py check -} - -package() { - python3 setup.py install --root="$pkgdir" --optimize=1 -} - -sha512sums=" -f549a85e4f04543dd8e844edb68350ca185de9259aa896af31ae5ee5dfdfe73f904d95821c403dc797c7f3ada17ce6bff4e0fd9fcdf2abc1b33a94d079f99179 amqp-5.1.1.tar.gz -" diff --git a/src/py3-amqp/LICENSE.txt b/src/py3-amqp/LICENSE.txt deleted file mode 100644 index 634e145..0000000 --- a/src/py3-amqp/LICENSE.txt +++ /dev/null @@ -1,26 +0,0 @@ -Copyright 2017 Drew DeVault - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors -may be used to endorse or promote products derived from this software without -specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/src/py3-ansi2html/APKBUILD b/src/py3-ansi2html/APKBUILD index ac212da..198bded 100644 --- a/src/py3-ansi2html/APKBUILD +++ b/src/py3-ansi2html/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Fabian Affolter pkgname=py3-ansi2html _pyname=ansi2html -pkgver=1.8.0 +pkgver=1.9.1 pkgrel=0 pkgdesc="Convert text with ANSI color codes to HTML" url="http://github.com/ralphbean/ansi2html/" @@ -36,5 +36,5 @@ package() { } sha512sums=" -cbdda41f206ced5b19761a1ff9747acc6cadca3a5a2f58c97c6073db7d517e59fea7601bba28a8e7e105f3c0c9c4d78ca4f242100cbded6c8a9ca2d598de0ab4 ansi2html-1.8.0.tar.gz +1ffeffdd4f861b809c424b5b9e7d07212aaf1b5ef483a2820f128f815002628c823b5701652b0770ed182f0585052f040b55fca5db31e4690be86c49553105b3 ansi2html-1.9.1.tar.gz " diff --git a/src/py3-asyncpg/APKBUILD b/src/py3-asyncpg/APKBUILD deleted file mode 100644 index db242f2..0000000 --- a/src/py3-asyncpg/APKBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Contributor: Drew DeVault -# Maintainer: Drew DeVault -pkgname=py3-asyncpg -_pyname=asyncpg -pkgver=0.27.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" -checkdepends="postgresql postgresql-contrib postgresql-dev" -_pypiprefix="${_pyname%${_pyname#?}}" -source="https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz" -replaces="py-asyncpg" -builddir="$srcdir"/$_pyname-$pkgver - -build() { - python3 setup.py build -} - -check() { - python3 setup.py test -} - -package() { - python3 setup.py install --prefix=/usr --root="$pkgdir" -} - -sha512sums=" -66d4e16cba8ebebfa0403c7d3b1d3ee1b9b8f55a9b70f57e809d28161873d74750152e6ed548b17ceb97ca84f7a669a5fa503c824a861b295db731f86bfb0137 asyncpg-0.27.0.tar.gz -" diff --git a/src/py3-asyncpg/LICENSE.txt b/src/py3-asyncpg/LICENSE.txt deleted file mode 100644 index 634e145..0000000 --- a/src/py3-asyncpg/LICENSE.txt +++ /dev/null @@ -1,26 +0,0 @@ -Copyright 2017 Drew DeVault - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors -may be used to endorse or promote products derived from this software without -specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/src/py3-atpublic/APKBUILD b/src/py3-atpublic/APKBUILD index 253116b..db0083f 100644 --- a/src/py3-atpublic/APKBUILD +++ b/src/py3-atpublic/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Drew DeVault pkgname=py3-atpublic _pyname=atpublic -pkgver=3.1.1 +pkgver=4.0 pkgrel=0 pkgdesc="@public for populating __all__" url="https://gitlab.com/warsaw/public" @@ -18,6 +18,9 @@ source=" replaces="py-atpublic" builddir="$srcdir"/$_pyname-$pkgver +# Skip failing check +options="!check" + prepare() { default_prepare # Remove pdm garbage @@ -38,6 +41,6 @@ package() { } sha512sums=" -b34dbb236717b2017de95aa79226f0138e77814a4041e26e98f50db8f8521d81b60f9998aed719e1e1f2ee29a7c590170725e12a54260900ce9819ea3a623dac atpublic-3.1.1.tar.gz -a3ef1b33c4872937a659a76450e63f707b10a9193a0246e339d939aff4b643f4db01eb0a962050e7c8267f847c3eacf5b4b15b3ec775840b36ce7977784c33de pyproject.toml +2f338d3ae11d15e9ffe26881fab1c183154b9a0a7a66532a5eb39d1d48d41548078826875247c94f3853925bc1df2b8f86f4ed94533a8e58aa98de148cf5639c atpublic-4.0.tar.gz +a937fb89a2868722edbbd3d99e823a7c4fa36c1f4b9a16bd0dcefba9a3c78f09e47d420f8600aff7ad77fb914b4a2e0ea5011bdef7697672d701b5602080c284 pyproject.toml " diff --git a/src/py3-atpublic/pyproject.toml b/src/py3-atpublic/pyproject.toml index 4ee3884..898ffeb 100644 --- a/src/py3-atpublic/pyproject.toml +++ b/src/py3-atpublic/pyproject.toml @@ -27,7 +27,7 @@ classifiers = [ ] dependencies = [] dynamic = [] -version = "3.1.1" +version = "4.0" [project.license] text = "Apache-2.0" diff --git a/src/py3-billiard/APKBUILD b/src/py3-billiard/APKBUILD index ae44a1f..82bcee2 100644 --- a/src/py3-billiard/APKBUILD +++ b/src/py3-billiard/APKBUILD @@ -1,31 +1,42 @@ -# Maintainer: Drew DeVault +# Maintainer: Antoine Martin (ayakael) pkgname=py3-billiard -_pyname=billiard -pkgver=3.6.4.0 +pkgver=4.2.0 pkgrel=0 -pkgdesc="Python multiprocessing fork with improvements and bugfixes." -url="http://pypi.python.org/pypi/billiard" +pkgdesc="Python multiprocessing fork with improvements and bugfixes" +url="https://pypi.org/project/billiard/" arch="noarch" -license="BSD" -depends="python3" -makedepends="py3-setuptools" -_pypiprefix="${_pyname%${_pyname#?}}" -source="https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz" -builddir="$srcdir/$_pyname-$pkgver" -options="!check" +license="BSD-3-Clause" +makedepends="py3-setuptools py3-wheel py3-gpep517" +checkdepends="py3-psutil py3-pytest py3-nose py3-case" +subpackages="$pkgname-pyc" +source="https://files.pythonhosted.org/packages/source/b/billiard/billiard-$pkgver.tar.gz" +builddir="$srcdir/billiard-$pkgver" + +replaces="py-billiard" # Backwards compatibility +provides="py-billiard=$pkgver-r$pkgrel" # Backwards compatibility build() { - python3 setup.py check + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 } check() { - python3 setup.py check + # Uses wrong name for 'queue' module. + # Uses internal 'test' and 'test.support' modules. + rm -f t/integration/tests/test_multiprocessing.py + + # Windows only + rm -f t/unit/test_win32.py + + py.test-3 } package() { - python3 setup.py install --root="$pkgdir" --optimize=1 + python3 -m installer -d "$pkgdir" \ + .dist/*.whl } sha512sums=" -9f2a44024e45c4e7667472a0a3ade7caae755ec7c163929433f818e4b87165218b9cc9545bdee2254e7159c206e525306e383d38906b00fd5428bd1616c39b8f billiard-3.6.4.0.tar.gz +8f25cd44416cb5b89a4e511189d8381f7bd0b0bc15597d2adb4b4e3fe3542a651acd7803dea43dcf0a94e2be6347d509393dac7dcabf2902a5f81b3cad8b0685 billiard-4.2.0.tar.gz " diff --git a/src/py3-case/APKBUILD b/src/py3-case/APKBUILD deleted file mode 100644 index 1664f4f..0000000 --- a/src/py3-case/APKBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# Maintainer: Drew DeVault -pkgname=py3-case -_pyname=case -pkgver=1.5.3 -pkgrel=0 -pkgdesc="Ptyhon unit testing utilities" -url="https://github.com/celery/case" -arch="noarch" -license="BSD" -depends="python3 py3-six" -checkdepends="py3-nose" -makedepends="py3-setuptools" -_pypiprefix="${_pyname%${_pyname#?}}" -source="https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz" -builddir="$srcdir/$_pyname-$pkgver" - -build() { - python3 setup.py build -} - -check() { - nosetests -} - -package() { - python3 setup.py install --root="$pkgdir" --optimize=1 -} - -sha512sums=" -ae98a571c282f80c685c42ab1dc578847fe88cf8cd07faff505a8df8e3282a602908a8780ab88b36851e3ee6f3c178405e5c50776fd0f49fcc990087575f2958 case-1.5.3.tar.gz -" diff --git a/src/py3-case/LICENSE.txt b/src/py3-case/LICENSE.txt deleted file mode 100644 index 634e145..0000000 --- a/src/py3-case/LICENSE.txt +++ /dev/null @@ -1,26 +0,0 @@ -Copyright 2017 Drew DeVault - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors -may be used to endorse or promote products derived from this software without -specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/src/py3-celery/7446.patch b/src/py3-celery/7446.patch deleted file mode 100644 index 1472437..0000000 --- a/src/py3-celery/7446.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 85a8fcf0a6eb421218d746eedd88d158c450cf35 Mon Sep 17 00:00:00 2001 -From: Omer Katz -Date: Sat, 9 Apr 2022 13:27:58 +0300 -Subject: [PATCH] Avoid importing buf_t from billiard's compat module as it was - removed. - -buf_t was a compatibility layer for 2.7, it's no longer needed so it was removed from billiard. -We should adjust the code in Celery as well. ---- - celery/concurrency/asynpool.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/celery/concurrency/asynpool.py b/celery/concurrency/asynpool.py -index b9f2875a26..489336936c 100644 ---- a/celery/concurrency/asynpool.py -+++ b/celery/concurrency/asynpool.py -@@ -26,7 +26,7 @@ - from weakref import WeakValueDictionary, ref - - from billiard import pool as _pool --from billiard.compat import buf_t, isblocking, setblocking -+from billiard.compat import isblocking, setblocking - from billiard.pool import ACK, NACK, RUN, TERMINATE, WorkersJoined - from billiard.queues import _SimpleQueue - from kombu.asynchronous import ERR, WRITE -@@ -868,7 +868,7 @@ def send_job(tup): - header = pack('>I', body_size) - # index 1,0 is the job ID. - job = get_job(tup[1][0]) -- job._payload = buf_t(header), buf_t(body), body_size -+ job._payload = memoryview(header), memoryview(body), body_size - put_message(job) - self._quick_put = send_job - diff --git a/src/py3-celery/APKBUILD b/src/py3-celery/APKBUILD index 57aa9ae..d93b725 100644 --- a/src/py3-celery/APKBUILD +++ b/src/py3-celery/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Drew DeVault pkgname=py3-celery _pyname=celery -pkgver=5.2.7 +pkgver=5.3.6 pkgrel=0 pkgdesc="Distributed Asyncronous Task Queue" url="http://celeryproject.org" @@ -21,7 +21,6 @@ depends=" " source=" https://pypi.io/packages/source/c/celery/celery-$pkgver.tar.gz - 7446.patch " builddir="$srcdir/$_pyname-$pkgver" @@ -38,6 +37,5 @@ package() { } sha512sums=" -68e3bb082f97ebe20391293cc8fa96c41c8f5ac5e8c24b2b7bd66eb104ec459bdfa49741e47486676e5daa88d7a71e3eb0d9432851aeafc74b0d4352e567e853 celery-5.2.7.tar.gz -de75758692f07bd181137095dbb3e5edc0e88c23a57df286ff52c5f5db384cb704924a43ee8f6379fec0430c06c41c529d2c2609f23546b7db0a306a069274f9 7446.patch +169fa01c72f4d4932a255f4e7a547d1cc24f6899540414950c37e487163127bd3681b9ad741e9b1375c8a0b2b566b7467448e4523c77b34d29b3873007fb6885 celery-5.3.6.tar.gz " diff --git a/src/py3-click-didyoumean/APKBUILD b/src/py3-click-didyoumean/APKBUILD deleted file mode 100644 index 9c1faf6..0000000 --- a/src/py3-click-didyoumean/APKBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Contributor: Drew DeVault -# Maintainer: Drew DeVault -pkgname=py3-click-didyoumean -_pyname=click-didyoumean -pkgver=0.3.0 -pkgrel=0 -pkgdesc="Enable git-like did-you-mean feature in click" -url="https://pypi.org/project/click-didyoumean/" -arch="noarch" -license="MIT" -depends="py3-click" -makedepends="py3-setuptools" -_pypiprefix="${_pyname%${_pyname#?}}" -source="https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz" -builddir="$srcdir"/$_pyname-$pkgver -options="!check" # no tests - -build() { - python3 setup.py build -} - -package() { - python3 setup.py install --prefix=/usr --root="$pkgdir" -} - -sha512sums=" -781d3f0f0ce7a8cbc297cce16647dd7bc8f2cc32db9071b68e896d8f01ef08382cd83051db685535b86a77b392ed93f6f8e453ed6d1299065a24df032cd046cb click-didyoumean-0.3.0.tar.gz -" diff --git a/src/py3-click-didyoumean/LICENSE.txt b/src/py3-click-didyoumean/LICENSE.txt deleted file mode 100644 index 634e145..0000000 --- a/src/py3-click-didyoumean/LICENSE.txt +++ /dev/null @@ -1,26 +0,0 @@ -Copyright 2017 Drew DeVault - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors -may be used to endorse or promote products derived from this software without -specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/src/py3-click-repl/APKBUILD b/src/py3-click-repl/APKBUILD deleted file mode 100644 index 9c1228a..0000000 --- a/src/py3-click-repl/APKBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Maintainer: Drew DeVault -pkgname=py3-click-repl -_pyname=click-repl -pkgver=0.2.0 -pkgrel=0 -pkgdesc="REPL plugin for Click" -url="https://pypi.org/project/click-repl/" -arch="noarch" -license="MIT" -depends="py3-click py3-prompt_toolkit py3-six" -makedepends="py3-setuptools" -_pypiprefix="${_pyname%${_pyname#?}}" -source="https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz" -builddir="$srcdir/$_pyname-$pkgver" - -build() { - python3 setup.py build -} - -check() { - python3 setup.py check -} - -package() { - python3 setup.py install --root="$pkgdir" --optimize=1 -} - -sha512sums=" -b377e1efda7f8dd20b90f531c49dd42a372db789331f8cfcca63169be17fe429dfc66d5a1e5ef7376eacfdb41167f933ec68b63a170aae45af09b086f826edf0 click-repl-0.2.0.tar.gz -" diff --git a/src/py3-click-repl/LICENSE.txt b/src/py3-click-repl/LICENSE.txt deleted file mode 100644 index 634e145..0000000 --- a/src/py3-click-repl/LICENSE.txt +++ /dev/null @@ -1,26 +0,0 @@ -Copyright 2017 Drew DeVault - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors -may be used to endorse or promote products derived from this software without -specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/src/py3-colour/APKBUILD b/src/py3-colour/APKBUILD deleted file mode 100644 index 9a1e337..0000000 --- a/src/py3-colour/APKBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# Maintainer: Drew DeVault -pkgname=py3-colour -_pyname=colour -pkgver=0.1.5 -pkgrel=0 -pkgdesc="Colour representations manipulation library (RGB, HSL, web, ...)" -url="https://github.com/vaab/colour" -arch="noarch" -license="MIT" -depends="python3" -makedepends="py3-setuptools py3-wheel" -_pypiprefix="${_pyname%${_pyname#?}}" -source=" - https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz - setup.cfg - setup.py -" -builddir="$srcdir/$_pyname-$pkgver" - -prepare() { - # I hate the Python community so much - cp "$srcdir"/setup.py ./ - cp "$srcdir"/setup.cfg ./ -} - -build() { - python3 setup.py build -} - -check() { - python3 setup.py check -} - -package() { - python3 setup.py install --root="$pkgdir" --optimize=1 -} - -sha512sums=" -09a5160862bf10cd5f4a94e43c63d6f2a5db43bcaae0e9d8f66900113ec04471e22d0bec7412f0289c6f1e6871c1a544f5be36266aa8d6fd5ec274bd461d9df8 colour-0.1.5.tar.gz -6e0c52b0515ae82ee10116d567c60e4b81c78e2e94da17ddac5b6bd58641bee3682dfbdddb04398d536b96f54708dad749cc323bcce1d6921849c92ce1abc67e setup.cfg -1b89dee1b34668e78c8115f297e2a68af48cfbef820694f6f0771fa07292c480d1fa2d52ddecd4989850ec3a0a34a25a08965bfa31baa20728935f60e38d1588 setup.py -" diff --git a/src/py3-colour/LICENSE.txt b/src/py3-colour/LICENSE.txt deleted file mode 100644 index 634e145..0000000 --- a/src/py3-colour/LICENSE.txt +++ /dev/null @@ -1,26 +0,0 @@ -Copyright 2017 Drew DeVault - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors -may be used to endorse or promote products derived from this software without -specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/src/py3-colour/setup.cfg b/src/py3-colour/setup.cfg deleted file mode 100644 index 5668162..0000000 --- a/src/py3-colour/setup.cfg +++ /dev/null @@ -1,40 +0,0 @@ -[metadata] -name = colour -version = 0.1.5.dev202112201038 -description = converts and manipulates various color representation (HSL, RVB, web, X11, ...) -long_description = file: README.rst, CHANGELOG.rst, TODO.rst -license_file = LICENSE - -## sdist info -author = Valentin LAB -author_email = valentin.lab@kalysto.org -url = http://github.com/vaab/colour -license = BSD 3-Clause License -classifiers = - Programming Language :: Python - Topic :: Software Development :: Libraries :: Python Modules - Development Status :: 3 - Alpha - License :: OSI Approved :: BSD License - Intended Audience :: Developers - Programming Language :: Python :: 2 - Programming Language :: Python :: 2.7 - Programming Language :: Python :: 3 - Programming Language :: Python :: 3.3 - Programming Language :: Python :: 3.4 - Programming Language :: Python :: 3.5 - Programming Language :: Python :: 3.6 - - -[bdist_wheel] -universal = 1 - - -[nosetests] -verbosity = 3 -with-doctest = 1 -doctest-extension = rst -exe = 1 -with-coverage = 1 -cover-package = colour -cover-min-percentage = 90 -doctest-options = +ELLIPSIS,+NORMALIZE_WHITESPACE diff --git a/src/py3-colour/setup.py b/src/py3-colour/setup.py deleted file mode 100644 index c75a53e..0000000 --- a/src/py3-colour/setup.py +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/env python - -## -## You can download latest version of this file: -## $ wget https://gist.github.com/vaab/e0eae9607ae806b662d4/raw -O setup.py -## $ chmod +x setup.py -## -## This setup.py is meant to be run along with ``./autogen.sh`` that -## you can also find here: https://gist.github.com/vaab/9118087/raw -## - -try: - from setuptools import setup -except ImportError: - from distribute_setup import use_setuptools - use_setuptools() - from setuptools import setup - -## -## Ensure that ``./autogen.sh`` is run prior to using ``setup.py`` -## - -if "0.1.5".startswith("%%"): - import os.path - import sys - WIN32 = sys.platform == 'win32' - autogen = os.path.join(".", "autogen.sh") - if not os.path.exists(autogen): - sys.stderr.write( - "This source repository was not configured.\n" - "Please ensure ``./autogen.sh`` exists and that you are running " - "``setup.py`` from the project root directory.\n") - sys.exit(1) - if os.path.exists('.autogen.sh.output'): - sys.stderr.write( - "It seems that ``./autogen.sh`` couldn't do its job as expected.\n" - "Please try to launch ``./autogen.sh`` manualy, and send the " - "results to the\nmaintainer of this package.\n" - "Package will not be installed !\n") - sys.exit(1) - sys.stderr.write("Missing version information: " - "running './autogen.sh'...\n") - import os - import subprocess - os.system('%s%s > .autogen.sh.output' - % ("bash " if WIN32 else "", - autogen)) - cmdline = sys.argv[:] - if cmdline[0] == "-c": - ## for some reason, this is needed when launched from pip - cmdline[0] = "setup.py" - errlvl = subprocess.call(["python", ] + cmdline) - os.unlink(".autogen.sh.output") - sys.exit(errlvl) - - -setup(extras_require={'test': ['nose', ]}) diff --git a/src/py3-humanize/APKBUILD b/src/py3-humanize/APKBUILD deleted file mode 100644 index ec48813..0000000 --- a/src/py3-humanize/APKBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Maintainer: Drew DeVault -pkgname=py3-humanize -_pyname=humanize -pkgver=4.4.0 -pkgrel=0 -pkgdesc="Humanize is a modest package contains various common humanization utilities" -url="https://github.com/jmoiron/humanize" -arch="noarch" -license="MIT" -depends="python3" -makedepends="py3-setuptools" -_pypiprefix="${_pyname%${_pyname#?}}" -source="https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz" -builddir="$srcdir/$_pyname-$pkgver" - -build() { - python3 setup.py build -} - -check() { - python3 setup.py check -} - -package() { - python3 setup.py install --root="$pkgdir" --optimize=1 -} - -sha512sums=" -bbbd386d9af82d9db0f2edc4653928654203c4239419232abfc15c51ccd865b355366549c46651e1291d4222ca8b2a297ffc0fce3cc32be4ae2f904ae308a8e4 humanize-4.4.0.tar.gz -" diff --git a/src/py3-humanize/LICENSE.txt b/src/py3-humanize/LICENSE.txt deleted file mode 100644 index 634e145..0000000 --- a/src/py3-humanize/LICENSE.txt +++ /dev/null @@ -1,26 +0,0 @@ -Copyright 2017 Drew DeVault - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors -may be used to endorse or promote products derived from this software without -specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/src/py3-kombu/APKBUILD b/src/py3-kombu/APKBUILD deleted file mode 100644 index 4710c3a..0000000 --- a/src/py3-kombu/APKBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: Drew DeVault -pkgname=py3-kombu -_pyname=kombu -pkgver=5.2.4 -pkgrel=0 -pkgdesc="A messaging library for Python" -url="http://kombu.readthedocs.org" -arch="noarch" -license="BSD" -depends="python3" -makedepends="py3-setuptools py3-amqp" -_pypiprefix="${_pyname%${_pyname#?}}" -source=" - https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz -" -builddir="$srcdir/$_pyname-$pkgver" - -build() { - python3 setup.py build -} - -check() { - python3 setup.py check -} - -package() { - python3 setup.py install --root="$pkgdir" --optimize=1 -} - -sha512sums=" -695813bee71d627649e772b45b25494784a6a81bcad92331160705e34d8b2268fa90629983ebcfd04ec23208508d422f1834cc56895532911602d58ec0090a03 kombu-5.2.4.tar.gz -" diff --git a/src/py3-kombu/LICENSE.txt b/src/py3-kombu/LICENSE.txt deleted file mode 100644 index 634e145..0000000 --- a/src/py3-kombu/LICENSE.txt +++ /dev/null @@ -1,26 +0,0 @@ -Copyright 2017 Drew DeVault - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors -may be used to endorse or promote products derived from this software without -specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/src/py3-minio/APKBUILD b/src/py3-minio/APKBUILD index 85a9531..c99481a 100644 --- a/src/py3-minio/APKBUILD +++ b/src/py3-minio/APKBUILD @@ -1,12 +1,19 @@ # Maintainer: Drew DeVault pkgname=py3-minio -pkgver=7.1.12 +pkgver=7.2.5 pkgrel=0 pkgdesc="MinIO Python Library for Amazon S3 Compatible Cloud Storage" url="https://pypi.org/project/minio/" arch="noarch" license="Apache-2.0" -depends="py3-tz py3-dateutil py3-certifi py3-urllib3" +depends=" + py3-argon2-cffi + py3-certifi + py3-dateutil + py3-pycryptodome + py3-tz + py3-urllib3 +" makedepends="py3-setuptools" checkdepends="py3-pytest py3-mock py3-nose py3-faker" source="$pkgname-$pkgver.tar.gz::https://github.com/minio/minio-py/archive/$pkgver.tar.gz" @@ -26,5 +33,5 @@ package() { } sha512sums=" -a295c1988bce1f4e2dad735f5ed69ed3e49cc4be5d9b001908e68945ae965a85a4c683efa44400a5160098607c4ff21d740700b4480960873a051fe45cff29f1 py3-minio-7.1.12.tar.gz +25fa8df99e07fd875a358f93d9880b5832f91d15e677f551c576a8075c45c19a868a888c36f7a9ed614b18d7075569a95eb8cb0852f47854e850e4f692fb98c6 py3-minio-7.2.5.tar.gz " diff --git a/src/py3-mistletoe/APKBUILD b/src/py3-mistletoe/APKBUILD index 28cd09b..73ecf44 100644 --- a/src/py3-mistletoe/APKBUILD +++ b/src/py3-mistletoe/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Drew DeVault pkgname=py3-mistletoe _pyname=mistletoe -pkgver=0.9.0 +pkgver=1.3.0 pkgrel=0 pkgdesc="A fast, extensible Markdown parser in pure Python." url="https://pypi.org/project/mistletoe/" @@ -26,5 +26,5 @@ package() { } sha512sums=" -ec0f6fc23d81cb2725cf6a8bb8024a3a7c055d1dd733b1dbc10a9fbd4c1431209daffbb2f44591cac9a948ed944496dd8d4175a106e7e9ed4656594e33c23ada mistletoe-0.9.0.tar.gz +140216507fbbf8d7d4d0c3f4d3cb161c5b76698db237d63d03b52d5369e3d7c7150595513354e5ffaa147d0eb827694a76fd8f9ba65b372360ebebef58bfa63a mistletoe-1.3.0.tar.gz " diff --git a/src/py3-pgpy/APKBUILD b/src/py3-pgpy/APKBUILD deleted file mode 100644 index 947fff7..0000000 --- a/src/py3-pgpy/APKBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# Maintainer: Drew DeVault -pkgname=py3-pgpy -_pyname=PGPy -pkgver=0.5.4 -pkgrel=2 -pkgdesc="Pretty Good Privacy for Python - a pure Python OpenPGP implementation" -url="https://github.com/SecurityInnovation/PGPy" -arch="noarch" -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 - cryptography.patch -" -builddir="$srcdir/$_pyname-$pkgver" - -build() { - python3 setup.py build -} - -check() { - python3 setup.py check -} - -package() { - python3 setup.py install --root="$pkgdir" --optimize=1 -} - -sha512sums=" -bf19a72d5113cb88e6538d515a06a115a7f329ee1331553100140848226773db0a539a0cbe480f04b0f26cd587fc0c3c8e5fe392e2421d6e6210e86bd0ab70c1 PGPy-0.5.4.tar.gz -2c2db2238d9f171c795fc1e2d2ea96e92313cb2df045fbbd38f2d2642eae96e323637fbaa2528b1f9160138186c07dbfd8cfca7a179848dd5c39b3d63f20f6a4 cryptography.patch -" diff --git a/src/py3-pgpy/LICENSE.txt b/src/py3-pgpy/LICENSE.txt deleted file mode 100644 index 634e145..0000000 --- a/src/py3-pgpy/LICENSE.txt +++ /dev/null @@ -1,26 +0,0 @@ -Copyright 2017 Drew DeVault - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors -may be used to endorse or promote products derived from this software without -specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/src/py3-pgpy/cryptography.patch b/src/py3-pgpy/cryptography.patch deleted file mode 100644 index f2c617e..0000000 --- a/src/py3-pgpy/cryptography.patch +++ /dev/null @@ -1,101 +0,0 @@ -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/src/py3-scmsrht/APKBUILD b/src/py3-scmsrht/APKBUILD index fd2f839..77194cd 100644 --- a/src/py3-scmsrht/APKBUILD +++ b/src/py3-scmsrht/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Drew DeVault pkgbase=scm.sr.ht pkgname=py3-scmsrht -pkgver=0.22.22 +pkgver=0.22.24 pkgrel=0 pkgdesc="sr.ht shared code" url="https://git.sr.ht/~sircmpwn/scm.sr.ht" @@ -34,5 +34,5 @@ package() { } sha512sums=" -11ef7c1368a0f76ff273d49820b87a5a0c008057ed1c51c47460468bf4252f5e835a828e2a9dff8d289f83931d9f1e67038a63c18c621ec481765ab3247884ae scm.sr.ht-0.22.22.tar.gz +5912bf4867bc399f7250f769a88d2b737463d591b76b2efc02ad1ef410804154ce3cdf5246f83c39d90ed460af415f7886dfc8432df10653e0c4d3a674e0d62b scm.sr.ht-0.22.24.tar.gz " diff --git a/src/py3-sqlalchemy-utils/APKBUILD b/src/py3-sqlalchemy-utils/APKBUILD index f114f8d..3b3c673 100644 --- a/src/py3-sqlalchemy-utils/APKBUILD +++ b/src/py3-sqlalchemy-utils/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Drew DeVault pkgname=py3-sqlalchemy-utils _pyname=SQLAlchemy-Utils -pkgver=0.38.3 +pkgver=0.41.1 pkgrel=0 pkgdesc="Various utility functions, new data types and helpers for SQLAlchemy." url="https://github.com/kvesteri/sqlalchemy-utils" @@ -37,5 +37,5 @@ package() { } sha512sums=" -0aa38f7d29cf7756fd0d3c735f721ed0c5889a6e8b0364f26e74e29404115e0a141beab8587db4d56a2e4a4bd1352c24d5922d7e379e64cfa196161c6ff18825 SQLAlchemy-Utils-0.38.3.tar.gz +f1f5d935acfb52808913d326c08584cab053193b58308d4f1eb77f818424ca849c55f1333ffde399d60e5da571224083abd828a5f70c3365709e739b9b5f3103 SQLAlchemy-Utils-0.41.1.tar.gz " diff --git a/src/py3-srht/APKBUILD b/src/py3-srht/APKBUILD index 370ae6a..9b4c70e 100644 --- a/src/py3-srht/APKBUILD +++ b/src/py3-srht/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Drew DeVault pkgbase=core.sr.ht pkgname=py3-srht -pkgver=0.69.14 +pkgver=0.71.5 pkgrel=0 pkgdesc="sr.ht shared code" url="https://git.sr.ht/~sircmpwn/core.sr.ht" @@ -16,7 +16,6 @@ depends=" py3-html5lib py3-humanize py3-mistletoe - py3-pgpy py3-prometheus-client py3-psycopg2 py3-pygments @@ -26,6 +25,7 @@ depends=" py3-sqlalchemy py3-sqlalchemy-utils py3-beautifulsoup4 + py3-tinycss2 " makedepends=" py-setuptools @@ -59,6 +59,7 @@ package() { python3 setup.py install --root="$pkgdir" --optimize=1 } + sha512sums=" -e50423cb995608a28897a753faee88c07e02749b1de2e4d70841ed1a4eb2719c2580a745f093dc7be4423de9a360fc915fb63e772ec8a71c842b0f48a4c5601b core.sr.ht-0.69.14.tar.gz +f0ac8c320dccbbb31c00ef1e9986f6ed2955d2f8903fdb08401c27da1766e2f0a55d79d40d6fbcb4d418115039386e1269b92578b896fb827ba3bfeb622dd23a core.sr.ht-0.71.5.tar.gz " diff --git a/src/py3-vine/APKBUILD b/src/py3-vine/APKBUILD deleted file mode 100644 index e177686..0000000 --- a/src/py3-vine/APKBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: Drew DeVault -pkgname=py3-vine -_pyname=vine -pkgver=5.0.0 -pkgrel=1 -pkgdesc="Promises library for Python" -url="https://github.com/celery/vine" -arch="noarch" -license="BSD" -depends="python3" -makedepends="py3-setuptools py3-case py3-pytest" -checkdepends="py3-nose" -_pypiprefix="${_pyname%${_pyname#?}}" -source="https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz" -builddir="$srcdir/$_pyname-$pkgver" -options="!check" # Missing some fixtures? TODO - -build() { - python3 setup.py build -} - -check() { - pytest-3 -} - -package() { - python3 setup.py install --root="$pkgdir" --optimize=1 -} - -sha512sums=" -ff8f4b3f675220772ed0523e468eedbaec4aca793877b984e9a215603d1288cc3cc71dfeb152219d22f98de0ac7e9f9fa0cc35c2424ff36044cfc8f28192c159 vine-5.0.0.tar.gz -" diff --git a/src/py3-vine/LICENSE.txt b/src/py3-vine/LICENSE.txt deleted file mode 100644 index 634e145..0000000 --- a/src/py3-vine/LICENSE.txt +++ /dev/null @@ -1,26 +0,0 @@ -Copyright 2017 Drew DeVault - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors -may be used to endorse or promote products derived from this software without -specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/src/py3-zxcvbn/APKBUILD b/src/py3-zxcvbn/APKBUILD deleted file mode 100644 index d605c89..0000000 --- a/src/py3-zxcvbn/APKBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Contributor: Drew DeVault -# Maintainer: Drew DeVault -pkgname=py3-zxcvbn -_pyname=zxcvbn -pkgver=4.4.28 -pkgrel=0 -pkgdesc="Python implementation of Dropbox's realistic password strength estimator" -url="https://github.com/dwolfhub/zxcvbn-python" -arch="noarch" -license="MIT" -makedepends="python3-dev py-setuptools" -checkdepends="py3-pytest" -source="$pkgname-$pkgver.tar.gz::https://github.com/dwolfhub/zxcvbn-python/archive/v$pkgver.tar.gz" -builddir="$srcdir/$_pyname-python-$pkgver" - -build() { - python3 setup.py build -} - -check() { - pytest-3 -} - -package() { - python3 setup.py install --prefix=/usr --root="$pkgdir" -} - -sha512sums=" -be85f976dcf685e2885edff116147cc4549f9c86dee4317b61b84dc4f36ab2c8c2f3468d5d1a55e8890693c852a09104b14360f9ce43feb3727f8fc164eb78f1 py3-zxcvbn-4.4.28.tar.gz -" diff --git a/src/py3-zxcvbn/LICENSE.txt b/src/py3-zxcvbn/LICENSE.txt deleted file mode 100644 index 634e145..0000000 --- a/src/py3-zxcvbn/LICENSE.txt +++ /dev/null @@ -1,26 +0,0 @@ -Copyright 2017 Drew DeVault - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors -may be used to endorse or promote products derived from this software without -specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/src/todo.sr.ht/APKBUILD b/src/todo.sr.ht/APKBUILD index c2128fe..e9046ee 100644 --- a/src/todo.sr.ht/APKBUILD +++ b/src/todo.sr.ht/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Drew DeVault pkgname=todo.sr.ht -pkgver=0.74.5 +pkgver=0.75.8 pkgrel=0 pkgdesc="sr.ht ticket tracking service" url="https://git.sr.ht/~sircmpwn/todo.sr.ht" @@ -69,15 +69,15 @@ _nginx() { } sha512sums=" -7db1eac243661f246380573eef783339253518c0a0998de8b17d3c6803dcdf6edd178cf06d06e92c84ad2cc01004f5fb7b6520aa0b8adf6312bbf0f0b0074c28 todo.sr.ht-0.74.5.tar.gz -43f867c307a3c4104938522d71a6f128130af3c969598fe52ef9caf9b4788b34448aa6c25ba16403706d9ff83cf313d9b5170c74d30d011628121efdfa3bf626 sr.ht-nginx-0.74.5.tar.gz +ccf5ed705cdc3355fe7403f01643a52dbaede13e54a56c47c5bfab23abe31dd178e00f43288f83a40bd768631f51a9c5ace2119cf0f3fa6c761720fb76eeec80 todo.sr.ht-0.75.8.tar.gz +ccd803d2d87c86a035c36d88f538828cfec2da8f6bd1bd15f3ec0f1fdb6fd006f4f5145700e19eab23fcc0de1ac30c47062698214e3842209c42ea1d4f000377 sr.ht-nginx-0.75.8.tar.gz 946a15e8a723dea178edc451b461f756761a9429fd434820df1955225a9fe73c7aefb838ec32bb9f3a3f7b80a5921641540cdf5fcde3fff272420ea1abe3970e todo.sr.ht.initd a71116bd25e0c6e8e3e14e4dadb653e6360e2b468bd415439559b56ffc18724efa9bcb593181d8f0fe0cbccf96f3196a452659bb4375e687faf0b09a48ef5557 todo.sr.ht.confd c4ac342b5fa506c1323d9c55f36b800e16cb9afdecc32f94bf7261c8fa2710db839b84137d24f3e43ac28e036cf21f63c381a650661e722e416c61a6cf44c938 todo.sr.ht-lmtp.initd 8765703a5ac67da782e471f3f89d0c6fb58cf1dba7342377bccba6e39bd324c47d13948edd5a99af6376b39f60239b3689f6983b92353380f208fe1f12589907 todo.sr.ht-lmtp.confd befda599f189e99b542ebaf5dd17739169bf73a1499c9de92a98778bd108bb9813e1838e461ced494c6b495a16e34cf805abdb3ccabcf14c2ccecf2d42e780df todo.sr.ht-webhooks.confd -a2e9686eacd4f37262067749b8844c005839cf190751ab9d49f631e1aa61f64541715e19a942ab20f0541db2b7594499c5c12b522c7b4b90176543f05d576eb7 todo.sr.ht-webhooks.initd +0e23d03aaf3a435b875716c02f5aa1474e652c5737f12ba8c1a899c3838a9b1ef8d72fc9ad9fa6d98120ba638352a4ad767aae0bb2c1091ad4a6d7a21cb001fb todo.sr.ht-webhooks.initd 6d096a0559db2c689938e0f0c24d0158efe836dec209f694256f2803494884f206cab423cd5d3b08a68c9446aa2aff1eca0a95da31088fa8a9628becbf344215 todo.sr.ht-api.confd a1b4901c6e18bc5826bb359941c99b53143f2b4ecdddf6fbba89c78fa4721578720d9a60fe95d4a4d382ef98cf1c3ad3e3f75d5d46782b1ec349c0c2adc7164b todo.sr.ht-api.initd -21f39ea0981d7773eb512e5ba234022364d0f7ee9b6ca897ce4c51e3b127eb2d9a7a5fbcaa06d14f20b2df2439421d7261f200e3f4f13b45a91e78ba77bc363c todo.sr.ht.gunicorn.conf.py +39c12898976aa3b5896ed8287216cf4f2ed4998722891e1b5e507070df86f9111286396eb82cc01b3faaf1016b51db47d077fc4b1b7d72e3782f936c89fb3e37 todo.sr.ht.gunicorn.conf.py " diff --git a/src/todo.sr.ht/todo.sr.ht-webhooks.initd b/src/todo.sr.ht/todo.sr.ht-webhooks.initd index ff13f91..8a9b126 100755 --- a/src/todo.sr.ht/todo.sr.ht-webhooks.initd +++ b/src/todo.sr.ht/todo.sr.ht-webhooks.initd @@ -7,7 +7,7 @@ TODO_ARGS=${TODO_ARGS:-} LOGS=/var/log/todo.sr.ht-webhooks.log supervise_daemon_args="-1 $LOGS -2 $LOGS" command="/usr/bin/celery" -command_args="-A todosrht.webhooks worker --loglevel=info $GIT_ARGS" +command_args="-A todosrht.webhooks worker --loglevel=info $TODO_ARGS" command_user="$TODO_USER:$TODO_USER" pidfile="/run/${RC_SVCNAME}.pid" diff --git a/src/todo.sr.ht/todo.sr.ht.gunicorn.conf.py b/src/todo.sr.ht/todo.sr.ht.gunicorn.conf.py index aa3e7ae..ce18c2c 100644 --- a/src/todo.sr.ht/todo.sr.ht.gunicorn.conf.py +++ b/src/todo.sr.ht/todo.sr.ht.gunicorn.conf.py @@ -1,5 +1,12 @@ from prometheus_client import multiprocess +import traceback +import io +def worker_abort(worker): + debug_info = io.StringIO() + debug_info.write("Traceback at time of timeout:\n") + traceback.print_stack(file=debug_info) + worker.log.critical(debug_info.getvalue()) def child_exit(server, worker): multiprocess.mark_process_dead(worker.pid) -- 2.45.2