On Mon, 17 Dec 2018 18:48:42 +0100, Jeremie Courreges-Anglas
<j...@wxcvbn.org> wrote:
> On Mon, Dec 17 2018, Edward Lopez-Acosta <elopezaco...@gmail.com>
> wrote:
> > Should py-aiohttp be updated first to allow this to match upstream
> > as users may expect?
> >
> > I know there are many dependants on that though so might be a bit
> > of work. Will save extra work on black in the future too, along
> > with anything else that may need py-aiohttp updated.
The problem is that afaik updating aiohttp requires new dep(s) and I've
been focusing on other stuff. I know someone else has been looking at
it, I'll ping them.
> I'm puzzled by the need for a web server in a source code formatter
> package. 8)
>
> Daniel's proposal looks reasonable to me. I would add a comment in
> the patch, though.
Sure, updated diff:
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/py-black/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 7 Jul 2018 15:17:15 -0000 1.1.1.1
+++ Makefile 17 Dec 2018 18:17:43 -0000
@@ -2,11 +2,13 @@
COMMENT = python code formatter
-MODPY_EGG_VERSION = 18.6b4
+MODPY_EGG_VERSION = 18.9b0
DISTNAME = black-${MODPY_EGG_VERSION}
PKGNAME = py-black-${MODPY_EGG_VERSION:S/b/beta/}
CATEGORIES = textproc devel
+
+MAINTAINER = Daniel Jakots <o...@chown.me>
HOMEPAGE = https://github.com/ambv/black
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/py-black/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 7 Jul 2018 15:17:15 -0000 1.1.1.1
+++ distinfo 17 Dec 2018 18:17:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (black-18.6b4.tar.gz) = IhWLicGmtOszOh5l55Gj+LmYzzsRrglK2yVw8x92mkQ=
-SIZE (black-18.6b4.tar.gz) = 141556
+SHA256 (black-18.9b0.tar.gz) = 4DCpoo9ULevAiszrJz8iisQieY5SFboqeRpt3qrKIqU=
+SIZE (black-18.9b0.tar.gz) = 151371
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/py-black/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 7 Jul 2018 15:17:15 -0000 1.1.1.1
+++ pkg/PLIST 17 Dec 2018 18:17:43 -0000
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2018/07/07 15:17:15 juanfra Exp $
bin/black
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}black.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}blackd.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/black-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/black-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/black-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
@@ -10,6 +11,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/black-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/black-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/black.py
+lib/python${MODPY_VERSION}/site-packages/blackd.py
lib/python${MODPY_VERSION}/site-packages/blib2to3/
lib/python${MODPY_VERSION}/site-packages/blib2to3/Grammar.txt
lib/python${MODPY_VERSION}/site-packages/blib2to3/PatternGrammar.txt
Index: patches/patch-setup_py
===================================================================
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-setup_py 17 Dec 2018 18:17:44 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Disable blackd as our aiohttp (which would be required) is old
+
+Index: setup.py
+--- setup.py.orig
++++ setup.py
+@@ -57,5 +57,5 @@ setup(
+ "Topic :: Software Development :: Libraries :: Python Modules",
+ "Topic :: Software Development :: Quality Assurance",
+ ],
+- entry_points={"console_scripts": ["black=black:main", "blackd=blackd:main
[d]"]},
++ entry_points={"console_scripts": ["black=black:main"]},
+ )
