Re: [PR PATCH] [Updated] flake8: update to 3.9.2

[paper42 <paper42@users.noreply.github.com>]

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

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

https://github.com/paper42/void-packages flake8-3.9.2
https://github.com/void-linux/void-packages/pull/30973

flake8: update to 3.9.2
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/30973.patch is attached

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

From 9caf336920c1a60fc7070ba9e05f85d66b777321 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 18 May 2021 09:01:16 +0200
Subject: [PATCH 1/4] python3-pycodestyle: update to 2.7.0

* adopt
* drop python-pycodestyle
* fix tests
---
 srcpkgs/python-pycodestyle                    |  1 +
 srcpkgs/python-pycodestyle/template           | 30 ---------------
 srcpkgs/python3-pycodestyle                   |  1 -
 srcpkgs/python3-pycodestyle/template          | 37 +++++++++++++++++++
 .../update                                    |  0
 5 files changed, 38 insertions(+), 31 deletions(-)
 create mode 120000 srcpkgs/python-pycodestyle
 delete mode 100644 srcpkgs/python-pycodestyle/template
 delete mode 120000 srcpkgs/python3-pycodestyle
 create mode 100644 srcpkgs/python3-pycodestyle/template
 rename srcpkgs/{python-pycodestyle => python3-pycodestyle}/update (100%)

diff --git a/srcpkgs/python-pycodestyle b/srcpkgs/python-pycodestyle
new file mode 120000
index 000000000000..d970ab6f8dc3
--- /dev/null
+++ b/srcpkgs/python-pycodestyle
@@ -0,0 +1 @@
+python3-pycodestyle
\ No newline at end of file
diff --git a/srcpkgs/python-pycodestyle/template b/srcpkgs/python-pycodestyle/template
deleted file mode 100644
index 157a5d5f9fc1..000000000000
--- a/srcpkgs/python-pycodestyle/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-pycodestyle'
-pkgname=python-pycodestyle
-version=2.6.0
-revision=3
-wrksrc="pycodestyle-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-short_desc="Python2 style guide checker (formerly called pep8)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/PyCQA/pycodestyle"
-distfiles="${PYPI_SITE}/p/pycodestyle/pycodestyle-${version}.tar.gz"
-checksum=c58a7d2815e0e8d7972bf1803331fb0152f867bd89adf8a01dfd55085434192e
-alternatives="pycodestyle:pycodestyle:/usr/bin/pycodestyle2"
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-pycodestyle_package() {
-	depends="python3-setuptools"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="pycodestyle:pycodestyle:/usr/bin/pycodestyle3"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-pycodestyle b/srcpkgs/python3-pycodestyle
deleted file mode 120000
index f253ce6d35f8..000000000000
--- a/srcpkgs/python3-pycodestyle
+++ /dev/null
@@ -1 +0,0 @@
-python-pycodestyle
\ No newline at end of file
diff --git a/srcpkgs/python3-pycodestyle/template b/srcpkgs/python3-pycodestyle/template
new file mode 100644
index 000000000000..8fafc98015d4
--- /dev/null
+++ b/srcpkgs/python3-pycodestyle/template
@@ -0,0 +1,37 @@
+# Template file for 'python3-pycodestyle'
+pkgname=python3-pycodestyle
+version=2.7.0
+revision=1
+wrksrc="pycodestyle-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python style guide checker (formerly called pep8)"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="MIT"
+homepage="https://github.com/PyCQA/pycodestyle"
+distfiles="${PYPI_SITE}/p/pycodestyle/pycodestyle-${version}.tar.gz"
+checksum=c389c1d06bf7904078ca03399a4816f974a1d590090fecea0c63ec26ebaf1cef
+
+do_check() {
+	# from tox.ini and alpine
+	python3 -m pycodestyle --statistics pycodestyle.py
+	python3 -m pycodestyle --max-doc-length=72 --testsuite testsuite
+	python3 -m pycodestyle --max-doc-length=72 --doctest
+	python3 -m unittest discover testsuite -vv
+
+	python -m pycodestyle --statistics pycodestyle.py
+	python -m pycodestyle --max-doc-length=72 --testsuite testsuite
+	python -m pycodestyle --max-doc-length=72 --doctest
+	python -m unittest discover testsuite -vv
+}
+
+post_install() {
+	vlicense LICENSE
+}
+
+python-pycodestyle_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="python3-pycodestyle>=${version}_${revision}"
+}
diff --git a/srcpkgs/python-pycodestyle/update b/srcpkgs/python3-pycodestyle/update
similarity index 100%
rename from srcpkgs/python-pycodestyle/update
rename to srcpkgs/python3-pycodestyle/update

From 239eb00d40a8fabb15bd108b96df5a4633bf4969 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 18 May 2021 09:06:35 +0200
Subject: [PATCH 2/4] python3-mccabe: run tests, adopt

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

diff --git a/srcpkgs/python3-mccabe/template b/srcpkgs/python3-mccabe/template
index 8f7efe4d78f3..a95ed189baa4 100644
--- a/srcpkgs/python3-mccabe/template
+++ b/srcpkgs/python3-mccabe/template
@@ -6,8 +6,9 @@ wrksrc="mccabe-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="McCabe complexity checker for Python3"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek>"
 license="MIT"
 homepage="https://github.com/PyCQA/mccabe"
 distfiles="${PYPI_SITE}/m/mccabe/mccabe-${version}.tar.gz"
@@ -17,6 +18,7 @@ replaces="mccabe>=0"
 pre_build() {
 	vsed -i '/setup_requires=/d' setup.py
 }
+
 post_install() {
 	vlicense LICENSE
 }

From 74f80488727f296440ca4551be6a623a513a56f6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 10 Apr 2021 17:25:21 +0200
Subject: [PATCH 3/4] python3-pyflakes: update to 2.3.1

* adopt
---
 srcpkgs/python3-pyflakes/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-pyflakes/template b/srcpkgs/python3-pyflakes/template
index f0a017a14bb4..4df551fa236e 100644
--- a/srcpkgs/python3-pyflakes/template
+++ b/srcpkgs/python3-pyflakes/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-pyflakes'
 pkgname=python3-pyflakes
-version=2.2.0
-revision=3
+version=2.3.1
+revision=1
 wrksrc="pyflakes-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools"
+depends="python3"
 short_desc="Passive checker of Python programs (Python3)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://github.com/PyCQA/pyflakes"
 distfiles="${PYPI_SITE}/p/pyflakes/pyflakes-${version}.tar.gz"
-checksum=35b2d75ee967ea93b55750aa9edbbf72813e06a66ba54438df2cfac9e3c27fc8
+checksum=f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db
 conflicts="python-pyflakes>=0"
 
 post_install() {

From 1f7aa732617069aadd4f5e5523cfe10cdba53621 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 5 Jul 2021 21:27:02 +0200
Subject: [PATCH 4/4] flake8: update to 3.9.2

* adopt
* fix tests
---
 srcpkgs/flake8/template | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/flake8/template b/srcpkgs/flake8/template
index 8a7d34b0e81b..4d2731350bee 100644
--- a/srcpkgs/flake8/template
+++ b/srcpkgs/flake8/template
@@ -1,22 +1,26 @@
 # Template file for 'flake8'
 pkgname=flake8
-version=3.8.4
+version=3.9.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-pycodestyle>=2.6.0<2.7.0
- python3-pyflakes>=2.2.0<2.3.0 python3-mccabe>=0.6.0<0.7.0
- python3-entrypoints>=0.3<0.4"
-checkdepends="python3-mock python3-pycodestyle python3-pytest python3-pyflakes"
+depends="python3-pycodestyle>=2.7.0<2.8.0 python3-pyflakes>=2.3.0<2.4.0
+ python3-mccabe>=0.6.0<0.7.0 python3-entrypoints>=0.3<0.4"
+checkdepends="$depends python3-mock python3-pytest"
 short_desc="Modular source code checker: pycodestyle, pyflakes, mccabe"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://gitlab.com/pycqa/flake8"
 distfiles="${PYPI_SITE}/f/flake8/flake8-${version}.tar.gz"
-checksum=aadae8761ec651813c24be05c6f7b4680857ef6afaae4651a4eccaef97ce6c3b
+checksum=07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b
 
 do_check() {
-	PYTHONPATH="${wrksrc}/src" python3 -m pytest
+	# from alpine
+	PYTHONPATH=build/lib python3 -m pytest \
+			--deselect=tests/integration/test_api_legacy.py::test_legacy_api \
+			--deselect=tests/integration/test_main.py \
+			--deselect=tests/integration/test_plugins.py \
+			--deselect=tests/unit/test_setuptools_command.py::test_package_files_removes_submodules
 }
 
 post_install() {