[PR PATCH] python-Markdown: add python_version

[PR PATCH] python-Markdown: add python_version

[fosslinux]

[-- Attachment #1: Type: text/plain, Size: 347 bytes --]

There is a new pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages python-Markdown-python-version
https://github.com/void-linux/void-packages/pull/21317

python-Markdown: add python_version


A patch file from https://github.com/void-linux/void-packages/pull/21317.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python-Markdown-python-version-21317.patch --]
[-- Type: text/x-diff, Size: 786 bytes --]

From 90dd40e6e884d83c50b47ca091075d41330f5f8d Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 25 Apr 2020 08:40:23 +1000
Subject: [PATCH] python-Markdown: add python_version

---
 srcpkgs/python-Markdown/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/python-Markdown/template b/srcpkgs/python-Markdown/template
index 3996f9ecf8a..3c2f3b4c0d7 100644
--- a/srcpkgs/python-Markdown/template
+++ b/srcpkgs/python-Markdown/template
@@ -15,6 +15,7 @@ license="3-clause-BSD"
 distfiles="${PYPI_SITE}/M/Markdown/Markdown-${version}.tar.gz"
 checksum=2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a
 alternatives="markdown:markdown_py:/usr/bin/markdown_py2"
+python_version=2
 
 post_install() {
 	vlicense LICENSE.md LICENSE

Re: python-Markdown: add python_version

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 274 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/21317#issuecomment-619276739

Comment:
should be build_style=python2-module and revbumped instead

04-create-xbps-metadata-scripts.sh is buggy here, thanks for catching

Re: [PR PATCH] [Updated] python-Markdown: add python_version

[fosslinux]

[-- Attachment #1: Type: text/plain, Size: 352 bytes --]

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages python-Markdown-python-version
https://github.com/void-linux/void-packages/pull/21317

python-Markdown: add python_version


A patch file from https://github.com/void-linux/void-packages/pull/21317.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python-Markdown-python-version-21317.patch --]
[-- Type: text/x-diff, Size: 845 bytes --]

From 0b0262655f13646571a758448b6fc905eeb645b6 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 25 Apr 2020 08:40:23 +1000
Subject: [PATCH] python-Markdown: use python2-module build style

---
 srcpkgs/python-Markdown/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-Markdown/template b/srcpkgs/python-Markdown/template
index 3996f9ecf8a..19d8a1ab5f9 100644
--- a/srcpkgs/python-Markdown/template
+++ b/srcpkgs/python-Markdown/template
@@ -1,10 +1,10 @@
 # Template file for 'python-Markdown'
 pkgname=python-Markdown
 version=3.1.1
-revision=2
+revision=3
 archs=noarch
 wrksrc="Markdown-${version}"
-build_style=python-module
+build_style=python2-module
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-setuptools"
 pycompile_module="markdown"

Re: python-Markdown: add python_version

[fosslinux]

[-- Attachment #1: Type: text/plain, Size: 164 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/21317#issuecomment-619278077

Comment:
@Chocimier  thanks :)

Re: [PR PATCH] [Updated] python-Markdown: add python_version

[fosslinux]

[-- Attachment #1: Type: text/plain, Size: 352 bytes --]

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages python-Markdown-python-version
https://github.com/void-linux/void-packages/pull/21317

python-Markdown: add python_version


A patch file from https://github.com/void-linux/void-packages/pull/21317.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python-Markdown-python-version-21317.patch --]
[-- Type: text/x-diff, Size: 1332 bytes --]

From d2c028b562ec0d1e6750752591a652654378f7de Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 25 Apr 2020 08:40:23 +1000
Subject: [PATCH] python-Markdown: use python2-module build style, fix xlint

---
 srcpkgs/python-Markdown/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python-Markdown/template b/srcpkgs/python-Markdown/template
index 3996f9ecf8a..d1c06ae675c 100644
--- a/srcpkgs/python-Markdown/template
+++ b/srcpkgs/python-Markdown/template
@@ -1,17 +1,17 @@
 # Template file for 'python-Markdown'
 pkgname=python-Markdown
 version=3.1.1
-revision=2
+revision=3
 archs=noarch
 wrksrc="Markdown-${version}"
-build_style=python-module
+build_style=python2-module
+pycompile_module="markdown"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-setuptools"
-pycompile_module="markdown"
 short_desc="Python2 implementation of John Gruber's Markdown"
 maintainer="Peter Bui <pbui@github.bx612.space>"
-homepage="https://github.com/waylan/Python-Markdown"
 license="3-clause-BSD"
+homepage="https://github.com/waylan/Python-Markdown"
 distfiles="${PYPI_SITE}/M/Markdown/Markdown-${version}.tar.gz"
 checksum=2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a
 alternatives="markdown:markdown_py:/usr/bin/markdown_py2"

Re: python-Markdown: add python_version

[fosslinux]

[-- Attachment #1: Type: text/plain, Size: 218 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/21317#issuecomment-619307716

Comment:
@Chocimier Is xlint correct in saying `pycompile_module` should be removed?

Re: [PR PATCH] [Updated] python-Markdown: add python_version

[fosslinux]

[-- Attachment #1: Type: text/plain, Size: 352 bytes --]

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages python-Markdown-python-version
https://github.com/void-linux/void-packages/pull/21317

python-Markdown: add python_version


A patch file from https://github.com/void-linux/void-packages/pull/21317.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python-Markdown-python-version-21317.patch --]
[-- Type: text/x-diff, Size: 1272 bytes --]

From cc290b11e7a3786a505a6cd8a1d2fcb28ee87da8 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 25 Apr 2020 08:40:23 +1000
Subject: [PATCH] python-Markdown: use python2-module build style, fix xlint

---
 srcpkgs/python-Markdown/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python-Markdown/template b/srcpkgs/python-Markdown/template
index 3996f9ecf8a..c97f733bd3c 100644
--- a/srcpkgs/python-Markdown/template
+++ b/srcpkgs/python-Markdown/template
@@ -1,17 +1,16 @@
 # Template file for 'python-Markdown'
 pkgname=python-Markdown
 version=3.1.1
-revision=2
+revision=3
 archs=noarch
 wrksrc="Markdown-${version}"
-build_style=python-module
+build_style=python2-module
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-setuptools"
-pycompile_module="markdown"
 short_desc="Python2 implementation of John Gruber's Markdown"
 maintainer="Peter Bui <pbui@github.bx612.space>"
+license="BSD-3-Clause"
 homepage="https://github.com/waylan/Python-Markdown"
-license="3-clause-BSD"
 distfiles="${PYPI_SITE}/M/Markdown/Markdown-${version}.tar.gz"
 checksum=2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a
 alternatives="markdown:markdown_py:/usr/bin/markdown_py2"

Re: python-Markdown: add python_version

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 435 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/21317#issuecomment-619336957

Comment:
Yes, here there is regular python module, so `pycompile_module` don't need to be set.

Executable need to be moved with `mv ${DESTDIR}/usr/bin/markdown_py ${DESTDIR}/usr/bin/markdown_py2` to fix alternative, in python3-Markdown too. python3-setuptools is not needed here. Will you update?

Re: python-Markdown: add python_version

[fosslinux]

[-- Attachment #1: Type: text/plain, Size: 209 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/21317#issuecomment-619446886

Comment:
Sure. Also, does `python-setuptools` really need to be in depends?

Re: [PR PATCH] [Updated] python-Markdown: add python_version

[fosslinux]

[-- Attachment #1: Type: text/plain, Size: 352 bytes --]

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages python-Markdown-python-version
https://github.com/void-linux/void-packages/pull/21317

python-Markdown: add python_version


A patch file from https://github.com/void-linux/void-packages/pull/21317.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python-Markdown-python-version-21317.patch --]
[-- Type: text/x-diff, Size: 2142 bytes --]

From 5537b0a85483a7c15fc086d3a30be35704d1301b Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 25 Apr 2020 08:40:23 +1000
Subject: [PATCH 1/2] python-Markdown: use python2-module build style, fix
 xlint, fix alternatives

---
 srcpkgs/python-Markdown/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python-Markdown/template b/srcpkgs/python-Markdown/template
index 3996f9ecf8a..fa75ca590cc 100644
--- a/srcpkgs/python-Markdown/template
+++ b/srcpkgs/python-Markdown/template
@@ -1,21 +1,21 @@
 # Template file for 'python-Markdown'
 pkgname=python-Markdown
 version=3.1.1
-revision=2
+revision=3
 archs=noarch
 wrksrc="Markdown-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python-setuptools"
-pycompile_module="markdown"
 short_desc="Python2 implementation of John Gruber's Markdown"
 maintainer="Peter Bui <pbui@github.bx612.space>"
+license="BSD-3-Clause"
 homepage="https://github.com/waylan/Python-Markdown"
-license="3-clause-BSD"
 distfiles="${PYPI_SITE}/M/Markdown/Markdown-${version}.tar.gz"
 checksum=2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a
 alternatives="markdown:markdown_py:/usr/bin/markdown_py2"
 
 post_install() {
 	vlicense LICENSE.md LICENSE
+	mv ${DESTDIR}/usr/bin/markdown_py ${DESTDIR}/usr/bin/markdown_py2
 }

From c4a995ff847e20e455e15db045c072c0eefc72c2 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 26 Apr 2020 08:08:22 +1000
Subject: [PATCH 2/2] python3-Markdown: fix alternatives

---
 srcpkgs/python3-Markdown/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/python3-Markdown/template b/srcpkgs/python3-Markdown/template
index 4c3b30d5e68..04116feaddf 100644
--- a/srcpkgs/python3-Markdown/template
+++ b/srcpkgs/python3-Markdown/template
@@ -17,4 +17,5 @@ alternatives="markdown:markdown_py:/usr/bin/markdown_py3"
 
 post_install() {
 	vlicense LICENSE.md LICENSE
+	mv ${DESTDIR}/usr/bin/markdown_py ${DESTDIR}/usr/bin/markdown_py3
 }

Re: python-Markdown: add python_version

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 234 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/21317#issuecomment-620217929

Comment:
Yes, executable uses module from python-setuptools.

Please revbump python3-Markdown too.

Re: [PR PATCH] [Updated] python-Markdown: add python_version

[fosslinux]

[-- Attachment #1: Type: text/plain, Size: 352 bytes --]

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages python-Markdown-python-version
https://github.com/void-linux/void-packages/pull/21317

python-Markdown: add python_version


A patch file from https://github.com/void-linux/void-packages/pull/21317.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python-Markdown-python-version-21317.patch --]
[-- Type: text/x-diff, Size: 2353 bytes --]

From 5537b0a85483a7c15fc086d3a30be35704d1301b Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 25 Apr 2020 08:40:23 +1000
Subject: [PATCH 1/2] python-Markdown: use python2-module build style, fix
 xlint, fix alternatives

---
 srcpkgs/python-Markdown/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python-Markdown/template b/srcpkgs/python-Markdown/template
index 3996f9ecf8a..fa75ca590cc 100644
--- a/srcpkgs/python-Markdown/template
+++ b/srcpkgs/python-Markdown/template
@@ -1,21 +1,21 @@
 # Template file for 'python-Markdown'
 pkgname=python-Markdown
 version=3.1.1
-revision=2
+revision=3
 archs=noarch
 wrksrc="Markdown-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python-setuptools"
-pycompile_module="markdown"
 short_desc="Python2 implementation of John Gruber's Markdown"
 maintainer="Peter Bui <pbui@github.bx612.space>"
+license="BSD-3-Clause"
 homepage="https://github.com/waylan/Python-Markdown"
-license="3-clause-BSD"
 distfiles="${PYPI_SITE}/M/Markdown/Markdown-${version}.tar.gz"
 checksum=2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a
 alternatives="markdown:markdown_py:/usr/bin/markdown_py2"
 
 post_install() {
 	vlicense LICENSE.md LICENSE
+	mv ${DESTDIR}/usr/bin/markdown_py ${DESTDIR}/usr/bin/markdown_py2
 }

From d3fc0e9727ffaf5b55fc3fb530186e668108ad95 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 26 Apr 2020 08:08:22 +1000
Subject: [PATCH 2/2] python3-Markdown: fix alternatives

---
 srcpkgs/python3-Markdown/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Markdown/template b/srcpkgs/python3-Markdown/template
index 4c3b30d5e68..6d2141656e2 100644
--- a/srcpkgs/python3-Markdown/template
+++ b/srcpkgs/python3-Markdown/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Markdown'
 pkgname=python3-Markdown
 version=3.2.1
-revision=2
+revision=3
 archs=noarch
 wrksrc="Markdown-${version}"
 build_style=python3-module
@@ -17,4 +17,5 @@ alternatives="markdown:markdown_py:/usr/bin/markdown_py3"
 
 post_install() {
 	vlicense LICENSE.md LICENSE
+	mv ${DESTDIR}/usr/bin/markdown_py ${DESTDIR}/usr/bin/markdown_py3
 }

Re: python-Markdown: add python_version

[fosslinux]

[-- Attachment #1: Type: text/plain, Size: 189 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/21317#issuecomment-620895496

Comment:
> Please revbump python3-Markdown too.

Done

Re: python-Markdown: add python_version

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 153 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/21317#issuecomment-620903085

Comment:
Thank you.

Re: [PR PATCH] [Merged]: python-Markdown: add python_version

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 169 bytes --]

There's a merged pull request on the void-packages repository

python-Markdown: add python_version
https://github.com/void-linux/void-packages/pull/21317

Description: