From ccfe18903c19420d80ba84c9ed9861c4d7986417 Mon Sep 17 00:00:00 2001 From: fossdd Date: Fri, 30 Aug 2024 19:42:48 +0200 Subject: [PATCH] main/py3-markdown: upgrade to 3.7, take over maintainership https://github.com/Python-Markdown/markdown/releases/tag/3.7 --- main/py3-markdown/APKBUILD | 14 ++++++----- .../use-correct-import-path-in-abbr-py.patch | 23 +++++++++++++++++++ 2 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 main/py3-markdown/use-correct-import-path-in-abbr-py.patch diff --git a/main/py3-markdown/APKBUILD b/main/py3-markdown/APKBUILD index 5feeb2432c6..5f8c47b187b 100644 --- a/main/py3-markdown/APKBUILD +++ b/main/py3-markdown/APKBUILD @@ -1,8 +1,7 @@ # Contributor: Fabian Affolter -# Maintainer: Fabian Affolter +# Maintainer: fossdd pkgname=py3-markdown -_pkgname=Markdown -pkgver=3.6 +pkgver=3.7 pkgrel=0 pkgdesc="Python3 implementation of Markdown" url="https://python-markdown.github.io/" @@ -15,8 +14,10 @@ makedepends=" " checkdepends="py3-coverage py3-yaml" subpackages="$pkgname-pyc" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" -builddir="$srcdir/$_pkgname-$pkgver" +source="$pkgname-$pkgver.tar.gz::https://github.com/Python-Markdown/markdown/archive/refs/tags/$pkgver.tar.gz + use-correct-import-path-in-abbr-py.patch + " +builddir="$srcdir/markdown-$pkgver" replaces="py-markdown" # Backwards compatibility provides="py-markdown=$pkgver-r$pkgrel" # Backwards compatibility @@ -39,5 +40,6 @@ package() { } sha512sums=" -a523f75ea72fa71f4f0f1a59523bb1a6c5c7605ba5a0be4dc37aa5bd5c87e32563f5253404485c99c13caa27501c9003aea524154a7999a22e6497829492b997 py3-markdown-3.6.tar.gz +f4777f32e8203cc8e41a5aaf7c6afa41e4354e065315e4b926e1ebb44e28db293f6b5f43cd546485b5249aebe01d73e8c1e16bcc9ce0c38aebe73e0a590d4df6 py3-markdown-3.7.tar.gz +fd45c2c210b9b9bdf1e751bacb25a48046319e359d341d69dd6ab85538f53362b08df0aef1726aa9557cb55a111efe7a06788d15bed9d516d567da6d709fe991 use-correct-import-path-in-abbr-py.patch " diff --git a/main/py3-markdown/use-correct-import-path-in-abbr-py.patch b/main/py3-markdown/use-correct-import-path-in-abbr-py.patch new file mode 100644 index 00000000000..9c2a60d7989 --- /dev/null +++ b/main/py3-markdown/use-correct-import-path-in-abbr-py.patch @@ -0,0 +1,23 @@ +From fc74d69758ff288e26ff616c703b22ce5a02a68a Mon Sep 17 00:00:00 2001 +From: sobolevn +Date: Tue, 20 Aug 2024 22:37:46 +0300 +Subject: [PATCH] Use correct import path in `abbr.py` + +This is the module: https://github.com/Python-Markdown/markdown/blob/master/markdown/blockparser.py +--- + markdown/extensions/abbr.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/markdown/extensions/abbr.py b/markdown/extensions/abbr.py +index 693c3bba..6b079ae2 100644 +--- a/markdown/extensions/abbr.py ++++ b/markdown/extensions/abbr.py +@@ -33,7 +33,7 @@ + + if TYPE_CHECKING: # pragma: no cover + from .. import Markdown +- from ..blockparsers import BlockParser ++ from ..blockparser import BlockParser + + + class AbbrExtension(Extension):