From 71d876dd89e2215f58930abcc37bcfb5db1bf833 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Mon, 3 Jan 2022 11:04:38 +0100 Subject: [PATCH] Upgrade py3-celery, py3-kombu --- ...evert-try-newer-bumped-versions-7194.patch | 31 ++++++++++++++++ sr.ht/py3-celery/APKBUILD | 8 +++-- ...-v5.0.9-1462-try-pining-setuptools-1.patch | 36 +++++++++++++++++++ sr.ht/py3-kombu/APKBUILD | 12 ++++--- 4 files changed, 80 insertions(+), 7 deletions(-) create mode 100644 sr.ht/py3-celery/0001-Revert-try-newer-bumped-versions-7194.patch create mode 100644 sr.ht/py3-kombu/0001-Revert-test-amqp-v5.0.9-1462-try-pining-setuptools-1.patch diff --git a/sr.ht/py3-celery/0001-Revert-try-newer-bumped-versions-7194.patch b/sr.ht/py3-celery/0001-Revert-try-newer-bumped-versions-7194.patch new file mode 100644 index 0000000..b66f002 --- /dev/null +++ b/sr.ht/py3-celery/0001-Revert-try-newer-bumped-versions-7194.patch @@ -0,0 +1,31 @@ +From 4e36245bff302ab2594f5f4de5b59a65695cc28a Mon Sep 17 00:00:00 2001 +From: Drew DeVault +Date: Mon, 3 Jan 2022 10:50:55 +0100 +Subject: [PATCH] Revert "try newer bumped versions (#7194)" + +This reverts commit d4b97bedc79aed0b45dd3720b683d8d8572da2a9. +--- + requirements/default.txt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/requirements/default.txt b/requirements/default.txt +index 509a43d9e..3be20593c 100644 +--- a/requirements/default.txt ++++ b/requirements/default.txt +@@ -1,9 +1,9 @@ +-pytz>=2021.3 ++pytz>0.dev.0 + billiard>=3.6.4.0,<4.0 +-kombu>=5.2.3,<6.0 ++kombu>=5.2.2,<6.0 + vine>=5.0.0,<6.0 +-click>=8.0.3,<9.0 ++click>=8.0,<9.0 + click-didyoumean>=0.0.3 + click-repl>=0.2.0 + click-plugins>=1.1.1 +-setuptools>=59.1.1,<59.7.0 ++setuptools +-- +2.34.1 + diff --git a/sr.ht/py3-celery/APKBUILD b/sr.ht/py3-celery/APKBUILD index 93827a5..0d63f6b 100644 --- a/sr.ht/py3-celery/APKBUILD +++ b/sr.ht/py3-celery/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Drew DeVault pkgname=py3-celery _pyname=celery -pkgver=5.2.0 -pkgrel=1 +pkgver=5.2.3 +pkgrel=0 pkgdesc="Distributed Asyncronous Task Queue" url="http://celeryproject.org" arch="noarch" @@ -21,6 +21,7 @@ depends=" " source=" https://pypi.io/packages/source/c/celery/celery-$pkgver.tar.gz + 0001-Revert-try-newer-bumped-versions-7194.patch " builddir="$srcdir/$_pyname-$pkgver" @@ -37,5 +38,6 @@ package() { } sha512sums=" -3e0bb3378ac7d658753e477e5215c670184d47e6d4aed9ffa8c1b10e8dcaa8c590a5a06da1af7da46c981aca4fdabcec691c85c24362373e95210b8bcb5a4f4f celery-5.2.0.tar.gz +9df7535b9a1e0120fe87f11f054c821e5f806b60833bda7dd37b850a3080b88798edfbeec1edcfb58aecc9c34406a32112f3e952e25cee3e5e79ae2f57ce0071 celery-5.2.3.tar.gz +93adb24f265746bbdd886e609100b19f358787d5545f188d56d5c1cd9aa87379c10eda76f5a3e0a103d829196e7622fad7fb3ff7c9cf47bbc8222d03b818d293 0001-Revert-try-newer-bumped-versions-7194.patch " diff --git a/sr.ht/py3-kombu/0001-Revert-test-amqp-v5.0.9-1462-try-pining-setuptools-1.patch b/sr.ht/py3-kombu/0001-Revert-test-amqp-v5.0.9-1462-try-pining-setuptools-1.patch new file mode 100644 index 0000000..2ea084f --- /dev/null +++ b/sr.ht/py3-kombu/0001-Revert-test-amqp-v5.0.9-1462-try-pining-setuptools-1.patch @@ -0,0 +1,36 @@ +From 4e2e737fff40faa1b0d4160ea172e5879c79ad35 Mon Sep 17 00:00:00 2001 +From: Drew DeVault +Date: Mon, 3 Jan 2022 10:46:29 +0100 +Subject: [PATCH] Revert "test amqp v5.0.9 (#1462)", "try pining setuptools + (#1466)" + +This reverts commit 4a6e1647b567d8fd90a50127def5345debd23d97. +This reverts commit 6ddf9409401e290e267c9c5041d92fdf5f47170d. +--- + requirements/default.txt | 2 +- + requirements/pkgutils.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/requirements/default.txt b/requirements/default.txt +index 6710e6d0..f122501b 100644 +--- a/requirements/default.txt ++++ b/requirements/default.txt +@@ -1,4 +1,4 @@ + importlib-metadata>=0.18; python_version<"3.8" + cached_property; python_version<"3.8" +-amqp>=5.0.9,<6.0.0 ++amqp>=5.0.7,<6.0.0 + vine +diff --git a/requirements/pkgutils.txt b/requirements/pkgutils.txt +index 8af47b45..0bc7d383 100644 +--- a/requirements/pkgutils.txt ++++ b/requirements/pkgutils.txt +@@ -1,4 +1,4 @@ +-setuptools>=59.1.1,<59.7.0 ++setuptools>=20.6.7 + wheel>=0.29.0 + flake8>=2.5.4 + tox>=2.3.1 +-- +2.34.1 + diff --git a/sr.ht/py3-kombu/APKBUILD b/sr.ht/py3-kombu/APKBUILD index 2dbe1ee..d44c922 100644 --- a/sr.ht/py3-kombu/APKBUILD +++ b/sr.ht/py3-kombu/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Drew DeVault pkgname=py3-kombu _pyname=kombu -pkgver=5.2.1 -pkgrel=1 +pkgver=5.2.3 +pkgrel=0 pkgdesc="A messaging library for Python" url="http://kombu.readthedocs.org" arch="noarch" @@ -10,7 +10,10 @@ 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" +source=" + https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz + 0001-Revert-test-amqp-v5.0.9-1462-try-pining-setuptools-1.patch +" builddir="$srcdir/$_pyname-$pkgver" build() { @@ -26,5 +29,6 @@ package() { } sha512sums=" -12fc3480651475ce8476424665ccf692a5bf1cbf4cd31c35eaa24419c316dc380357cfab0ca5d58ea275e870fa703d3ac258cb84f04886f9342e730aaaba6bf5 kombu-5.2.1.tar.gz +0e882063e89a25d324ccdf8745f11e1ea51443cc9a80b215e7f31c85053411cf1d5f26b5ffcd52165a15827ee036300a69a8a192af60d975a495a5a0b5ce3954 kombu-5.2.3.tar.gz +5206e6faaafd057197c561b1a97b1b2d7c7d49ea8e3674480fdcf5fd46fa989f7dd59d519ce88cdfb5c820245a9671823b88dcef8d7a3788dbb83c85da7ea33e 0001-Revert-test-amqp-v5.0.9-1462-try-pining-setuptools-1.patch " -- 2.45.2