[update] devel/flake8

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[update] devel/flake8

Paco Esteban
Hi ports@,

And finally, the fresh diff for devel/flake8

For reference:

https://marc.info/?l=openbsd-ports&m=156101812530722&w=2

And the updated diff:

cvs server: Diffing .
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/flake8/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 12 Jul 2019 20:44:08 -0000 1.17
+++ Makefile 25 Jul 2019 08:07:08 -0000
@@ -2,9 +2,8 @@
 
 COMMENT = modular python code checker wrapping pep8 and pyflakes
 
-MODPY_EGG_VERSION = 3.5.0
+MODPY_EGG_VERSION = 3.7.7
 DISTNAME = flake8-${MODPY_EGG_VERSION}
-REVISION = 1
 
 CATEGORIES = devel
 
@@ -24,6 +23,7 @@ MODPY_PYTEST_ARGS = tests
 TEST_DEPENDS = devel/py-mock${MODPY_FLAVOR}
 
 RUN_DEPENDS = devel/py-codestyle${MODPY_FLAVOR} \
+ devel/py-entrypoints${MODPY_FLAVOR} \
  devel/py-mccabe${MODPY_FLAVOR} \
  devel/pyflakes${MODPY_FLAVOR}
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/flake8/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 21 Jan 2018 23:49:25 -0000 1.7
+++ distinfo 25 Jul 2019 08:07:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (flake8-3.5.0.tar.gz) = clMmX3q9izE+OJKUQESjZeP0rD/Nz7Qpj1Xund8Yi6A=
-SIZE (flake8-3.5.0.tar.gz) = 140608
+SHA256 (flake8-3.7.7.tar.gz) = hZmWBz80HyZwdBtR7B5noB2hQoMaof3GJC2/iN/75mE=
+SIZE (flake8-3.7.7.tar.gz) = 148457
cvs server: Diffing patches
Index: patches/patch-setup_py
===================================================================
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- patches/patch-setup_py 21 Jan 2018 23:49:25 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.7 2018/01/21 23:49:25 danj Exp $
-
-Index: setup.py
---- setup.py.orig
-+++ setup.py
-@@ -24,7 +24,6 @@ requires = [
-     "pyflakes >= 1.5.0, < 1.7.0",
-     "pycodestyle >= 2.0.0, < 2.4.0",
-     "mccabe >= 0.6.0, < 0.7.0",
--    "setuptools >= 30",
- ]
-
- extras_require = {
cvs server: Diffing pkg
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/flake8/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 21 Jan 2018 23:49:25 -0000 1.5
+++ pkg/PLIST 25 Jul 2019 08:07:08 -0000
@@ -10,7 +10,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/flake8/__init__.py
 lib/python${MODPY_VERSION}/site-packages/flake8/__main__.py
-lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}checker.${MODPY_PYC_MAGIC_TAG}pyc
@@ -22,7 +22,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/api/
 lib/python${MODPY_VERSION}/site-packages/flake8/api/__init__.py
-lib/python${MODPY_VERSION}/site-packages/flake8/api/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/flake8/api/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/flake8/api/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/api/${MODPY_PYCACHE}legacy.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/api/legacy.py
@@ -31,7 +31,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/flake8/exceptions.py
 lib/python${MODPY_VERSION}/site-packages/flake8/formatting/
 lib/python${MODPY_VERSION}/site-packages/flake8/formatting/__init__.py
-lib/python${MODPY_VERSION}/site-packages/flake8/formatting/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/flake8/formatting/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/flake8/formatting/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/formatting/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/formatting/${MODPY_PYCACHE}default.${MODPY_PYC_MAGIC_TAG}pyc
@@ -39,7 +39,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/flake8/formatting/default.py
 lib/python${MODPY_VERSION}/site-packages/flake8/main/
 lib/python${MODPY_VERSION}/site-packages/flake8/main/__init__.py
-lib/python${MODPY_VERSION}/site-packages/flake8/main/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/flake8/main/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/flake8/main/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/main/${MODPY_PYCACHE}application.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/main/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
@@ -59,7 +59,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/flake8/main/vcs.py
 lib/python${MODPY_VERSION}/site-packages/flake8/options/
 lib/python${MODPY_VERSION}/site-packages/flake8/options/__init__.py
-lib/python${MODPY_VERSION}/site-packages/flake8/options/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/flake8/options/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/flake8/options/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/options/${MODPY_PYCACHE}aggregator.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/options/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
@@ -69,15 +69,11 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/flake8/options/manager.py
 lib/python${MODPY_VERSION}/site-packages/flake8/plugins/
 lib/python${MODPY_VERSION}/site-packages/flake8/plugins/__init__.py
-lib/python${MODPY_VERSION}/site-packages/flake8/plugins/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/flake8/plugins/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/flake8/plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/flake8/plugins/${MODPY_PYCACHE}_trie.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/plugins/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/flake8/plugins/${MODPY_PYCACHE}notifier.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/plugins/${MODPY_PYCACHE}pyflakes.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/flake8/plugins/_trie.py
 lib/python${MODPY_VERSION}/site-packages/flake8/plugins/manager.py
-lib/python${MODPY_VERSION}/site-packages/flake8/plugins/notifier.py
 lib/python${MODPY_VERSION}/site-packages/flake8/plugins/pyflakes.py
 lib/python${MODPY_VERSION}/site-packages/flake8/processor.py
 lib/python${MODPY_VERSION}/site-packages/flake8/statistics.py

--
Paco Esteban.
https://onna.be/gpgkey.asc
9A6B 6083 AD9E FDC2 0EAF  5CB3 5818 130B 8A6D BC03

Reply | Threaded
Open this post in threaded view
|

Re: [update] devel/flake8

Kurt Mosiejczuk-9
On Thu, Jul 25, 2019 at 10:07:27AM +0200, Paco Esteban wrote:

> And finally, the fresh diff for devel/flake8

> For reference:

> https://marc.info/?l=openbsd-ports&m=156101812530722&w=2

This works great for me on amd64. I did tweak it a little bit.  I added
version requirements for devel/py-codestyle, devel/py-entrypoints, and
devel/pyflakes. I'd usually leave these off, but the new versions of
each are needed for thing to work right and I had trouble at one point
because I missed making sure one of the new versions was installed.

--Kurt

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/flake8/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 12 Jul 2019 20:44:08 -0000 1.17
+++ Makefile 5 Aug 2019 05:05:56 -0000
@@ -2,9 +2,8 @@
 
 COMMENT = modular python code checker wrapping pep8 and pyflakes
 
-MODPY_EGG_VERSION = 3.5.0
+MODPY_EGG_VERSION = 3.7.7
 DISTNAME = flake8-${MODPY_EGG_VERSION}
-REVISION = 1
 
 CATEGORIES = devel
 
@@ -23,9 +22,10 @@ MODPY_PYTEST_ARGS = tests
 
 TEST_DEPENDS = devel/py-mock${MODPY_FLAVOR}
 
-RUN_DEPENDS = devel/py-codestyle${MODPY_FLAVOR} \
+RUN_DEPENDS = devel/py-codestyle${MODPY_FLAVOR}>=2.5.0 \
+ devel/py-entrypoints${MODPY_FLAVOR}>=0.3 \
  devel/py-mccabe${MODPY_FLAVOR} \
- devel/pyflakes${MODPY_FLAVOR}
+ devel/pyflakes${MODPY_FLAVOR}>=2.1.0
 
 BUILD_DEPENDS = devel/py-test-runner${MODPY_FLAVOR}
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/flake8/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 21 Jan 2018 23:49:25 -0000 1.7
+++ distinfo 5 Aug 2019 05:05:56 -0000
@@ -1,2 +1,2 @@
-SHA256 (flake8-3.5.0.tar.gz) = clMmX3q9izE+OJKUQESjZeP0rD/Nz7Qpj1Xund8Yi6A=
-SIZE (flake8-3.5.0.tar.gz) = 140608
+SHA256 (flake8-3.7.7.tar.gz) = hZmWBz80HyZwdBtR7B5noB2hQoMaof3GJC2/iN/75mE=
+SIZE (flake8-3.7.7.tar.gz) = 148457
Index: patches/patch-setup_py
===================================================================
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- patches/patch-setup_py 21 Jan 2018 23:49:25 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.7 2018/01/21 23:49:25 danj Exp $
-
-Index: setup.py
---- setup.py.orig
-+++ setup.py
-@@ -24,7 +24,6 @@ requires = [
-     "pyflakes >= 1.5.0, < 1.7.0",
-     "pycodestyle >= 2.0.0, < 2.4.0",
-     "mccabe >= 0.6.0, < 0.7.0",
--    "setuptools >= 30",
- ]
-
- extras_require = {
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/flake8/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 21 Jan 2018 23:49:25 -0000 1.5
+++ pkg/PLIST 5 Aug 2019 05:05:56 -0000
@@ -10,7 +10,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/flake8/__init__.py
 lib/python${MODPY_VERSION}/site-packages/flake8/__main__.py
-lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}checker.${MODPY_PYC_MAGIC_TAG}pyc
@@ -22,7 +22,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/api/
 lib/python${MODPY_VERSION}/site-packages/flake8/api/__init__.py
-lib/python${MODPY_VERSION}/site-packages/flake8/api/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/flake8/api/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/flake8/api/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/api/${MODPY_PYCACHE}legacy.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/api/legacy.py
@@ -31,7 +31,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/flake8/exceptions.py
 lib/python${MODPY_VERSION}/site-packages/flake8/formatting/
 lib/python${MODPY_VERSION}/site-packages/flake8/formatting/__init__.py
-lib/python${MODPY_VERSION}/site-packages/flake8/formatting/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/flake8/formatting/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/flake8/formatting/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/formatting/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/formatting/${MODPY_PYCACHE}default.${MODPY_PYC_MAGIC_TAG}pyc
@@ -39,7 +39,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/flake8/formatting/default.py
 lib/python${MODPY_VERSION}/site-packages/flake8/main/
 lib/python${MODPY_VERSION}/site-packages/flake8/main/__init__.py
-lib/python${MODPY_VERSION}/site-packages/flake8/main/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/flake8/main/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/flake8/main/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/main/${MODPY_PYCACHE}application.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/main/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
@@ -59,7 +59,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/flake8/main/vcs.py
 lib/python${MODPY_VERSION}/site-packages/flake8/options/
 lib/python${MODPY_VERSION}/site-packages/flake8/options/__init__.py
-lib/python${MODPY_VERSION}/site-packages/flake8/options/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/flake8/options/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/flake8/options/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/options/${MODPY_PYCACHE}aggregator.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/options/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
@@ -69,15 +69,11 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/flake8/options/manager.py
 lib/python${MODPY_VERSION}/site-packages/flake8/plugins/
 lib/python${MODPY_VERSION}/site-packages/flake8/plugins/__init__.py
-lib/python${MODPY_VERSION}/site-packages/flake8/plugins/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/flake8/plugins/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/flake8/plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/flake8/plugins/${MODPY_PYCACHE}_trie.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/plugins/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/flake8/plugins/${MODPY_PYCACHE}notifier.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/plugins/${MODPY_PYCACHE}pyflakes.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/flake8/plugins/_trie.py
 lib/python${MODPY_VERSION}/site-packages/flake8/plugins/manager.py
-lib/python${MODPY_VERSION}/site-packages/flake8/plugins/notifier.py
 lib/python${MODPY_VERSION}/site-packages/flake8/plugins/pyflakes.py
 lib/python${MODPY_VERSION}/site-packages/flake8/processor.py
 lib/python${MODPY_VERSION}/site-packages/flake8/statistics.py