[PR PATCH] python3-isort: update to 5.12.0, python3-pytest-isort: fix tests

[PR PATCH] python3-isort: update to 5.12.0, python3-pytest-isort: fix tests

[paper42]

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

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

https://github.com/paper42/void-packages isort
https://github.com/void-linux/void-packages/pull/41935

python3-isort: update to 5.12.0, python3-pytest-isort: fix tests
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-isort-41935.patch --]
[-- Type: text/x-diff, Size: 3575 bytes --]

From dab3c43f03af1c59de4bba0a75438d85e7ba7de6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 29 Jan 2023 11:38:59 +0100
Subject: [PATCH 1/2] python3-isort: update to 5.12.0.

---
 srcpkgs/python3-isort/template | 30 ++++++++++++++++++++++--------
 srcpkgs/python3-isort/update   |  1 +
 2 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/python3-isort/update

diff --git a/srcpkgs/python3-isort/template b/srcpkgs/python3-isort/template
index 4c0621bc0865..ef995797e6ca 100644
--- a/srcpkgs/python3-isort/template
+++ b/srcpkgs/python3-isort/template
@@ -1,20 +1,34 @@
 # Template file for 'python3-isort'
 pkgname=python3-isort
-version=5.10.1
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-setuptools"
-checkdepends="python3-pytest"
+version=5.12.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3"
+checkdepends="python3-pytest python3-hypothesis python3-colorama black git
+ python3-setuptools"
 short_desc="Python3 utility/library to sort imports"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://github.com/PyCQA/isort"
 changelog="https://raw.githubusercontent.com/PyCQA/isort/main/CHANGELOG.md"
 distfiles="${PYPI_SITE}/i/isort/isort-${version}.tar.gz"
-checksum=e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951
+checksum=8bef7dde241278824a6d83f44a544709b065191b95b6e50894bdc722fcba0504
 conflicts="python-isort>=0"
-make_check=no # needs many unpackaged dependencies
+make_check=no # FIXME
+
+do_check() {
+	rm -f tests/integration/test_hypothesmith.py # needs unpackaged libcst
+	rm -f tests/unit/test_pylama_isort.py # needs unpackaged pylama
+	rm -rf tmp # remove artifacts from previous unsuccessful check run
+	mkdir tmp
+	(
+		cd tmp
+		bsdtar xf ../dist/isort-$version-py3-none-any.whl
+	)
+	PYTHONPATH=tmp pytest
+	rm -rf tmp
+}
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-isort/update b/srcpkgs/python3-isort/update
new file mode 100644
index 000000000000..e957dc43055f
--- /dev/null
+++ b/srcpkgs/python3-isort/update
@@ -0,0 +1 @@
+ignore="*a* *b*"

From e564d1caaa57dc626abdb1b794119d196caf7ad0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 29 Jan 2023 11:52:40 +0100
Subject: [PATCH 2/2] python3-pytest-isort: fix tests

---
 srcpkgs/python3-pytest-isort/template | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pytest-isort/template b/srcpkgs/python3-pytest-isort/template
index c3566853a180..0647399edfa0 100644
--- a/srcpkgs/python3-pytest-isort/template
+++ b/srcpkgs/python3-pytest-isort/template
@@ -11,10 +11,19 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/stephrdev/pytest-isort"
 changelog="https://github.com/stephrdev/pytest-isort/raw/master/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/p/pytest_isort/pytest_isort-${version}.tar.gz"
-checksum=067801dc5e54a474330d074d521c815948ff6d5cf0ed3b9d057b78216851186c
-# cba for now
-make_check=no
+distfiles="https://github.com/stephrdev/pytest-isort/archive/refs/tags/${version}.tar.gz"
+checksum=c6994dd442e2fe50f2667d6fa6e14a5800192966b628cc31107c8f96c36a514b
+
+do_check() {
+	rm -rf tmp # remove artifacts from previous unsuccessful check run
+	mkdir tmp
+	(
+		cd tmp
+		bsdtar xf ../dist/pytest_isort-$version-py3-none-any.whl
+	)
+	PYTHONPATH=tmp pytest
+	rm -rf tmp
+}
 
 post_install() {
 	vlicense LICENSE.rst

Re: [PR PATCH] [Updated] python3-isort: update to 5.12.0, python3-pytest-isort: fix tests

[paper42]

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

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

https://github.com/paper42/void-packages isort
https://github.com/void-linux/void-packages/pull/41935

python3-isort: update to 5.12.0, python3-pytest-isort: fix tests
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-isort-41935.patch --]
[-- Type: text/x-diff, Size: 3545 bytes --]

From d544ebdcb783089808bef3ace0e0a6df4dcd08a5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 29 Jan 2023 11:38:59 +0100
Subject: [PATCH 1/2] python3-isort: update to 5.12.0.

---
 srcpkgs/python3-isort/template | 27 +++++++++++++++++++--------
 srcpkgs/python3-isort/update   |  1 +
 2 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/python3-isort/update

diff --git a/srcpkgs/python3-isort/template b/srcpkgs/python3-isort/template
index 4c0621bc0865..677e5fe36845 100644
--- a/srcpkgs/python3-isort/template
+++ b/srcpkgs/python3-isort/template
@@ -1,20 +1,31 @@
 # Template file for 'python3-isort'
 pkgname=python3-isort
-version=5.10.1
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-setuptools"
-checkdepends="python3-pytest"
+version=5.12.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3"
+checkdepends="python3-pytest python3-hypothesis python3-colorama black git
+ python3-setuptools"
 short_desc="Python3 utility/library to sort imports"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://github.com/PyCQA/isort"
 changelog="https://raw.githubusercontent.com/PyCQA/isort/main/CHANGELOG.md"
 distfiles="${PYPI_SITE}/i/isort/isort-${version}.tar.gz"
-checksum=e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951
+checksum=8bef7dde241278824a6d83f44a544709b065191b95b6e50894bdc722fcba0504
 conflicts="python-isort>=0"
-make_check=no # needs many unpackaged dependencies
+make_check=no # FIXME
+
+do_check() {
+	rm -f tests/integration/test_hypothesmith.py # needs unpackaged libcst
+	rm -f tests/unit/test_pylama_isort.py # needs unpackaged pylama
+	rm -rf tmp # remove artifacts from previous unsuccessful check run
+	mkdir tmp
+	bsdtar xf ../dist/isort-$version-py3-none-any.whl -C tmp
+	PYTHONPATH=tmp pytest
+	rm -rf tmp
+}
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-isort/update b/srcpkgs/python3-isort/update
new file mode 100644
index 000000000000..e957dc43055f
--- /dev/null
+++ b/srcpkgs/python3-isort/update
@@ -0,0 +1 @@
+ignore="*a* *b*"

From 9dc9e3be81333df40a5c34c2159ec653c5fc93b9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 29 Jan 2023 11:52:40 +0100
Subject: [PATCH 2/2] python3-pytest-isort: fix tests

---
 srcpkgs/python3-pytest-isort/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pytest-isort/template b/srcpkgs/python3-pytest-isort/template
index c3566853a180..f1a52c495311 100644
--- a/srcpkgs/python3-pytest-isort/template
+++ b/srcpkgs/python3-pytest-isort/template
@@ -11,10 +11,16 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/stephrdev/pytest-isort"
 changelog="https://github.com/stephrdev/pytest-isort/raw/master/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/p/pytest_isort/pytest_isort-${version}.tar.gz"
-checksum=067801dc5e54a474330d074d521c815948ff6d5cf0ed3b9d057b78216851186c
-# cba for now
-make_check=no
+distfiles="https://github.com/stephrdev/pytest-isort/archive/refs/tags/${version}.tar.gz"
+checksum=c6994dd442e2fe50f2667d6fa6e14a5800192966b628cc31107c8f96c36a514b
+
+do_check() {
+	rm -rf tmp # remove artifacts from previous unsuccessful check run
+	mkdir tmp
+	bsdtar xf ../dist/pytest_isort-$version-py3-none-any.whl -C tmp
+	PYTHONPATH=tmp pytest
+	rm -rf tmp
+}
 
 post_install() {
 	vlicense LICENSE.rst

Re: [PR PATCH] [Updated] python3-isort: update to 5.12.0, python3-pytest-isort: fix tests

[paper42]

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

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

https://github.com/paper42/void-packages isort
https://github.com/void-linux/void-packages/pull/41935

python3-isort: update to 5.12.0, python3-pytest-isort: fix tests
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-isort-41935.patch --]
[-- Type: text/x-diff, Size: 3539 bytes --]

From 04dd0722210551fda0e1b38c8b5bd11630e96588 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 29 Jan 2023 11:38:59 +0100
Subject: [PATCH 1/2] python3-isort: update to 5.12.0.

---
 srcpkgs/python3-isort/template | 27 +++++++++++++++++++--------
 srcpkgs/python3-isort/update   |  1 +
 2 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/python3-isort/update

diff --git a/srcpkgs/python3-isort/template b/srcpkgs/python3-isort/template
index 4c0621bc0865..93277562df6f 100644
--- a/srcpkgs/python3-isort/template
+++ b/srcpkgs/python3-isort/template
@@ -1,20 +1,31 @@
 # Template file for 'python3-isort'
 pkgname=python3-isort
-version=5.10.1
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-setuptools"
-checkdepends="python3-pytest"
+version=5.12.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3"
+checkdepends="python3-pytest python3-hypothesis python3-colorama black git
+ python3-setuptools"
 short_desc="Python3 utility/library to sort imports"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://github.com/PyCQA/isort"
 changelog="https://raw.githubusercontent.com/PyCQA/isort/main/CHANGELOG.md"
 distfiles="${PYPI_SITE}/i/isort/isort-${version}.tar.gz"
-checksum=e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951
+checksum=8bef7dde241278824a6d83f44a544709b065191b95b6e50894bdc722fcba0504
 conflicts="python-isort>=0"
-make_check=no # needs many unpackaged dependencies
+make_check=no # FIXME
+
+do_check() {
+	rm -f tests/integration/test_hypothesmith.py # needs unpackaged libcst
+	rm -f tests/unit/test_pylama_isort.py # needs unpackaged pylama
+	rm -rf tmp # remove artifacts from previous unsuccessful check run
+	mkdir tmp
+	bsdtar xf dist/isort-$version-py3-none-any.whl -C tmp
+	PYTHONPATH=tmp pytest
+	rm -rf tmp
+}
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-isort/update b/srcpkgs/python3-isort/update
new file mode 100644
index 000000000000..e957dc43055f
--- /dev/null
+++ b/srcpkgs/python3-isort/update
@@ -0,0 +1 @@
+ignore="*a* *b*"

From 39d4999a7b1ca9419825682ab18520a4ed7f89a7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 29 Jan 2023 11:52:40 +0100
Subject: [PATCH 2/2] python3-pytest-isort: fix tests

---
 srcpkgs/python3-pytest-isort/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pytest-isort/template b/srcpkgs/python3-pytest-isort/template
index c3566853a180..67d7abfa939f 100644
--- a/srcpkgs/python3-pytest-isort/template
+++ b/srcpkgs/python3-pytest-isort/template
@@ -11,10 +11,16 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/stephrdev/pytest-isort"
 changelog="https://github.com/stephrdev/pytest-isort/raw/master/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/p/pytest_isort/pytest_isort-${version}.tar.gz"
-checksum=067801dc5e54a474330d074d521c815948ff6d5cf0ed3b9d057b78216851186c
-# cba for now
-make_check=no
+distfiles="https://github.com/stephrdev/pytest-isort/archive/refs/tags/${version}.tar.gz"
+checksum=c6994dd442e2fe50f2667d6fa6e14a5800192966b628cc31107c8f96c36a514b
+
+do_check() {
+	rm -rf tmp # remove artifacts from previous unsuccessful check run
+	mkdir tmp
+	bsdtar xf dist/pytest_isort-$version-py3-none-any.whl -C tmp
+	PYTHONPATH=tmp pytest
+	rm -rf tmp
+}
 
 post_install() {
 	vlicense LICENSE.rst

Re: python3-isort: update to 5.12.0, python3-pytest-isort: fix tests

[icp1994]

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

New comment by icp1994 on void-packages repository

https://github.com/void-linux/void-packages/pull/41935#issuecomment-1407678012

Comment:
Maybe it's worth modifying do_check() to test after unpacking the wheel for pep5157 builds as Gentoo does. This pattern feels a bit verbose to be included in every pep517 template which requires package metadata for tests.

Re: python3-isort: update to 5.12.0, python3-pytest-isort: fix tests

[icp1994]

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

New comment by icp1994 on void-packages repository

https://github.com/void-linux/void-packages/pull/41935#issuecomment-1407678012

Comment:
Maybe it's worth modifying do_check() to test after unpacking the wheel for pep517 build-style as Gentoo does. This pattern feels a bit verbose to be included in every pep517 template which requires package metadata for tests.

Re: python3-isort: update to 5.12.0, python3-pytest-isort: fix tests

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41935#issuecomment-1408200787

Comment:
> Maybe it's worth modifying do_check() to test after unpacking the wheel for pep517 build-style as Gentoo does. This pattern feels a bit verbose to be included in every pep517 template which requires package metadata for tests.

I agree, but some pep517 packages don't need this for tests and I am not familiar enough with python's build systems to know why.

Re: python3-isort: update to 5.12.0, python3-pytest-isort: fix tests

[icp1994]

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

New comment by icp1994 on void-packages repository

https://github.com/void-linux/void-packages/pull/41935#issuecomment-1412190215

Comment:
Took a stab at it in https://github.com/void-linux/void-packages/pull/42013

Re: [PR PATCH] [Merged]: python3-isort: update to 5.12.0, python3-pytest-isort: fix tests

[paper42]

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

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

python3-isort: update to 5.12.0, python3-pytest-isort: fix tests
https://github.com/void-linux/void-packages/pull/41935

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->