update: devel/py-arrow

2020-03-31 Thread Paco Esteban
Hi ports@,

This is an update for devel/py-arrow to its latest version 0.15.5.
You can see the changelog here:

https://github.com/crsmithdev/arrow/blob/master/CHANGELOG.rst

While there, I've enabled pytest and dropped py2 support.

All tests pass for me on amd64.  This port has no consumers as far as
I can see.

comments ? ok ?

Index: Makefile
===
RCS file: /home/cvs/ports/devel/py-arrow/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile9 Sep 2019 19:23:48 -   1.7
+++ Makefile31 Mar 2020 16:23:51 -
@@ -2,7 +2,7 @@
 
 COMMENT =  better dates and times for Python
 
-MODPY_EGG_VERSION =0.14.7
+MODPY_EGG_VERSION =0.15.5
 DISTNAME = arrow-${MODPY_EGG_VERSION}
 PKGNAME =  py-arrow-${MODPY_EGG_VERSION}
 
@@ -16,17 +16,20 @@ PERMIT_PACKAGE =Yes
 MODULES =  lang/python
 MODPY_SETUPTOOLS = Yes
 MODPY_PI = Yes
+MODPY_PYTEST = Yes
+MODPY_PYTEST_ARGS =tests/*
 
 RUN_DEPENDS =  devel/py-dateutil${MODPY_FLAVOR}
 TEST_DEPENDS = devel/py-chai${MODPY_FLAVOR} \
+   devel/py-dateparser${MODPY_FLAVOR} \
+   devel/py-mock${MODPY_FLAVOR} \
devel/py-simplejson${MODPY_FLAVOR} \
-   devel/py-tz${MODPY_FLAVOR}
+   devel/py-test-cov${MODPY_FLAVOR} \
+   devel/py-test-mock${MODPY_FLAVOR} \
+   devel/py-tz${MODPY_FLAVOR} \
+   textproc/py-sphinx${MODPY_FLAVOR}
 
 FLAVORS += python3
-FLAVOR ?=
-
-.if !${FLAVOR:Mpython3}
-TEST_DEPENDS +=devel/py-backports-functools-lru-cache
-.endif
+FLAVOR =   python3
 
 .include 
Index: distinfo
===
RCS file: /home/cvs/ports/devel/py-arrow/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo9 Sep 2019 19:23:48 -   1.5
+++ distinfo14 Feb 2020 10:36:59 -
@@ -1,2 +1,2 @@
-SHA256 (arrow-0.14.7.tar.gz) = Z/i+fAz0IEJLxi2NfcQLROS7L3tRX5zClU+zbjV5dlY=
-SIZE (arrow-0.14.7.tar.gz) = 67657
+SHA256 (arrow-0.15.5.tar.gz) = U5DkZOLF92lxtg/6fuKcWYx1AaKUvJ9eba3LJRpdAns=
+SIZE (arrow-0.15.5.tar.gz) = 82264
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/devel/py-arrow/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   27 Aug 2019 23:02:55 -  1.2
+++ pkg/PLIST   31 Mar 2020 16:40:04 -
@@ -13,6 +13,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/arrow/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/arrow/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/arrow/${MODPY_PYCACHE}arrow.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/arrow/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/arrow/${MODPY_PYCACHE}factory.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/arrow/${MODPY_PYCACHE}formatter.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/arrow/${MODPY_PYCACHE}locales.${MODPY_PYC_MAGIC_TAG}pyc
@@ -21,6 +22,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/arrow/_version.py
 lib/python${MODPY_VERSION}/site-packages/arrow/api.py
 lib/python${MODPY_VERSION}/site-packages/arrow/arrow.py
+lib/python${MODPY_VERSION}/site-packages/arrow/constants.py
 lib/python${MODPY_VERSION}/site-packages/arrow/factory.py
 lib/python${MODPY_VERSION}/site-packages/arrow/formatter.py
 lib/python${MODPY_VERSION}/site-packages/arrow/locales.py

-- 
Paco Esteban.
0x5818130B8A6DBC03



CVS: cvs.openbsd.org: ports

2020-03-29 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/03/29 12:47:09

Modified files:
devel  : Makefile 

Log message:
- bpython
- py-curtsies
- py-prompt_toolkit
- py-wcwidth

All py3 only now.



CVS: cvs.openbsd.org: ports

2020-03-29 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/03/29 12:47:32

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
move py-curtsies, bpython, py-prompt_toolkit and py-wcwidth to py3 only.



CVS: cvs.openbsd.org: ports

2020-03-29 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/03/29 12:46:23

Modified files:
devel/py-wcwidth: Makefile distinfo 
devel/py-wcwidth/pkg: PLIST 

Log message:
update devel/py-wcwidth to 0.1.8

While here move it to py3 only.

ok bket@ jca@



CVS: cvs.openbsd.org: ports

2020-03-29 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/03/29 12:45:52

Modified files:
devel/bpython  : Makefile 
devel/bpython/pkg: PLIST 

Log message:
make bpython py3 only.

Triggered by devel/py-curtsies moving to py3 only.

The main binary is now called 'bpython' as agreed with maintainer
bcallah@

ok bket@ jca@



CVS: cvs.openbsd.org: ports

2020-03-29 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/03/29 12:46:05

Modified files:
devel/py-prompt_toolkit: Makefile 
devel/py-prompt_toolkit/pkg: PLIST 

Log message:
make devel/py-promtp_toolkit py3 only.

This is triggered by the move of devel/py-wcwidth to py3

ok bket@ jca@



CVS: cvs.openbsd.org: ports

2020-03-29 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/03/29 12:45:38

Modified files:
devel/py-curtsies: Makefile distinfo 
devel/py-curtsies/pkg: PLIST 

Log message:
update devel/py-curtsies to 0.3.1
While here make it py3 only.

This is triggered by the move of devel/py-wcwidth to py3.

ok bket@ jca@



Re: [update] net/dnscontrol -> 3.0.0

2020-03-26 Thread Paco Esteban
On Thu, 26 Mar 2020, karlis.mikels...@lf.lv wrote:

> Hello,
> 
> Please find attached patch to update DNSControl to latest stable (3.0.0)
> version.
> 
> https://github.com/StackExchange/dnscontrol/releases/tag/v3.0.0
> 
> Karlis

Builds ok and tests pass for me on amd64.
Tested successfully against GANDI_V5

ok paco

-- 
Paco Esteban.
0x5818130B8A6DBC03



Re: clarification of REVISION and EPOCH documentation.

2020-03-26 Thread Paco Esteban
sees
> >  the package as a newer package.
> > +This will add v${EPOCH} to FULLPKGNAME to form a 
> > full
> > +package-name conforming to packages-specs(7).
> >  
> >  
> >  If the package does not build, no bump is needed: changes to restore a port
> > @@ -1153,6 +1157,11 @@ The package system uses a signature mech
> >  is fully identified by its package names, plus the dependencies against
> >  which it was built, plus the version numbers of all shared libraries it
> >  contains.
> 
> I'd be tempted to leave this as is, or only add something like what you
> propose below.  I'm not objecting though.  :)

I've kept it for now, but not sure it adds much ...

> 
> > +
> > +
> > +The version comparison ordering can be summarized as:
> > +0.1  0.1p0  0.2  0.1v0  0.1p0v0  0.2v0  
> > 0.1v1.
> > +Check packages-specs(7) for more detailed information.
> >  

This is the sentence that triggered all this.  I kind of like how visual
it is, so I would keep it.

Cheers,

-- 
Paco Esteban.
0x5818130B8A6DBC03
Index: bsd.port.mk.5
===
RCS file: /home/cvs/src/share/man/man5/bsd.port.mk.5,v
retrieving revision 1.528
diff -u -p -r1.528 bsd.port.mk.5
--- bsd.port.mk.5   24 Mar 2020 14:59:52 -  1.528
+++ bsd.port.mk.5   26 Mar 2020 09:06:35 -
@@ -1650,6 +1650,10 @@ If set to
 will not open changed files in an editor.
 .It Ev EPOCH
 Epoch number of the current package.
+Used when the port version is changed but the new version is not regarded by
+.Xr packages-specs 7
+as being newer.
+Once added, it cannot be removed or go backwards.
 Defaults to empty (no need for numbering changes), then
 numbering starts at 0.
 Gets automatically incorporated into
Index: packages-specs.7
===
RCS file: /home/cvs/src/share/man/man7/packages-specs.7,v
retrieving revision 1.25
diff -u -p -r1.25 packages-specs.7
--- packages-specs.727 Oct 2014 22:45:30 -  1.25
+++ packages-specs.726 Mar 2020 09:20:10 -
@@ -144,15 +144,20 @@ then normal version, and finally
 .El
 .El
 .Pp
-In some rare cases, version numbering changes completely upstream.
+In some rare cases, a change to a port would cause the version number to
+compare as older than the previous version.
+This happens if an update is reverted, if upstream's numbering scheme changes
+completely, or if their usual scheme does not align with the one used by
+.Ox .
 A version style marker, of the form
 .Sq v0 ,
 .Sq v1 ...
 can be appended to the version number (after the patch level)
 to denote the new numbering scheme.
-See
+This marker is added by setting
 .Ev EPOCH
-in
+in the port Makefile and it takes precedence over the regular package version.
+See
 .Xr bsd.port.mk 5 .
 .Pp
 Flavored packages will also contain a list of flavors after the version
Index: faq/ports/guide.html
===
RCS file: /home/cvs/www/faq/ports/guide.html,v
retrieving revision 1.89
diff -u -p -r1.89 guide.html
--- faq/ports/guide.html28 Sep 2019 21:35:05 -  1.89
+++ faq/ports/guide.html26 Mar 2020 09:15:43 -
@@ -1138,6 +1138,8 @@ If something unexpected happens and you 
 upstream numbering changes completely so that the version number appears
 to go backwards, you must use EPOCH to make sure pkg_add(1) sees
 the package as a newer package.
+This will add v${EPOCH} to FULLPKGNAME to form a full
+package-name conforming to packages-specs(7).
 
 
 If the package does not build, no bump is needed: changes to restore a port
@@ -1153,6 +1155,11 @@ The package system uses a signature mech
 is fully identified by its package names, plus the dependencies against
 which it was built, plus the version numbers of all shared libraries it
 contains.
+
+
+The version comparison ordering can be summarized as:
+0.1  0.1p0  0.2  0.1v0  0.1p0v0  0.2v0  
0.1v1.
+Check packages-specs(7) for more detailed information.
 
 
 Part of the work will happen before the update itself.


Re: clarification of REVISION and EPOCH documentation.

2020-03-25 Thread Paco Esteban
On Sun, 15 Mar 2020, Marc Espie wrote:

> On Sun, Mar 15, 2020 at 12:28:25PM +0100, Paco Esteban wrote:
> > oh, that did not occur to me ...  You mean that if port foo/bar gets
> > EPOCH = 0, then all dependent ports should change it's dependencies
> > declarations from foo/bar>=1.1 to foo/bar>=1.1v0 ??
> 
> Yes, that's the main reason that led to introducing PKGSPEC in bsd.port.mk
> and tweaking _print-metadata, so we didn't hav to change every 
> dependent port.
> 
> You still need to bump REVISION in dependent port when you change PKGSPEC
> though.

Thanks Marc, I tried to include that too.
All patches updated and attached again.

Cheers,

-- 
Paco Esteban.
0x5818130B8A6DBC03
Index: bsd.port.mk.5
===
RCS file: /home/cvs/src/share/man/man5/bsd.port.mk.5,v
retrieving revision 1.528
diff -u -p -r1.528 bsd.port.mk.5
--- bsd.port.mk.5   24 Mar 2020 14:59:52 -  1.528
+++ bsd.port.mk.5   25 Mar 2020 20:07:07 -
@@ -1650,6 +1650,10 @@ If set to
 will not open changed files in an editor.
 .It Ev EPOCH
 Epoch number of the current package.
+Used when the port version is changed but the new version is not regarded by
+.Xr packages-specs 5
+as being newer.
+Once added, it cannot be removed or go backwards.
 Defaults to empty (no need for numbering changes), then
 numbering starts at 0.
 Gets automatically incorporated into
@@ -1658,6 +1662,12 @@ as
 .Sq v${EPOCH}
 to form a full package-name conforming to
 .Xr packages-specs 7 .
+If there are dependent packages that use a version spec, this has to be
+adjusted for each one or
+.Ev PKGSPEC
+changed on the affected package and
+.Ev REVISION
+bumped for all the dependencies.
 .It Ev ERRORS
 List of errors found while parsing the port's Makefile.
 Display the errors before making any target, and if any error starts with
Index: packages-specs.7
===
RCS file: /home/cvs/src/share/man/man7/packages-specs.7,v
retrieving revision 1.25
diff -u -p -r1.25 packages-specs.7
--- packages-specs.727 Oct 2014 22:45:30 -  1.25
+++ packages-specs.715 Mar 2020 11:25:27 -
@@ -144,12 +144,46 @@ then normal version, and finally
 .El
 .El
 .Pp
-In some rare cases, version numbering changes completely upstream.
+In some rare cases, a change to a port would cause the version number to
+compare as older than the previous version.
+This happens if an update is reverted, if upstream's numbering scheme changes
+completely, or if their usual scheme does not align with the one used by
+.Ox .
 A version style marker, of the form
 .Sq v0 ,
 .Sq v1 ...
 can be appended to the version number (after the patch level)
 to denote the new numbering scheme.
+This is added by setting
+.Ev EPOCH
+in the port Makefile.
+Combined with
+.Ev REVISION ,
+this leaves the version ordering as follows:
+.Bl -dash
+.It
+"0.1" is older than "0.1p0"
+.It
+"0.1p0" (or
+.Sq p1 ,
+.Sq p2 ... )
+is older than "0.2"
+.It
+"0.2" is older than "0.1v0" (or any other version number without
+.Sq v )
+.It
+"0.1v0" is older than "0.1p0v0".
+Just as showed in the first point.
+.It
+"0.1p0v0" is older than "0.2v0".
+The same as the second point.
+.It
+"0.2v0" is older than "0.1v1" (or any other version with a lower
+.Sq v
+value)
+.El
+.El
+.Pp
 See
 .Ev EPOCH
 in
Index: faq/ports/guide.html
===
RCS file: /home/cvs/www/faq/ports/guide.html,v
retrieving revision 1.89
diff -u -p -r1.89 guide.html
--- faq/ports/guide.html28 Sep 2019 21:35:05 -  1.89
+++ faq/ports/guide.html14 Mar 2020 14:39:36 -
@@ -1131,6 +1131,8 @@ changes to patches or build flags.
 If the upstream version has not changed, the package name bump is done
 by incrementing REVISION if already present, otherwise adding
 REVISION = 0 towards the top of the Makefile.
+This will add p${REVISION} to FULLPKGNAME to form a 
full
+package-name conforming to packages-specs(7).
 
 
 Version numbers always go forward.
@@ -1138,6 +1140,8 @@ If something unexpected happens and you 
 upstream numbering changes completely so that the version number appears
 to go backwards, you must use EPOCH to make sure pkg_add(1) sees
 the package as a newer package.
+This will add v${EPOCH} to FULLPKGNAME to form a full
+package-name conforming to packages-specs(7).
 
 
 If the package does not build, no bump is needed: changes to restore a port
@@ -1153,6 +1157,11 @@ The package system uses a signature mech
 is fully identified by its package names, plus the dependencies against
 which it was built, plus the version numbers of all shared libraries it
 contains.
+
+
+The version comparison ordering can be summarized as:
+0.1  0.1p0  0.2  0.1v0  0.1p0v0  0.2v0  
0.1v1.
+Check packages-specs(7) for more detailed information.
 
 
 Part of the work will happen before the update itself.


Re: REVISION: devel/py-jedi and devel/py-parso to python3 only

2020-03-25 Thread Paco Esteban
On Tue, 24 Mar 2020, Elias M. Mariani wrote:

> The only consumers of py-jedi are:
> - devel/spyder/spyder,python3
> - x11/gnome/builder
> 
> Both using devel/py-jedi,python3, moving to py3-jedi only.
> 
> Then the only consumer of devel/py-parso becomes:
> devel/py-jedi,python3
> 
> Also moving to py3-parso only.
> 
> diff missing quirks and Makefile unhooks, will do when committing.
> I'm not updating them for now, we should check for compatibility with
> spyder and gnome-builder for that.
> 
> OK?

They build and install ok for me.  I did not test consumers, but this
should not have an impact, as there's not version update.

Good luck testing devel/spyder/spyder if you updte py-jedi :-P

ok paco.

-- 
Paco Esteban.
0x5818130B8A6DBC03



CVS: cvs.openbsd.org: ports

2020-03-24 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/03/24 09:37:58

Modified files:
www/hugo   : Makefile distinfo 

Log message:
update www/hugo to bugfix release 0.68.3

Just one change for this release:
* Fix _build.list.local logic
* Fix cache reset for a page's collections on server live reload

ok jca@



Re: update: devel/py-wcwidth (cascading devel/{py-prompt_toolkit,ipython} dropping py2 support)

2020-03-23 Thread Paco Esteban
On Mon, 23 Mar 2020, Bjorn Ketelaars wrote:

> On Sun 22/03/2020 18:39, Paco Esteban wrote:
> > Ping ?
> > 
> > (This needs bket's diff discussed on another thread:
> > https://marc.info/?l=openbsd-ports=158464110714289=2)
> > 
> > Find attached the (still relevant) parts for convenience.
> 
> Output of 'show-reverse-deps devel/py-wcwidth' shows that there are
> other consumers that still need the python2-flavor. At least:
> - devel/bpython
> - devel/py-curtsies

I sent those on another thread.
They are awaiting "ok".

You can take a look if you want ;-)

-- 
Paco Esteban.
0x5818130B8A6DBC03



Re: update devel/py-curtsies (triggers drop py2 support for devel/bpython)

2020-03-22 Thread Paco Esteban
Ping ?

Diffs attached again for convenience.

On Sun, 15 Mar 2020, Paco Esteban wrote:

> Hi ports@,
> 
> This complements an update sent previously for devel/py-wcwidth.
> Here's an update for devel/py-curtsies to 0.3.1.  You can see the
> changelog here:
> 
> https://github.com/bpython/curtsies/blob/master/CHANGELOG.md
> 
> All tests pass.
> 
> I've enabled pytest for tests and dropped py2 support for this port.
> This triggers drop py2 support for its only consumer devel/bpython (also
> attached).  Maintainer (bcallah@) is ok with it.  Four test fail, same
> as before the update.  Tested it lightly, so more eyes on it are
> welcome.
> 
> Cheers,
> 
> -- 
> Paco Esteban.
> 0x5818130B8A6DBC03

-- 
Paco Esteban.
0x5818130B8A6DBC03
Index: Makefile
===
RCS file: /home/cvs/ports/devel/py-curtsies/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile12 Jul 2019 20:45:47 -  1.9
+++ Makefile13 Mar 2020 14:32:06 -
@@ -2,10 +2,9 @@
 
 COMMENT =  curses-like terminal wrapper
 
-MODPY_EGG_VERSION =0.2.11
+MODPY_EGG_VERSION =0.3.1
 DISTNAME = curtsies-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
-REVISION = 1
 CATEGORIES =   devel
 
 # MIT
@@ -15,11 +14,16 @@ MODULES =   lang/python
 
 MODPY_SETUPTOOLS = Yes
 MODPY_PI = Yes
+MODPY_PYTEST = Yes
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR =   python3
 
 RUN_DEPENDS =  devel/py-blessings${MODPY_FLAVOR} \
devel/py-wcwidth${MODPY_FLAVOR}
+
+TEST_DEPENDS = devel/py-nose${MODPY_FLAVOR} \
+   devel/py-mock${MODPY_FLAVOR} \
+   devel/py-pyte${MODPY_FLAVOR}
 
 .include 
Index: distinfo
===
RCS file: /home/cvs/ports/devel/py-curtsies/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo2 Nov 2016 22:38:09 -   1.2
+++ distinfo13 Mar 2020 14:08:27 -
@@ -1,2 +1,2 @@
-SHA256 (curtsies-0.2.11.tar.gz) = 7EY532VDV5RMIBq9DXkdnf06wnzk+Quhwpkarwevku4=
-SIZE (curtsies-0.2.11.tar.gz) = 46740
+SHA256 (curtsies-0.3.1.tar.gz) = sskTqBE8Q4LhoiFnnyM4E5sRKDnesWwA7oc+V6SzO9Q=
+SIZE (curtsies-0.3.1.tar.gz) = 47944
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/devel/py-curtsies/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   17 Jun 2017 07:07:56 -  1.2
+++ pkg/PLIST   13 Mar 2020 14:34:07 -
@@ -1,4 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.2 2017/06/17 07:07:56 jasper Exp $
+@conflict py-curtsies-*
+@pkgpath devel/py-curtsies
 lib/python${MODPY_VERSION}/site-packages/curtsies/
 
lib/python${MODPY_VERSION}/site-packages/curtsies-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/curtsies-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Index: Makefile
===
RCS file: /home/cvs/ports/devel/bpython/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile22 Sep 2019 21:46:07 -  1.26
+++ Makefile15 Mar 2020 15:28:30 -
@@ -5,6 +5,7 @@ COMMENT=fancy interface to the Python i
 MODPY_EGG_VERSION=0.18
 DISTNAME=  bpython-${MODPY_EGG_VERSION}
 CATEGORIES=devel
+REVISION = 0
 
 HOMEPAGE=  https://bpython-interpreter.org/
 MAINTAINER=Brian Callahan 
@@ -19,11 +20,7 @@ MODULES= lang/python
 MODPY_SETUPTOOLS=Yes
 
 FLAVORS =  python3
-FLAVOR ?=
-
-.if ${FLAVOR:Mpython3}
-PKGNAME =  bpython${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
-.endif
+FLAVOR =   python3
 
 RUN_DEPENDS=   devel/desktop-file-utils \
devel/py-curtsies${MODPY_FLAVOR} \
@@ -37,17 +34,5 @@ BUILD_DEPENDS=   devel/py-babel${MODPY_FLA
 
 TEST_DEPENDS=  devel/py-mock${MODPY_FLAVOR} \
devel/py-twisted${MODPY_FLAVOR}
-
-# de-conflict flavors
-post-install:
-.for b in bpdb bpython bpython-curses bpython-urwid
-   mv ${PREFIX}/bin/$b{,${MODPY_BIN_SUFFIX}}
-.endfor
-   mv ${PREFIX}/man/man1/bpython{,${MODPY_BIN_SUFFIX}}.1
-   mv ${PREFIX}/man/man5/bpython-config{,${MODPY_BIN_SUFFIX}}.5
-   mv 
${PREFIX}/share/appinfo/org.bpython-interpreter.bpython{,${MODPY_BIN_SUFFIX}}.appdata.xml
-   mv 
${PREFIX}/share/applications/org.bpython-interpreter.bpython{,${MODPY_BIN_SUFFIX}}.desktop
-   mv ${PREFIX}/share/pixmaps/bpython{,${MODPY_BIN_SUFFIX}}.png
-
 
 .include 
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/devel/bpython/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST   9 Aug 2019 00:00:40 -   1.9
+++ pkg/PLIST   15 Mar 2020 16:07:07 -
@@ -1

Re: update: devel/py-wcwidth (cascading devel/{py-prompt_toolkit,ipython} dropping py2 support)

2020-03-22 Thread Paco Esteban
Ping ?

(This needs bket's diff discussed on another thread:
https://marc.info/?l=openbsd-ports=158464110714289=2)

Find attached the (still relevant) parts for convenience.

On Sun, 15 Mar 2020, Bjorn Ketelaars wrote:

> On Sun 15/03/2020 17:52, Paco Esteban wrote:
> > On Sun, 15 Mar 2020, Paco Esteban wrote:
> > 
> > > * devel/py-prompt_toolkit
> > > * also attached to this email.  Just made py3 only and bumped
> > >   revison.  All tests pass.
> > >   This also triggers the conversion of devel/ipython to py3 only.
> > >   Four tests fail, just as before.
> > >   Maintainer (edd@) has some doubts about this.  Mainly if users
> > >   will be upset for this.  Comments on this are appreciated.
> > 
> > I just realized that devel/ipython has A METRIC TON of consumers ... not
> > sure how they slept under my radar, sorry.
> 
> I'm trying to push several tools from jupyter forward, several of which
> depend on ipython. If I'm not mistaken there are 3 more pieces needed
> before it is possible to migrate ipython to py3-only:
> 
> - rpointel@ sent a diff to ports@ for plaso and all of its dependencies,
>   which still needs testing:
>   https://marc.info/?l=openbsd-ports=158368639815369=2
> - I sent a diff to port@ for devel/py-nbconvert (update and migration to
>   py3-only): https://marc.info/?l=openbsd-ports=158351871906886=2
> 
> After the above has been committed we need to migrate several ports to
> py3-only at the same time. I have a diff sitting in my tree for this:
> 
> PORT  CONSUMER(S)
> py-traitlets  ipython py-ipykernel py-jupyter_client py-jupyter_core 
> py-nbformat
> ipython   py-ipykernel py-jupyter_client py-nbformat 
> py-traitlets
> py-ipykernel  ipython py-jupyter_client py-jupyter_core
> py-jupyter_core   py-jupyter_client py-nbformat
> py-jupyter_client py-ipykernel
> py-nbformat   ipython
> 

-- 
Paco Esteban.
0x5818130B8A6DBC03
Index: Makefile
===
RCS file: /home/cvs/ports/devel/py-wcwidth/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile12 Jul 2019 20:45:55 -  1.7
+++ Makefile13 Mar 2020 18:29:24 -
@@ -2,10 +2,9 @@
 
 COMMENT=   measures number of terminal column cells of wide-char 
code
 
-MODPY_EGG_VERSION= 0.1.7
+MODPY_EGG_VERSION= 0.1.8
 DISTNAME=  wcwidth-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
-REVISION=  1
 
 CATEGORIES=devel
 
@@ -22,6 +21,6 @@ MODPY_PYTEST =Yes
 MODPY_PYTEST_ARGS =wcwidth
 
 FLAVORS=   python3
-FLAVOR ?=
+FLAVOR =   python3
 
 .include 
Index: distinfo
===
RCS file: /home/cvs/ports/devel/py-wcwidth/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo29 Sep 2016 15:05:13 -  1.3
+++ distinfo13 Mar 2020 18:30:46 -
@@ -1,2 +1,2 @@
-SHA256 (wcwidth-0.1.7.tar.gz) = PfNzciJtbmPhseHtoVxZS8qYoi0zojgyqQmY+qlrxl4=
-SIZE (wcwidth-0.1.7.tar.gz) = 22884
+SHA256 (wcwidth-0.1.8.tar.gz) = 8os+imSD5dSef4lJrBp4MU50AzOuMFtLpd79PnT7N6g=
+SIZE (wcwidth-0.1.8.tar.gz) = 19957
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/devel/py-wcwidth/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   7 Jan 2016 08:13:29 -   1.1.1.1
+++ pkg/PLIST   13 Mar 2020 18:30:19 -
@@ -1,4 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2016/01/07 08:13:29 ajacoutot Exp $
+@conflict py-wcwidth-*
+@pkgpath devel/py-wcwidth
 lib/python${MODPY_VERSION}/site-packages/wcwidth/
 
lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Index: Makefile
===
RCS file: /home/cvs/ports/devel/py-prompt_toolkit/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile2 Dec 2019 14:16:45 -   1.14
+++ Makefile13 Mar 2020 18:45:31 -
@@ -9,6 +9,7 @@ MODPY_EGG_VERSION=  1.0.15
 DISTNAME=  prompt_toolkit-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
 EPOCH= 1
+REVISION=  0
 
 CATEGORIES=devel
 
@@ -29,6 +30,6 @@ RUN_DEPENDS=  devel/py-six${MODPY_FLAVOR
textproc/py-pygments${MODPY_FLAVOR}
 
 FLAVORS=   python3
-FLAVOR ?=
+FLAVOR =   python3
 
 .include 
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/

Re: Migrate ipython/py-ipykernel/py-jupyter_*/py-nbformat/py-traitlets to py3-only

2020-03-22 Thread Paco Esteban
On Sun, 22 Mar 2020, Bjorn Ketelaars wrote:

> Unless someone objects, I will commit my diff tomorrow morning (CET).

Looking forward to it.

I'll send a ping with my two related diffs then :-)

-- 
Paco Esteban.
0x5818130B8A6DBC03



CVS: cvs.openbsd.org: ports

2020-03-22 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/03/22 10:53:12

Modified files:
www/hugo   : Makefile distinfo 

Log message:
update www/hugo to bugfix release 0.68.1

Just one change for this release:
* Revert "resources: Add data context to the key in ExecuteAsTemplate"

ok jca@



Re: Migrate ipython/py-ipykernel/py-jupyter_*/py-nbformat/py-traitlets to py3-only

2020-03-21 Thread Paco Esteban
On Thu, 19 Mar 2020, Bjorn Ketelaars wrote:

> On Thu 19/03/2020 17:29, Paco Esteban wrote:
> > The diff I sent for devel/ipython also removed the renaming of the
> > binaries (so there's no more ipython-3, but ipython and all that).
> > 
> > Should we do that ?
> > Or leave it with the "-3" suffix ?
> 
> I think your proposal is better. Enclosed a new diff which uses your
> work on ipython.

All build and install fine for me on amd64.
About tests, all tests pass for those ports with the exceptions of:
* devel/ipython
Status: ERROR - 3 out of 7 test groups failed (core, lib, utils).
* devel/py-jupyter_client
jupyter_client/tests/test_multikernelmanager.py ...Segmentation
fault

This is the same as before the patches, so I guess it's ok.

I also tried to test as much consumers as I could without finding any
significant differences.  This is expected, as there are no updates,
just the py2 --> py3 move.

Waiting for Edd's (maintainer) decision on the binary name change
notification for users regarding ipython.

A part from that, ok paco.

Cheers,

-- 
Paco Esteban.
0x5818130B8A6DBC03



Re: Migrate ipython/py-ipykernel/py-jupyter_*/py-nbformat/py-traitlets to py3-only

2020-03-21 Thread Paco Esteban
On Thu, 19 Mar 2020, Edd Barrett wrote:

> On Thu, Mar 19, 2020 at 05:29:17PM +0100, Paco Esteban wrote:
> > The diff I sent for devel/ipython also removed the renaming of the
> > binaries (so there's no more ipython-3, but ipython and all that).
> > 
> > Should we do that ?
> > Or leave it with the "-3" suffix ?
> 
> I wonder if we should make ipython-3 a symlink to ipython?
> 
> At least tell users about the change, either as a MESSAGE or in
> current.html?

I leave that decision to you as maintainer.  I'm not a user of ipython
myself, so I don't really care.

Just let us know so we can include it on a diff if necessary.

I hope to finish this endless testing this weekend ...

Cheers,

-- 
Paco Esteban.
0x5818130B8A6DBC03



CVS: cvs.openbsd.org: ports

2020-03-21 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/03/21 06:48:36

Modified files:
www/hugo   : Makefile distinfo 

Log message:
update www/hugo to latest versio 0.68.0

Changes for this release:
* Some minify configuration adjustments
* Add minify config
* Allow headless bundles to list pages via $page.Pages and
$page.RegularPages
* Update to Go 1.14.1 and 1.13.9
* Pass directory name to filters in LstatIfPossible in the same way as
Readdir
* Update to goldmark 1.1.25.
* Add workaround for regular CSS imports in SCSS
* Add .RegularPagesRecursive
* Add data context to the key in ExecuteAsTemplate
* Improve Tailwind/PostCSS error messages
* Update Blackfriday
* Add languageDirection to language configuration
* Fix Go build version
* Fix GetTerms nil pointer
* Fix scss vs css import regexp
* Fix --templateMetricsHints
* Try to fix a Go 1.15 go vet error

ok jca@



Re: Migrate ipython/py-ipykernel/py-jupyter_*/py-nbformat/py-traitlets to py3-only

2020-03-19 Thread Paco Esteban
Hi Bjorn,

I'm testing all the ports and consumers now.
Just a note inline.

On Wed, 18 Mar 2020, Bjorn Ketelaars wrote:

> diff --git devel/ipython/Makefile devel/ipython/Makefile
> index 18f71bf9154..03029eb6934 100644
> --- devel/ipython/Makefile
> +++ devel/ipython/Makefile
> @@ -3,8 +3,9 @@
>  COMMENT= enhanced interactive Python shell
>  
>  MODPY_EGG_VERSION =  5.8.0
> -REVISION =   2
> +REVISION =   3
>  DISTNAME=ipython-${MODPY_EGG_VERSION}
> +PKGNAME =ipython${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
>  CATEGORIES=  devel
>  
>  HOMEPAGE=https://ipython.org/
> @@ -20,6 +21,7 @@ RUN_DEPENDS =   
> devel/py-decorator${MODPY_FLAVOR} \
>   devel/desktop-file-utils \
>   devel/py-pexpect${MODPY_FLAVOR} \
>   devel/py-prompt_toolkit${MODPY_FLAVOR} \
> + math/py-numpy${MODPY_FLAVOR} \
>   textproc/py-pygments${MODPY_FLAVOR}
>  
>  # Note that if you have pdb++ installed, tests will fail.
> @@ -41,16 +43,7 @@ PERMIT_PACKAGE=Yes
>  MODPY_PI =   Yes
>  
>  FLAVORS =python3
> -FLAVOR ?=
> -
> -.if ${FLAVOR:Mpython3}
> -PKGNAME =ipython${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
> -RUN_DEPENDS +=   math/py-numpy,python3
> -.else
> -RUN_DEPENDS +=   devel/py-backports-shutil-get-terminal-size \
> - devel/py-pathlib2
> -TEST_DEPENDS +=  devel/py-mock
> -.endif
> +FLAVOR = python3
>  
>  # Despite the fact that setupbase.py defines paths for examples to
>  # be installed into, we still have to do it manually for some reason.

The diff I sent for devel/ipython also removed the renaming of the
binaries (so there's no more ipython-3, but ipython and all that).

Should we do that ?
Or leave it with the "-3" suffix ?

 # Despite the fact that setupbase.py defines paths for examples to
 # be installed into, we still have to do it manually for some reason.
@@ -62,11 +54,7 @@ post-install:
chown -R ${SHAREOWN}:${SHAREGRP} \
${WRKSRC}/examples/IPython\ Kernel/ipython.desktop
mv ${WRKSRC}/examples/IPython\ Kernel/ipython.desktop \
-   ${APPS_DIR}/ipython${MODPY_BIN_SUFFIX}.desktop
-
-   mv ${PREFIX}/bin/ipython ${PREFIX}/bin/ipython${MODPY_BIN_SUFFIX}
-   mv ${PREFIX}/bin/iptest ${PREFIX}/bin/iptest${MODPY_BIN_SUFFIX}
-   mv ${PREFIX}/man/man1/ipython.1 
${PREFIX}/man/man1/ipython${MODPY_BIN_SUFFIX}.1
+   ${APPS_DIR}/ipython.desktop

 pre-build:
${SUBST_CMD} ${WRKBUILD}/IPython/core/tests/test_interactiveshell.py
@@ -74,6 +62,6 @@ pre-build:

 do-test:
env LC_CTYPE=en_US.UTF-8 PYTHONNOUSERSITE=1 \
-   ${LOCALBASE}/bin/iptest${MODPY_BIN_SUFFIX}
+   ${LOCALBASE}/bin/iptest

> diff --git devel/ipython/pkg/PLIST devel/ipython/pkg/PLIST
> index 4146be3c30e..c5c48c97f01 100644
> --- devel/ipython/pkg/PLIST
> +++ devel/ipython/pkg/PLIST
> @@ -1,4 +1,6 @@
>  @comment $OpenBSD: PLIST,v 1.24 2018/10/31 12:37:34 bket Exp $
> +@conflict ipython-*
> +@pkgpath devel/ipython
>  bin/iptest${MODPY_BIN_SUFFIX}
>  @comment bin/iptest2
>  @comment bin/iptest3

-- 
Paco Esteban.
0x5818130B8A6DBC03



Re: UPDATE devel/py-nbconvert-5.3.1

2020-03-18 Thread Paco Esteban
On Fri, 06 Mar 2020, Bjorn Ketelaars wrote:

> Diff below updates py-nbconvert to 5.3.1. Changes:
> https://github.com/jupyter/nbconvert/blob/5.3.1/docs/source/changelog.rst.
> 
> Newer versions of py-nbconvert are available, which require several
> dependencies to be updated. This is something for another day.
> 
> Changes to the port:
> - python2 flavor has been dropped, migrated to python3-only
> - switch HOMEPAGE to https
> 
> Testing:
> - 'make test' runs successfully
> - run tested in combination with jupyter-notebook
> 
> Consumers are already python3-only.
> 
> OK?

All tests pass for me on amd64.
I also tested its consumers before and after the update.  Results are
exactly the same:

* www/py-bokeh: 84 failed, 4004 passed, 4 skipped, 27 warnings, 136 error
* www/jupyter-notebook: all tests pass
* devel/spyder/spyder: cannot run tests.  It crashes before start.

ok paco@

-- 
Paco Esteban.
0x5818130B8A6DBC03



CVS: cvs.openbsd.org: ports

2020-03-16 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/03/16 04:44:38

Modified files:
www/hugo   : Makefile distinfo 

Log message:
update www/hugo to latest versio 0.67.1

Changes for this release:
* metrics: Fix --templateMetricsHints [5eadc4c0]
* resources: Add data context to the key in ExecuteAsTemplate [18cb21ff]
* Improve Tailwind/PostCSS error messages [df298558]
* deps: Update Blackfriday [b1106f87]
* resources: Try to fix a Go 1.15 go vet error [c0177fe2]
* Add languageDirection to language configuration [5914f91b]

ok jca@



Re: update: devel/py-wcwidth (cascading devel/{py-prompt_toolkit,ipython} dropping py2 support)

2020-03-15 Thread Paco Esteban
On Sun, 15 Mar 2020, Paco Esteban wrote:

> * devel/py-prompt_toolkit
> * also attached to this email.  Just made py3 only and bumped
>   revison.  All tests pass.
>   This also triggers the conversion of devel/ipython to py3 only.
>   Four tests fail, just as before.
>   Maintainer (edd@) has some doubts about this.  Mainly if users
>   will be upset for this.  Comments on this are appreciated.

I just realized that devel/ipython has A METRIC TON of consumers ... not
sure how they slept under my radar, sorry.

I have to take a look at them to see if this is viable.  So, please keep
this on hold.

Cheers,

-- 
Paco Esteban.
0x5818130B8A6DBC03



update devel/py-curtsies (triggers drop py2 support for devel/bpython)

2020-03-15 Thread Paco Esteban
Hi ports@,

This complements an update sent previously for devel/py-wcwidth.
Here's an update for devel/py-curtsies to 0.3.1.  You can see the
changelog here:

https://github.com/bpython/curtsies/blob/master/CHANGELOG.md

All tests pass.

I've enabled pytest for tests and dropped py2 support for this port.
This triggers drop py2 support for its only consumer devel/bpython (also
attached).  Maintainer (bcallah@) is ok with it.  Four test fail, same
as before the update.  Tested it lightly, so more eyes on it are
welcome.

Cheers,

-- 
Paco Esteban.
0x5818130B8A6DBC03
Index: Makefile
===
RCS file: /home/cvs/ports/devel/py-curtsies/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile12 Jul 2019 20:45:47 -  1.9
+++ Makefile13 Mar 2020 14:32:06 -
@@ -2,10 +2,9 @@
 
 COMMENT =  curses-like terminal wrapper
 
-MODPY_EGG_VERSION =0.2.11
+MODPY_EGG_VERSION =0.3.1
 DISTNAME = curtsies-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
-REVISION = 1
 CATEGORIES =   devel
 
 # MIT
@@ -15,11 +14,16 @@ MODULES =   lang/python
 
 MODPY_SETUPTOOLS = Yes
 MODPY_PI = Yes
+MODPY_PYTEST = Yes
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR =   python3
 
 RUN_DEPENDS =  devel/py-blessings${MODPY_FLAVOR} \
devel/py-wcwidth${MODPY_FLAVOR}
+
+TEST_DEPENDS = devel/py-nose${MODPY_FLAVOR} \
+   devel/py-mock${MODPY_FLAVOR} \
+   devel/py-pyte${MODPY_FLAVOR}
 
 .include 
Index: distinfo
===
RCS file: /home/cvs/ports/devel/py-curtsies/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo2 Nov 2016 22:38:09 -   1.2
+++ distinfo13 Mar 2020 14:08:27 -
@@ -1,2 +1,2 @@
-SHA256 (curtsies-0.2.11.tar.gz) = 7EY532VDV5RMIBq9DXkdnf06wnzk+Quhwpkarwevku4=
-SIZE (curtsies-0.2.11.tar.gz) = 46740
+SHA256 (curtsies-0.3.1.tar.gz) = sskTqBE8Q4LhoiFnnyM4E5sRKDnesWwA7oc+V6SzO9Q=
+SIZE (curtsies-0.3.1.tar.gz) = 47944
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/devel/py-curtsies/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   17 Jun 2017 07:07:56 -  1.2
+++ pkg/PLIST   13 Mar 2020 14:34:07 -
@@ -1,4 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.2 2017/06/17 07:07:56 jasper Exp $
+@conflict py-curtsies-*
+@pkgpath devel/py-curtsies
 lib/python${MODPY_VERSION}/site-packages/curtsies/
 
lib/python${MODPY_VERSION}/site-packages/curtsies-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/curtsies-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Index: Makefile
===
RCS file: /home/cvs/ports/devel/bpython/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile22 Sep 2019 21:46:07 -  1.26
+++ Makefile15 Mar 2020 15:28:30 -
@@ -5,6 +5,7 @@ COMMENT=fancy interface to the Python i
 MODPY_EGG_VERSION=0.18
 DISTNAME=  bpython-${MODPY_EGG_VERSION}
 CATEGORIES=devel
+REVISION = 0
 
 HOMEPAGE=  https://bpython-interpreter.org/
 MAINTAINER=Brian Callahan 
@@ -19,11 +20,7 @@ MODULES= lang/python
 MODPY_SETUPTOOLS=Yes
 
 FLAVORS =  python3
-FLAVOR ?=
-
-.if ${FLAVOR:Mpython3}
-PKGNAME =  bpython${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
-.endif
+FLAVOR =   python3
 
 RUN_DEPENDS=   devel/desktop-file-utils \
devel/py-curtsies${MODPY_FLAVOR} \
@@ -37,17 +34,5 @@ BUILD_DEPENDS=   devel/py-babel${MODPY_FLA
 
 TEST_DEPENDS=  devel/py-mock${MODPY_FLAVOR} \
devel/py-twisted${MODPY_FLAVOR}
-
-# de-conflict flavors
-post-install:
-.for b in bpdb bpython bpython-curses bpython-urwid
-   mv ${PREFIX}/bin/$b{,${MODPY_BIN_SUFFIX}}
-.endfor
-   mv ${PREFIX}/man/man1/bpython{,${MODPY_BIN_SUFFIX}}.1
-   mv ${PREFIX}/man/man5/bpython-config{,${MODPY_BIN_SUFFIX}}.5
-   mv 
${PREFIX}/share/appinfo/org.bpython-interpreter.bpython{,${MODPY_BIN_SUFFIX}}.appdata.xml
-   mv 
${PREFIX}/share/applications/org.bpython-interpreter.bpython{,${MODPY_BIN_SUFFIX}}.desktop
-   mv ${PREFIX}/share/pixmaps/bpython{,${MODPY_BIN_SUFFIX}}.png
-
 
 .include 
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/devel/bpython/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST   9 Aug 2019 00:00:40 -   1.9
+++ pkg/PLIST   15 Mar 2020 16:07:07 -
@@ -1,8 +1,10 @@
 @comment $OpenBSD: PLIST,v 1.9 2019/08/09 00:00:40 bcallah Exp $
-bin/bpdb${MODPY_BIN_SUFFIX}
-bin/bpython${MODPY_BIN_SUFFIX}
-bin/bpython-curses${MODPY_BIN_SUFFIX}
-bin/bpython-urwid${MODPY_BIN_SUFFIX}
+@conflict bpython

update: devel/py-wcwidth (cascading devel/{py-prompt_toolkit,ipython} dropping py2 support)

2020-03-15 Thread Paco Esteban
Hi ports@,

This is an easy update of devel/py-wcwidth to its latest version 0.1.8
I tried to make it py3 only, so this triggers a series of diffs to make
that possible.

First, for devel/py-wcwidth itself: installs ok and all tests pass for
me on amd64.

About its consumers:

* graphics/termtosvg
* all tests pass
* net/toot
* all tests pass
* devel/py-curtsies
* updated and converted to py3 only (sent on separate email).  All
  tests pass.
* devel/py-prompt_toolkit
* also attached to this email.  Just made py3 only and bumped
  revison.  All tests pass.
  This also triggers the conversion of devel/ipython to py3 only.
  Four tests fail, just as before.
  Maintainer (edd@) has some doubts about this.  Mainly if users
  will be upset for this.  Comments on this are appreciated.

comments ? ok ?

-- 
Paco Esteban.
0x5818130B8A6DBC03
Index: Makefile
===
RCS file: /home/cvs/ports/devel/py-wcwidth/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile12 Jul 2019 20:45:55 -  1.7
+++ Makefile13 Mar 2020 18:29:24 -
@@ -2,10 +2,9 @@
 
 COMMENT=   measures number of terminal column cells of wide-char 
code
 
-MODPY_EGG_VERSION= 0.1.7
+MODPY_EGG_VERSION= 0.1.8
 DISTNAME=  wcwidth-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
-REVISION=  1
 
 CATEGORIES=devel
 
@@ -22,6 +21,6 @@ MODPY_PYTEST =Yes
 MODPY_PYTEST_ARGS =wcwidth
 
 FLAVORS=   python3
-FLAVOR ?=
+FLAVOR =   python3
 
 .include 
Index: distinfo
===
RCS file: /home/cvs/ports/devel/py-wcwidth/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo29 Sep 2016 15:05:13 -  1.3
+++ distinfo13 Mar 2020 18:30:46 -
@@ -1,2 +1,2 @@
-SHA256 (wcwidth-0.1.7.tar.gz) = PfNzciJtbmPhseHtoVxZS8qYoi0zojgyqQmY+qlrxl4=
-SIZE (wcwidth-0.1.7.tar.gz) = 22884
+SHA256 (wcwidth-0.1.8.tar.gz) = 8os+imSD5dSef4lJrBp4MU50AzOuMFtLpd79PnT7N6g=
+SIZE (wcwidth-0.1.8.tar.gz) = 19957
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/devel/py-wcwidth/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   7 Jan 2016 08:13:29 -   1.1.1.1
+++ pkg/PLIST   13 Mar 2020 18:30:19 -
@@ -1,4 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2016/01/07 08:13:29 ajacoutot Exp $
+@conflict py-wcwidth-*
+@pkgpath devel/py-wcwidth
 lib/python${MODPY_VERSION}/site-packages/wcwidth/
 
lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Index: Makefile
===
RCS file: /home/cvs/ports/devel/py-prompt_toolkit/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile2 Dec 2019 14:16:45 -   1.14
+++ Makefile13 Mar 2020 18:45:31 -
@@ -9,6 +9,7 @@ MODPY_EGG_VERSION=  1.0.15
 DISTNAME=  prompt_toolkit-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
 EPOCH= 1
+REVISION=  0
 
 CATEGORIES=devel
 
@@ -29,6 +30,6 @@ RUN_DEPENDS=  devel/py-six${MODPY_FLAVOR
textproc/py-pygments${MODPY_FLAVOR}
 
 FLAVORS=   python3
-FLAVOR ?=
+FLAVOR =   python3
 
 .include 
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/devel/py-prompt_toolkit/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST   2 Dec 2019 14:16:45 -   1.8
+++ pkg/PLIST   13 Mar 2020 18:56:49 -
@@ -1,4 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.8 2019/12/02 14:16:45 bket Exp $
+@conflict py-prompt_toolkit-*
+@pkgpath devel/py-prompt_toolkit
 lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Index: Makefile
===
RCS file: /home/cvs/ports/devel/ipython/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- Makefile24 Nov 2019 19:40:48 -  1.52
+++ Makefile15 Mar 2020 16:15:14 -
@@ -3,7 +3,7 @@
 COMMENT=   enhanced interactive Python shell
 
 MODPY_EGG_VERSION =5.8.0
-REVISION = 2
+REVISION = 3
 DISTNAME=  ipython-${MODPY_EGG_VERSION}
 CATEGORIES=devel
 
@@ -20,6 +20,7 @@ RUN_DEPENDS = devel/py-decorator${MODPY
devel/desktop-file-utils

Re: clarification of REVISION and EPOCH documentation.

2020-03-15 Thread Paco Esteban
On Sat, 14 Mar 2020, Stuart Henderson wrote:

> > Index: bsd.port.mk.5
> > ===
> > RCS file: /home/cvs/src/share/man/man5/bsd.port.mk.5,v
> > retrieving revision 1.527
> > diff -u -p -r1.527 bsd.port.mk.5
> > --- bsd.port.mk.5   6 Mar 2020 15:22:44 -   1.527
> > +++ bsd.port.mk.5   14 Mar 2020 14:46:18 -
> > @@ -1632,6 +1632,9 @@ If set to
> >  will not open changed files in an editor.
> >  .It Ev EPOCH
> >  Epoch number of the current package.
> > +Used when version numbering changes completely upstream or an update has 
> > to be
> > +reverted.
> > +It always goes forward.
> 
> maybe this?
> 
> ...
> Used when the port version number is changed but the new version
> is not regarded by
> .Xr packages-specs 5
> as being newer.
> ...
> 
> Once added, it cannot be removed or go backwards.

I like your wording better.  Is more generic, and less repetitive as we
already talk about those 2 cases in other parts of the doc.
Not sure it "fits well" in the description, though.  This is how it
reads with your changes (I added them nonetheless):

EPOCH   Epoch number of the current package.  Used when the port version
is changed but the new version is not regarded by
packages-specs(5) as being newer.  Once added, it cannot be
removed or go backwards.  Defaults to empty (no need for
numbering changes), then numbering starts at 0.  Gets
automatically incorporated into FULLPKGNAME as ‘v${EPOCH}’ to
form a full package-name conforming to packages-specs(7).

> >  Defaults to empty (no need for numbering changes), then
> >  numbering starts at 0.
> >  Gets automatically incorporated into
> 
> Perhaps we should also mention that if a port depends on another port
> using a version spec ("foo->=1.1" or similar), the version spec in the
> dependent port must be changed too... Not sure how to word it though.

oh, that did not occur to me ...  You mean that if port foo/bar gets
EPOCH = 0, then all dependent ports should change it's dependencies
declarations from foo/bar>=1.1 to foo/bar>=1.1v0 ??

> > Index: packages-specs.7
> > ===
> > RCS file: /home/cvs/src/share/man/man7/packages-specs.7,v
> > retrieving revision 1.25
> > diff -u -p -r1.25 packages-specs.7
> > --- packages-specs.727 Oct 2014 22:45:30 -  1.25
> > +++ packages-specs.714 Mar 2020 15:00:42 -
> > @@ -144,12 +144,39 @@ then normal version, and finally
> >  .El
> >  .El
> >  .Pp
> > -In some rare cases, version numbering changes completely upstream.
> > +In some rare cases, version numbering changes completely upstream, or 
> > something
> > +unexpected happens and an update has to be reverted.
> 
> In some rare cases, a change to a port would cause the version number
> to compare as older than the previous version.
> This happens if an update is reverted, if upstream's numbering scheme
> changes completely, or if their usual scheme does not align with
> the one used by
> .Ox .

This reads definitely better.  Adding it.

> >  A version style marker, of the form
> >  .Sq v0 ,
> >  .Sq v1 ...
> >  can be appended to the version number (after the patch level)
> >  to denote the new numbering scheme.
> 
> This is added by setting
> ???some markup??? EPOCH
> in the port Makefile.

Added too.
I used `.Ev` here.  Not sure is the correct macro, but as this is close
to an environment variable I think is ok ...

> Maybe I missed something in what's meant, but the following examples
> are all exactly the wrong way round.. 0.1p0 is newer than 0.1,
> 0.2 is newer than 0.1p0, etc.

You're totally right ...  I did it backwards.  I was trying to maintain
the wording coherent with the previous list (use older instead of newer)
and don't know what happened in my head.  Fixed it.

All 3 diffs attached again for convenience.

-- 
Paco Esteban.
0x5818130B8A6DBC03
Index: bsd.port.mk.5
===
RCS file: /home/cvs/src/share/man/man5/bsd.port.mk.5,v
retrieving revision 1.527
diff -u -p -r1.527 bsd.port.mk.5
--- bsd.port.mk.5   6 Mar 2020 15:22:44 -   1.527
+++ bsd.port.mk.5   15 Mar 2020 11:03:12 -
@@ -1632,6 +1632,10 @@ If set to
 will not open changed files in an editor.
 .It Ev EPOCH
 Epoch number of the current package.
+Used when the port version is changed but the new version is not regarded by
+.Xr packages-specs 5
+as being newer.
+Once added, it cannot be removed or go backwards.
 Defaults to empty (no need for numbering changes), then
 numbering star

Re: I'd like to remove tortoisehg. Anyone using it?.

2020-03-15 Thread Paco Esteban
On Sat, 14 Mar 2020, Juan Francisco Cantero Hurtado wrote:

> I would like to remove the port before of 6.7. Any objection?. Is anyone
> yelling at me?. I can't hear you.

I'm not a heavy mercurial user, just a couple of repos and never used
tortoisehg.  But I'm all into moving to python3.

for what it's worth, ok paco@ to remove devel/tortoisehg.

-- 
Paco Esteban.
0x5818130B8A6DBC03



clarification of REVISION and EPOCH documentation.

2020-03-14 Thread Paco Esteban
Hi ports@,

Find attached 3 diffs for bsd.ports.mk(5), packages-specs(7) and
www/faq/ports/guide.html

This comes from a question I asked yesterday about REVISION and EPOCH
which naddy@ tried to explain to me.

I think this explanation was really clear and simple and I have been
encouraged to add it to the related documentation.

I basically repeated/adapted some bits and pieces between the 3 sources
and added naddy's "graphical" explanation.

I'm aware this changes are pretty rough, but I send them hoping to get
comments and discussion.

Cheers,

-- 
Paco Esteban.
0x5818130B8A6DBC03
Index: bsd.port.mk.5
===
RCS file: /home/cvs/src/share/man/man5/bsd.port.mk.5,v
retrieving revision 1.527
diff -u -p -r1.527 bsd.port.mk.5
--- bsd.port.mk.5   6 Mar 2020 15:22:44 -   1.527
+++ bsd.port.mk.5   14 Mar 2020 14:46:18 -
@@ -1632,6 +1632,9 @@ If set to
 will not open changed files in an editor.
 .It Ev EPOCH
 Epoch number of the current package.
+Used when version numbering changes completely upstream or an update has to be
+reverted.
+It always goes forward.
 Defaults to empty (no need for numbering changes), then
 numbering starts at 0.
 Gets automatically incorporated into
Index: packages-specs.7
===
RCS file: /home/cvs/src/share/man/man7/packages-specs.7,v
retrieving revision 1.25
diff -u -p -r1.25 packages-specs.7
--- packages-specs.727 Oct 2014 22:45:30 -  1.25
+++ packages-specs.714 Mar 2020 15:00:42 -
@@ -144,12 +144,39 @@ then normal version, and finally
 .El
 .El
 .Pp
-In some rare cases, version numbering changes completely upstream.
+In some rare cases, version numbering changes completely upstream, or something
+unexpected happens and an update has to be reverted.
 A version style marker, of the form
 .Sq v0 ,
 .Sq v1 ...
 can be appended to the version number (after the patch level)
 to denote the new numbering scheme.
+Combined with
+.Ev REVISION ,
+this leaves the version ordering as follows:
+.Bl -dash
+.It
+"0.1p0" is older than "0.1"
+.It
+"0.2" is older than "0.1p0" (or
+.Sq p1 ,
+.Sq p2 ... )
+.It
+"0.1v0" is older than "0.2" (or any other version number without
+.Sq v )
+.It
+"0.1p0v0" is older than "0.1v0".
+Just as showed in the first point.
+.It
+"0.2v0" is older than "0.1p0v0".
+The same as the second point.
+.It
+"0.1v1" is older than "0.2v0" (or any other version with a lower
+.Sq v
+value)
+.El
+.El
+.Pp
 See
 .Ev EPOCH
 in
Index: faq/ports/guide.html
===
RCS file: /home/cvs/www/faq/ports/guide.html,v
retrieving revision 1.89
diff -u -p -r1.89 guide.html
--- faq/ports/guide.html28 Sep 2019 21:35:05 -  1.89
+++ faq/ports/guide.html14 Mar 2020 14:39:36 -
@@ -1131,6 +1131,8 @@ changes to patches or build flags.
 If the upstream version has not changed, the package name bump is done
 by incrementing REVISION if already present, otherwise adding
 REVISION = 0 towards the top of the Makefile.
+This will add p${REVISION} to FULLPKGNAME to form a 
full
+package-name conforming to packages-specs(7).
 
 
 Version numbers always go forward.
@@ -1138,6 +1140,8 @@ If something unexpected happens and you 
 upstream numbering changes completely so that the version number appears
 to go backwards, you must use EPOCH to make sure pkg_add(1) sees
 the package as a newer package.
+This will add v${EPOCH} to FULLPKGNAME to form a full
+package-name conforming to packages-specs(7).
 
 
 If the package does not build, no bump is needed: changes to restore a port
@@ -1153,6 +1157,11 @@ The package system uses a signature mech
 is fully identified by its package names, plus the dependencies against
 which it was built, plus the version numbers of all shared libraries it
 contains.
+
+
+The version comparison ordering can be summarized as:
+0.1  0.1p0  0.2  0.1v0  0.1p0v0  0.2v0  
0.1v1.
+Check packages-specs(7) for more detailed information.
 
 
 Part of the work will happen before the update itself.


CVS: cvs.openbsd.org: ports

2020-03-10 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/03/10 10:29:09

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
add quirks for py-gunicorn and py-multidict

ok jca@



CVS: cvs.openbsd.org: ports

2020-03-10 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/03/10 10:28:09

Modified files:
www: Makefile 

Log message:
py-gunicorn is py3 only now.
py-multidict uses new FLAVOR=python3 style.

ok sthen@ jca@



CVS: cvs.openbsd.org: ports

2020-03-10 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/03/10 10:26:31

Modified files:
www/py-gunicorn: Makefile distinfo 
www/py-gunicorn/pkg: PLIST 
Removed files:
www/py-gunicorn/patches: patch-requirements_test_txt 

Log message:
update www/py-gunicorn to 20.0.4

While here:
* apply the new style py3 only flavor
* use pytest for regression tests
* change HOMEPAGE to https

With some help from sthen@

ok sthen@ jca@



CVS: cvs.openbsd.org: ports

2020-03-10 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/03/10 10:25:51

Modified files:
www/py-aiohttp : Makefile 

Log message:
www/py-multidict uses now FLAVOR=python3, so bump and ${MODPY_FLAVOR}
are needed.

ok sthen@ jca@



CVS: cvs.openbsd.org: ports

2020-03-10 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/03/10 10:24:47

Modified files:
www/py-yarl: Makefile 

Log message:
www/py-multidict uses now FLAVOR=python3, so bump and ${MODPY_FLAVOR}
are needed.

ok sthen@ jca@



CVS: cvs.openbsd.org: ports

2020-03-10 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/03/10 10:24:04

Modified files:
www/py-multidict: Makefile distinfo 
www/py-multidict/pkg: PLIST 
Removed files:
www/py-multidict/patches: patch-multidict__multidict_c 

Log message:
update www/py-multidict to 4.7.5

While here apply the new style py3 only flavor.
With some help from sthen@

ok sthen@ jca@



Re: CVS: cvs.openbsd.org: ports

2020-03-10 Thread Paco Esteban
On Tue, 10 Mar 2020, Paco Esteban wrote:

> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   p...@cvs.openbsd.org2020/03/10 03:20:06
> 
> Modified files:
>   www/hugo   : Makefile distinfo 
> 
> Log message:
> update www/hugo to latest version (0.67.0)
> 

Forgot to mention, this is ok jca@

-- 
Paco Esteban.
0x5818130B8A6DBC03



CVS: cvs.openbsd.org: ports

2020-03-10 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/03/10 03:20:06

Modified files:
www/hugo   : Makefile distinfo 

Log message:
update www/hugo to latest version (0.67.0)



maintainer update: www/hugo

2020-03-10 Thread Paco Esteban
Hi ports@,

This is a trivial diff to update www/hugo to the lastest version.  This
new release includes:

Enhancements

Other
* Doument the server config 63393230 @bep
* Support unComparable args of uniq/complement/in 8279d2e2 @satotake
  #6105
* Add HTTP header support for the dev server 10831444 @bep #7031
* Add include and exclude support for remote 51e178a6 @davidejones

Fixes

Templates
* Fix error with unicode in file paths c4fa2f07 @sams96 #6996

Other
* Fix ambigous error on site.GetPage 6cceef65 @bep #7016
* Fix handling of HTML files without front matter ffcb4aeb @bep
  #7030#7028#6789


ok ?


Index: Makefile
===
RCS file: /home/cvs/ports/www/hugo/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile5 Mar 2020 06:16:25 -   1.11
+++ Makefile10 Mar 2020 06:37:06 -
@@ -3,7 +3,7 @@ ONLY_FOR_ARCHS =${GO_ARCHS}
 
 COMMENT =  fast and flexible static site generator
 
-DISTNAME = hugo-0.66.0
+DISTNAME = hugo-0.67.0
 
 CATEGORIES =   www
 
Index: distinfo
===
RCS file: /home/cvs/ports/www/hugo/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo5 Mar 2020 06:16:25 -   1.9
+++ distinfo10 Mar 2020 06:37:29 -
@@ -1,2 +1,2 @@
-SHA256 (hugo-0.66.0.tar.gz) = vz75fCppiWmo/kqWRk8ANpNK1Bz3Q4pxNyZaaLC9e/8=
-SIZE (hugo-0.66.0.tar.gz) = 37193991
+SHA256 (hugo-0.67.0.tar.gz) = NQg750Jnd/sIGQ/aBMSjs1riolvcFRtdSBSPtQDHxDA=
+SIZE (hugo-0.67.0.tar.gz) = 37845670

-- 
Paco Esteban.
0x5818130B8A6DBC03



Re: update: www/py-gnunicorn

2020-03-09 Thread Paco Esteban
ION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}gtornado.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}sync.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}workertmp.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/_gaiohttp.py
 lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/base.py
 lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/base_async.py
-lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/gaiohttp.py
 lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/geventlet.py
 lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/ggevent.py
 lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/gthread.py

-- 
Paco Esteban.
0x5818130B8A6DBC03



Re: update: www/py-gnunicorn

2020-03-09 Thread Paco Esteban
On Sun, 08 Mar 2020, Paco Esteban wrote:

> On Sun, 08 Mar 2020, Paco Esteban wrote:
> 
> > About the port itself, I made it py3 only, as the consumers are already
> > py3 only.
> 
> Forgot to mention that commits for www/Makefile and quirks will follow
> if this gets ok, of course.

Applying sthen's suggestions on www/py-multidict makes this diff
a little bit different.  I've kept the separation of ${MODPY_FLAVOR}
ports for style consistency with what was already on the port.
I personally do not like it and prefer to have a single list.  Let me
know what's the best approach.

ok ? comments ?


Index: Makefile
===
RCS file: /home/cvs/ports/www/py-gunicorn/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile12 Jul 2019 20:51:01 -  1.23
+++ Makefile9 Mar 2020 14:41:38 -
@@ -2,11 +2,10 @@
 
 COMMENT =  Python WSGI HTTP server
 
-MODPY_EGG_VERSION =19.9.0
+MODPY_EGG_VERSION =20.0.4
 DISTNAME = gunicorn-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 CATEGORIES =   www
-REVISION = 0
 
 HOMEPAGE = http://gunicorn.org/
 
@@ -16,26 +15,20 @@ PERMIT_PACKAGE =Yes
 MODULES =  lang/python
 MODPY_PI = Yes
 MODPY_SETUPTOOLS = Yes
+MODPY_PYTEST = Yes
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR =   python3
+
+RUN_DEPENDS =  www/py-multidict${MODPY_FLAVOR}
+
+RUN_DEPENDS += www/py-aiohttp
 
-# py-aiohttp and py-multidict are python3 only
-.if ${FLAVOR:Mpython3}
-RUN_DEPENDS += www/py-aiohttp \
-   www/py-multidict
-.endif
 TEST_DEPENDS = devel/py-coverage${MODPY_FLAVOR} \
devel/py-test${MODPY_FLAVOR} \
devel/py-test-cov${MODPY_FLAVOR} \
${BASE_PKGPATH}=${MODPY_EGG_VERSION}
-.if ! ${FLAVOR:Mpython3}
-TEST_DEPENDS +=devel/py-mock
-.endif
 
-post-install:
-   for i in ${PREFIX}/bin/*; do \
-   mv $${i} $${i}${MODPY_BIN_SUFFIX} ;\
-   done
+TEST_DEPENDS +=devel/py-mock
 
 .include 
Index: distinfo
===
RCS file: /home/cvs/ports/www/py-gunicorn/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo24 Apr 2019 20:14:08 -  1.14
+++ distinfo9 Mar 2020 14:39:21 -
@@ -1,2 +1,2 @@
-SHA256 (gunicorn-19.9.0.tar.gz) = +iZiCXxm+SD1P3BiHGxYyko8TTQ0IF5gjhIbWztx9PM=
-SIZE (gunicorn-19.9.0.tar.gz) = 415774
+SHA256 (gunicorn-20.0.4.tar.gz) = GQS7K4pDZYgHEI1Zw/PVbCthIacBFh3g3fmtFABzxiY=
+SIZE (gunicorn-20.0.4.tar.gz) = 373841
Index: patches/patch-requirements_test_txt
===
RCS file: patches/patch-requirements_test_txt
diff -N patches/patch-requirements_test_txt
--- patches/patch-requirements_test_txt 24 Apr 2019 20:14:08 -  1.4
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-requirements_test_txt,v 1.4 2019/04/24 20:14:08 sthen Exp $
-
-Relax overly strict requirements
-
-Index: requirements_test.txt
 requirements_test.txt.orig
-+++ requirements_test.txt
-@@ -1,3 +1,3 @@
--coverage>=4.0,<4.4  # TODO: https://github.com/benoitc/gunicorn/issues/1548
--pytest==3.2.5  # TODO: upgrade to latest version requires drop support to 
Python 2.6
--pytest-cov==2.5.1
-+coverage
-+pytest
-+pytest-cov
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/www/py-gunicorn/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST   24 Apr 2019 20:14:08 -  1.9
+++ pkg/PLIST   9 Mar 2020 14:39:21 -
@@ -1,6 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.9 2019/04/24 20:14:08 sthen Exp $
-bin/gunicorn${MODPY_BIN_SUFFIX}
-bin/gunicorn_paster${MODPY_BIN_SUFFIX}
+@conflict py-gunicorn-*
+@pkgpath www/py-gunicorn
+bin/gunicorn
 lib/python${MODPY_VERSION}/site-packages/gunicorn/
 
lib/python${MODPY_VERSION}/site-packages/gunicorn-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/gunicorn-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -13,21 +14,16 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/gunicorn/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gunicorn/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/gunicorn/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gunicorn/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gunicorn/${MODPY_PYCACHE}arbiter.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gunicorn/${MODPY_PYCACHE}argparse_compat.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-package

Re: update: www/py-multidict

2020-03-09 Thread Paco Esteban
On Mon, 09 Mar 2020, Stuart Henderson wrote:

> On 2020/03/08 18:47, Paco Esteban wrote:
> > Hi ports@,
> > 
> > Here's an update for www/py-multidict to 4.7.5
> 
> Could you convert to new-style FLAVOR=python3 / FLAVORS=python3 while there 
> please?
> (depends in py-yarl, py-aiohttp, py-gunicorn will need bumps and  
> ${MODPY_FLAVOR}
> adding to the multidict line).
> 
> > --- pkg/PLIST   26 Apr 2018 13:05:38 -  1.3
> > +++ pkg/PLIST   6 Mar 2020 18:22:56 -
> > @@ -1,5 +1,5 @@
> >  @comment $OpenBSD: PLIST,v 1.3 2018/04/26 13:05:38 danj Exp $
> > -@pkgpath www/py3-multidict
> > +@pkgpath www/${MODPY_PY_PREFIX}multidict
> 
> Please put this line back how it was.

Find attached the modified diff for www/py-multidict.  I've also
included 2 diffs for www/py-yarl and www/py-aiohttp.  For py-gunicorn,
I'll send as a response to the thread I started for its update.

I'll also commit mods to www/Makefile and quirks if this is ok.

Cheers,

-- 
Paco Esteban.
0x5818130B8A6DBC03
Index: Makefile
===
RCS file: /home/cvs/ports/www/py-multidict/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile12 Jul 2019 20:51:02 -  1.7
+++ Makefile9 Mar 2020 14:37:16 -
@@ -2,13 +2,12 @@
 
 COMMENT =  multidict implementation
 
-MODPY_EGG_VERSION =4.2.0
-REVISION = 1
+MODPY_EGG_VERSION =4.7.5
 DISTNAME = multidict-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 CATEGORIES =   www devel
 
-WANTLIB += pthread ${MODPY_WANTLIB}
+WANTLIB += pthread ${MODPY_WANTLIB}
 
 # Apache2
 PERMIT_PACKAGE =   Yes
@@ -17,8 +16,12 @@ MODULES =lang/python
 
 MODPY_PI = Yes
 MODPY_SETUPTOOLS = Yes
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
+MODPY_PYTEST = Yes
 
-TEST_DEPENDS = devel/py-test${MODPY_FLAVOR}
+FLAVORS =  python3
+FLAVOR =   python3
+
+TEST_DEPENDS = devel/py-test${MODPY_FLAVOR} \
+   devel/py-test-cov${MODPY_FLAVOR}
 
 .include 
Index: distinfo
===
RCS file: /home/cvs/ports/www/py-multidict/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo26 Apr 2018 13:05:38 -  1.3
+++ distinfo9 Mar 2020 14:34:30 -
@@ -1,2 +1,2 @@
-SHA256 (multidict-4.2.0.tar.gz) = JAUnJBleRocnOfqhDGEZV7us6uKO7JLhzkkVCxFexe0=
-SIZE (multidict-4.2.0.tar.gz) = 137359
+SHA256 (multidict-4.7.5.tar.gz) = ruKDxJYB+kwTrcZMCcl4g4p+gS+FN3rhMKJNcZjAMx4=
+SIZE (multidict-4.7.5.tar.gz) = 50845
Index: patches/patch-multidict__multidict_c
===
RCS file: patches/patch-multidict__multidict_c
diff -N patches/patch-multidict__multidict_c
--- patches/patch-multidict__multidict_c1 Aug 2018 22:39:13 -   
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-multidict__multidict_c,v 1.1 2018/08/01 22:39:13 juanfra Exp $
-
-Os breaks the build on GCC4 platforms.
-
-Index: multidict/_multidict.c
 multidict/_multidict.c.orig
-+++ multidict/_multidict.c
-@@ -20116,8 +20116,6 @@ static int __Pyx_modinit_function_import_code(void) {
- #ifndef CYTHON_SMALL_CODE
- #if defined(__clang__)
- #define CYTHON_SMALL_CODE
--#elif defined(__GNUC__)
--#define CYTHON_SMALL_CODE __attribute__((optimize("Os")))
- #else
- #define CYTHON_SMALL_CODE
- #endif
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/www/py-multidict/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   26 Apr 2018 13:05:38 -  1.3
+++ pkg/PLIST   9 Mar 2020 14:35:43 -
@@ -8,18 +8,23 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/multidict-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/multidict/__init__.py
 lib/python${MODPY_VERSION}/site-packages/multidict/__init__.pyi
-lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}_abc.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}_multidict_base.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}_multidict_py.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/multidict/_abc.py
 lib/python${MODPY_VERSION}/

Re: [UPDATE] ropper et filebytes

2020-03-09 Thread Paco Esteban
Hi Remi,

On Sun, 08 Mar 2020, Remi Pointel wrote:

> Hi,
> 
> these are the diff to update filebytes and ropper to latest releases.
> 
> Ok?

ropper has no consumers and filebytes only has ropper.  I gess those are
perfect candidates to go py3 only, don't you think ?

Cheers,

-- 
Paco Esteban.
0x5818130B8A6DBC03



Re: update: www/py-gnunicorn

2020-03-08 Thread Paco Esteban
On Sun, 08 Mar 2020, Paco Esteban wrote:

> About the port itself, I made it py3 only, as the consumers are already
> py3 only.

Forgot to mention that commits for www/Makefile and quirks will follow
if this gets ok, of course.

Cheers,

-- 
Paco Esteban.
0x5818130B8A6DBC03



update: www/py-gnunicorn

2020-03-08 Thread Paco Esteban
VERSION}/site-packages/gunicorn/config.py
 lib/python${MODPY_VERSION}/site-packages/gunicorn/debug.py
 lib/python${MODPY_VERSION}/site-packages/gunicorn/errors.py
@@ -48,14 +43,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/gunicorn/http/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gunicorn/http/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/gunicorn/http/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gunicorn/http/${MODPY_PYCACHE}_sendfile.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gunicorn/http/${MODPY_PYCACHE}body.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gunicorn/http/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gunicorn/http/${MODPY_PYCACHE}message.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gunicorn/http/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gunicorn/http/${MODPY_PYCACHE}unreader.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gunicorn/http/${MODPY_PYCACHE}wsgi.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gunicorn/http/_sendfile.py
 lib/python${MODPY_VERSION}/site-packages/gunicorn/http/body.py
 lib/python${MODPY_VERSION}/site-packages/gunicorn/http/errors.py
 lib/python${MODPY_VERSION}/site-packages/gunicorn/http/message.py
@@ -70,8 +63,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/gunicorn/instrument/statsd.py
 lib/python${MODPY_VERSION}/site-packages/gunicorn/pidfile.py
 lib/python${MODPY_VERSION}/site-packages/gunicorn/reloader.py
-lib/python${MODPY_VERSION}/site-packages/gunicorn/selectors.py
-lib/python${MODPY_VERSION}/site-packages/gunicorn/six.py
 lib/python${MODPY_VERSION}/site-packages/gunicorn/sock.py
 lib/python${MODPY_VERSION}/site-packages/gunicorn/systemd.py
 lib/python${MODPY_VERSION}/site-packages/gunicorn/util.py
@@ -79,20 +70,16 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}_gaiohttp.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}base_async.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}gaiohttp.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}geventlet.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}ggevent.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}gthread.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}gtornado.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}sync.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}workertmp.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/_gaiohttp.py
 lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/base.py
 lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/base_async.py
-lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/gaiohttp.py
 lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/geventlet.py
 lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/ggevent.py
 lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/gthread.py

-- 
Paco Esteban.
0x5818130B8A6DBC03



update: www/py-multidict

2020-03-08 Thread Paco Esteban
/multidict/_multidict.c
-lib/python${MODPY_VERSION}/site-packages/multidict/_multidict.pyx
-lib/python${MODPY_VERSION}/site-packages/multidict/_multidict.so
+@so lib/python${MODPY_VERSION}/site-packages/multidict/_multidict.so
+lib/python${MODPY_VERSION}/site-packages/multidict/_multidict_base.py
 lib/python${MODPY_VERSION}/site-packages/multidict/_multidict_py.py
+lib/python${MODPY_VERSION}/site-packages/multidict/_multilib/
+lib/python${MODPY_VERSION}/site-packages/multidict/_multilib/defs.h
+lib/python${MODPY_VERSION}/site-packages/multidict/_multilib/dict.h
+lib/python${MODPY_VERSION}/site-packages/multidict/_multilib/istr.h
+lib/python${MODPY_VERSION}/site-packages/multidict/_multilib/iter.h
+lib/python${MODPY_VERSION}/site-packages/multidict/_multilib/pair_list.h
+lib/python${MODPY_VERSION}/site-packages/multidict/_multilib/views.h
 lib/python${MODPY_VERSION}/site-packages/multidict/py.typed

-- 
Paco Esteban.
0x5818130B8A6DBC03



CVS: cvs.openbsd.org: ports

2020-03-04 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/03/04 23:16:25

Modified files:
www/hugo   : Makefile distinfo 

Log message:
update www/hugo to 0.66.0

ok sthen@, jca@



maintainer update: www/hugo

2020-03-03 Thread Paco Esteban
Hi ports@

This is an update for www/hugo to 0.66.0.  You can see the software
changes here:

https://github.com/gohugoio/hugo/releases/tag/v0.66.0

The port update is pretty simple and it does not have consumers.
I tested lightly, so more eyes are welcome.

Comments ? ok ?

Index: Makefile
===
RCS file: /home/cvs/ports/www/hugo/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile1 Mar 2020 21:20:21 -   1.10
+++ Makefile3 Mar 2020 16:38:55 -
@@ -3,7 +3,7 @@ ONLY_FOR_ARCHS =${GO_ARCHS}
 
 COMMENT =  fast and flexible static site generator
 
-DISTNAME = hugo-0.65.3
+DISTNAME = hugo-0.66.0
 
 CATEGORIES =   www
 
Index: distinfo
===
RCS file: /home/cvs/ports/www/hugo/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo1 Mar 2020 21:20:21 -   1.8
+++ distinfo3 Mar 2020 16:43:53 -
@@ -1,2 +1,2 @@
-SHA256 (hugo-0.65.3.tar.gz) = B4VLGrWaWz/W9a2CuDGuULyWDcUYU6JmNOjToVpfAgI=
-SIZE (hugo-0.65.3.tar.gz) = 37188070
+SHA256 (hugo-0.66.0.tar.gz) = vz75fCppiWmo/kqWRk8ANpNK1Bz3Q4pxNyZaaLC9e/8=
+SIZE (hugo-0.66.0.tar.gz) = 37193991

-- 
Paco Esteban.
0x5818130B8A6DBC03



CVS: cvs.openbsd.org: ports

2020-03-01 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/03/01 14:20:22

Modified files:
www/hugo   : Makefile distinfo 
www/hugo/pkg   : PLIST 
Removed files:
www/hugo/patches: 
  patch-vendor_github_com_tdewolff_minify_v2_common_go 
  patch-vendor_github_com_tdewolff_minify_v2_css_css_go 
  
patch-vendor_github_com_tdewolff_minify_v2_html_buffer_go 
  
patch-vendor_github_com_tdewolff_minify_v2_html_html_go 
  
patch-vendor_github_com_tdewolff_minify_v2_html_table_go 
  patch-vendor_github_com_tdewolff_minify_v2_js_js_go 
  
patch-vendor_github_com_tdewolff_minify_v2_json_json_go 
  patch-vendor_github_com_tdewolff_minify_v2_minify_go 
  
patch-vendor_github_com_tdewolff_minify_v2_svg_buffer_go 
  patch-vendor_github_com_tdewolff_minify_v2_svg_svg_go 
  
patch-vendor_github_com_tdewolff_minify_v2_svg_table_go 
  
patch-vendor_github_com_tdewolff_minify_v2_xml_buffer_go 
  patch-vendor_github_com_tdewolff_minify_v2_xml_xml_go 
  
patch-vendor_github_com_tdewolff_parse_v2_buffer_buffer_go 
  
patch-vendor_github_com_tdewolff_parse_v2_buffer_lexer_go 
  
patch-vendor_github_com_tdewolff_parse_v2_buffer_reader_go 
  
patch-vendor_github_com_tdewolff_parse_v2_buffer_streamlexer_go 
  
patch-vendor_github_com_tdewolff_parse_v2_buffer_writer_go 
  patch-vendor_github_com_tdewolff_parse_v2_common_go 
  patch-vendor_github_com_tdewolff_parse_v2_css_lex_go 
  
patch-vendor_github_com_tdewolff_parse_v2_css_parse_go 
  patch-vendor_github_com_tdewolff_parse_v2_css_util_go 
  patch-vendor_github_com_tdewolff_parse_v2_html_lex_go 
  
patch-vendor_github_com_tdewolff_parse_v2_html_util_go 
  patch-vendor_github_com_tdewolff_parse_v2_js_lex_go 
  
patch-vendor_github_com_tdewolff_parse_v2_json_parse_go 
  
patch-vendor_github_com_tdewolff_parse_v2_strconv_float_go 
  
patch-vendor_github_com_tdewolff_parse_v2_strconv_int_go 
  patch-vendor_github_com_tdewolff_parse_v2_util_go 
  patch-vendor_github_com_tdewolff_parse_v2_xml_lex_go 
  patch-vendor_github_com_tdewolff_parse_v2_xml_util_go 

Log message:
update www/hugo to 0.65.3
also taking maintainer.

ok abieber@, jca@



CVS: cvs.openbsd.org: ports

2020-03-01 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/03/01 13:04:12

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
add quirk for py-html2text



CVS: cvs.openbsd.org: ports

2020-03-01 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/03/01 12:55:13

Modified files:
converters : Makefile 

Log message:
remove py-html2text.  Now py3 only.



CVS: cvs.openbsd.org: ports

2020-03-01 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/03/01 12:52:41

Modified files:
converters/py-html2text: Makefile distinfo 
converters/py-html2text/pkg: PLIST 

Log message:
update to '2020.1.16'

While here make the port py3 only as all comsumers are py3 only already.

ok jca@



update: converters/py-html2text

2020-03-01 Thread Paco Esteban
t
 lib/python${MODPY_VERSION}/site-packages/html2text/
 
lib/python${MODPY_VERSION}/site-packages/html2text-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
@@ -9,13 +11,18 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/html2text-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
 
lib/python${MODPY_VERSION}/site-packages/html2text-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/html2text/__init__.py
+lib/python${MODPY_VERSION}/site-packages/html2text/__main__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/html2text/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/html2text/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html2text/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/html2text/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/html2text/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/html2text/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html2text/${MODPY_PYCACHE}elements.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html2text/${MODPY_PYCACHE}typing.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/html2text/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/html2text/cli.py
-lib/python${MODPY_VERSION}/site-packages/html2text/compat.py
 lib/python${MODPY_VERSION}/site-packages/html2text/config.py
+lib/python${MODPY_VERSION}/site-packages/html2text/elements.py
+lib/python${MODPY_VERSION}/site-packages/html2text/py.typed
+lib/python${MODPY_VERSION}/site-packages/html2text/typing.py
 lib/python${MODPY_VERSION}/site-packages/html2text/utils.py

-- 
Paco Esteban.
0x5818130B8A6DBC03



CVS: cvs.openbsd.org: ports

2020-02-27 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/02/27 11:47:58

Modified files:
sysutils/py-prometheus_client/pkg: PLIST 

Log message:
fix @conflict line
Thanks bket@ for the heads up

ok kmos@



CVS: cvs.openbsd.org: ports

2020-02-26 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/02/26 03:46:42

Modified files:
sysutils   : Makefile 

Log message:
remove py-prometheus_client

ok jca@



CVS: cvs.openbsd.org: ports

2020-02-26 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/02/26 02:12:30

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
add quirk for py-prometheus_client

ok kmos



CVS: cvs.openbsd.org: ports

2020-02-26 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/02/26 02:09:00

Modified files:
sysutils/py-prometheus_client: Makefile 
sysutils/py-prometheus_client/pkg: PLIST 

Log message:
Migrate to python3 only

ok bket@, kmos@



Re: www/hugo needs a volunteer

2020-02-25 Thread Paco Esteban
On Mon, 24 Feb 2020, Aaron Bieber wrote:

> On Sat, 22 Feb 2020 at 09:24:19 +0100, Rafael Sadowski wrote:
> > Hi ports@,
> > 
> > www/hugo needs a volunteer/maintainer to update and build a new tarball
> > with all bundle/vendor dependencies. If you need distfile hosting feel
> > free to mail me.
> > 
> > I would be happy if someone would take responsibility for this port.
> > 
> > RS
> > 
> 
> Here ya go: 
> 
>   https://deftly.net/dist/hugo-0.65.3.tar.gz
> 
> I started working on a "proxy-proxy" which one will be able to use to request
> a vendored tarball by passing in a module name.
> 
> Plan is to have something like:
> 
>   ftp https://proxy.suah.dev/github.com/gohugoio/hugo
> 
> Which would give you a tarball likek the one linked above (for the latest
> version of 'github.com/gohugoio/hugo'.
> 
> Anyway - it isn't ready yet, but hopefully soon :D

Following this.  Here's a diff for the updated version.

- generated new tarball (as per abieber@ instructions) and hosted it
  myself
- Added myself as maintainer.
- removed all existing patches, they do not apply anymore.  They seem to
  be ok upstream now.
- about tests, I was able to make them run (again, as per abieber's
  instructions), but there are some that fail either because the test
  suite tries to download stuff from the internet or because $WRKSRC is
  not a git repo.  We may fix the former, but the later will imply
  invalidate those test I guess.  For now I left the NO_TEST alone.

About hugo itself, the changes list is endless.  I only tested it
lightly with a test site and all seems to work fine.  I could use
another set of eyes here.

Comments ? ok ?


Index: Makefile
===
RCS file: /home/cvs/ports/www/hugo/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile17 Jul 2019 14:39:44 -  1.9
+++ Makefile25 Feb 2020 15:40:59 -
@@ -3,19 +3,20 @@ ONLY_FOR_ARCHS =  ${GO_ARCHS}
 
 COMMENT =  fast and flexible static site generator
 
-DISTNAME = hugo-0.53
-REVISION =     0
+DISTNAME = hugo-0.65.3
 
 CATEGORIES =   www
 
 HOMEPAGE = https://gohugo.io/
 
+MAINTAINER =   Paco Esteban 
+
 #Apache License 2.0
 PERMIT_PACKAGE =   Yes
 
 WANTLIB += c pthread
 
-MASTER_SITES = https://files.fairydust.space/
+MASTER_SITES = https://e1e0.net/dist/
 
 MODULES =  lang/go
 
Index: distinfo
===
RCS file: /home/cvs/ports/www/hugo/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo27 Dec 2018 17:39:35 -  1.7
+++ distinfo25 Feb 2020 08:57:03 -
@@ -1,2 +1,2 @@
-SHA256 (hugo-0.53.tar.gz) = M4Lkh4+N+vR6D+Wztogd5EC6MQjdAWB3qX+OI4LbWg8=
-SIZE (hugo-0.53.tar.gz) = 23543277
+SHA256 (hugo-0.65.3.tar.gz) = B4VLGrWaWz/W9a2CuDGuULyWDcUYU6JmNOjToVpfAgI=
+SIZE (hugo-0.65.3.tar.gz) = 37188070
Index: patches/patch-vendor_github_com_tdewolff_minify_v2_common_go
===
RCS file: patches/patch-vendor_github_com_tdewolff_minify_v2_common_go
diff -N patches/patch-vendor_github_com_tdewolff_minify_v2_common_go
--- patches/patch-vendor_github_com_tdewolff_minify_v2_common_go12 Sep 
2019 19:02:59 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-vendor_github_com_tdewolff_minify_v2_common_go,v 1.1 
2019/09/12 19:02:59 jsing Exp $
-
-Index: vendor/github.com/tdewolff/minify/v2/common.go
 vendor/github.com/tdewolff/minify/v2/common.go.orig
-+++ vendor/github.com/tdewolff/minify/v2/common.go
-@@ -1,4 +1,4 @@
--package minify // import "github.com/tdewolff/minify"
-+package minify
- 
- import (
-   "bytes"
Index: patches/patch-vendor_github_com_tdewolff_minify_v2_css_css_go
===
RCS file: patches/patch-vendor_github_com_tdewolff_minify_v2_css_css_go
diff -N patches/patch-vendor_github_com_tdewolff_minify_v2_css_css_go
--- patches/patch-vendor_github_com_tdewolff_minify_v2_css_css_go   12 Sep 
2019 19:02:59 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-vendor_github_com_tdewolff_minify_v2_css_css_go,v 1.1 
2019/09/12 19:02:59 jsing Exp $
-
-Index: vendor/github.com/tdewolff/minify/v2/css/css.go
 vendor/github.com/tdewolff/minify/v2/css/css.go.orig
-+++ vendor/github.com/tdewolff/minify/v2/css/css.go
-@@ -1,5 +1,5 @@
- // Package css minifies CSS3 following the specifications at 
http://www.w3.org/TR/css-syntax-3/.
--package css // import "github.com/tdewolff/minify/css"
-+package css
- 
- import (
-   "bytes"
Index: patches/patch-vendor_github_com_tdewolff_minify_v2_html_buffer_go
===
RCS fi

sysutils/py-prometheus_client py3 only

2020-02-25 Thread Paco Esteban
Hi ports@,

www/jupyter-notebook is now py3 only.  That's the only consumer for
sysutils/py-prometheus_client so here's a diff to make it py3 only too.

Comments and/or ok appreciated.

Index: Makefile
===
RCS file: /home/cvs/ports/sysutils/py-prometheus_client/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile17 Feb 2020 10:40:26 -  1.3
+++ Makefile25 Feb 2020 15:49:16 -
@@ -5,6 +5,7 @@ COMMENT =   python client for the prometh
 MODPY_EGG_VERSION =0.7.1
 DISTNAME = prometheus_client-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
+REVISION = 0
 
 CATEGORIES =   sysutils
 
@@ -18,7 +19,7 @@ MODPY_PI =Yes
 MODPY_SETUPTOOLS = Yes
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR =   python3
 
 NO_TEST =  Yes
 
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/sysutils/py-prometheus_client/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   29 Apr 2019 13:05:01 -  1.1.1.1
+++ pkg/PLIST   25 Feb 2020 15:50:06 -
@@ -1,4 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2019/04/29 13:05:01 bket Exp $
+@conflict sysutils/py-prometheus_client-*
+@pkgpath sysutils/py-prometheus_client
 lib/python${MODPY_VERSION}/site-packages/prometheus_client/
 
lib/python${MODPY_VERSION}/site-packages/prometheus_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/prometheus_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO

-- 
Paco Esteban.
5818130B8A6DBC03



Re: UPDATE www/py-terminado-0.8.3

2020-02-25 Thread Paco Esteban
On Tue, 25 Feb 2020, Bjorn Ketelaars wrote:

> On Tue 25/02/2020 11:27, Paco Esteban wrote:
> > Hi Bjorn,
> > 
> > On Tue, 25 Feb 2020, Bjorn Ketelaars wrote:
> > 
> > > diff --git Makefile Makefile
> > > index a8556156e5e..b7b12ba4908 100644
> > > --- Makefile
> > > +++ Makefile
> > > @@ -2,10 +2,9 @@
> > >  
> > >  COMMENT =terminals served to term.js using Tornado 
> > > websockets
> > >  
> > > -MODPY_EGG_VERSION =  0.8.2
> > > +MODPY_EGG_VERSION =  0.8.3
> > >  DISTNAME =   terminado-${MODPY_EGG_VERSION}
> > >  PKGNAME =py-${DISTNAME}
> > > -REVISION =   0
> > >  
> > >  CATEGORIES = www
> > >  
> > > @@ -23,6 +22,6 @@ RUN_DEPENDS +=  
> > > devel/py-ptyprocess${MODPY_FLAVOR} \
> > >   www/py-tornado${MODPY_FLAVOR}>=4
> > >  
> > >  FLAVORS =python3
> > > -FLAVOR ?=
> > > +FLAVOR ?=python3
> > 
> > shouldn't this be FLAVOR = python3 ?
> 
> Yes, it should!
> 
> New diff enclosed.

works for me on amd64.  All tests pass now (there were 3 failing
before).

install also did:
py-terminado-0.8.2p0->py3-terminado-0.8.3: ok

ok paco

> diff --git Makefile Makefile
> index a8556156e5e..2c22ba0bb0d 100644
> --- Makefile
> +++ Makefile
> @@ -2,10 +2,9 @@
>  
>  COMMENT =terminals served to term.js using Tornado websockets
>  
> -MODPY_EGG_VERSION =  0.8.2
> +MODPY_EGG_VERSION =  0.8.3
>  DISTNAME =   terminado-${MODPY_EGG_VERSION}
>  PKGNAME =py-${DISTNAME}
> -REVISION =   0
>  
>  CATEGORIES = www
>  
> @@ -23,6 +22,6 @@ RUN_DEPENDS +=  
> devel/py-ptyprocess${MODPY_FLAVOR} \
>   www/py-tornado${MODPY_FLAVOR}>=4
>  
>  FLAVORS =python3
> -FLAVOR ?=
> +FLAVOR = python3
>  
>  .include 
> diff --git distinfo distinfo
> index 08f9e3663ab..e138035e5f5 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (terminado-0.8.2.tar.gz) = 
> 3gjhQfg8OgeYsFDssJerYlnD8DMbL3t3UMkHXO0sIMI=
> -SIZE (terminado-0.8.2.tar.gz) = 21041
> +SHA256 (terminado-0.8.3.tar.gz) = 
> SASndPgCMGp9mvcyIZPFOQ8doKu0KeCCoQ7x1G5vssI=
> +SIZE (terminado-0.8.3.tar.gz) = 21165
> diff --git patches/patch-terminado_management_py 
> patches/patch-terminado_management_py
> new file mode 100644
> index 000..a1b382ede55
> --- /dev/null
> +++ patches/patch-terminado_management_py
> @@ -0,0 +1,18 @@
> +$OpenBSD$
> +
> +Don't call getpgid() when killing a test. Taken from
> +https://github.com/jupyter/terminado/pull/72.
> +
> +Index: terminado/management.py
> +--- terminado/management.py.orig
>  terminado/management.py
> +@@ -70,8 +70,7 @@ class PtyWithClients(object):
> + """Send a signal to the process group of the process in the pty"""
> + if os.name == 'nt':
> + return self.ptyproc.kill(sig)
> +-pgid = os.getpgid(self.ptyproc.pid)
> +-os.killpg(pgid, sig)
> ++os.killpg(self.ptyproc.pid, sig)
> + 
> + @gen.coroutine
> + def terminate(self, force=False):
> diff --git pkg/PLIST pkg/PLIST
> index 7075ad4b8b1..99ec2dae658 100644
> --- pkg/PLIST
> +++ pkg/PLIST
> @@ -1,4 +1,6 @@
>  @comment $OpenBSD: PLIST,v 1.2 2016/11/06 13:42:57 shadchin Exp $
> +@conflict py-terminado-*
> +@pkgpath www/py-terminado
>  lib/python${MODPY_VERSION}/site-packages/terminado/
>  
> lib/python${MODPY_VERSION}/site-packages/terminado-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
>  lib/python${MODPY_VERSION}/site-packages/terminado/__init__.py
> 

-- 
Paco Esteban.
5818130B8A6DBC03



Re: UPDATE www/py-terminado-0.8.3

2020-02-25 Thread Paco Esteban
Hi Bjorn,

On Tue, 25 Feb 2020, Bjorn Ketelaars wrote:

> diff --git Makefile Makefile
> index a8556156e5e..b7b12ba4908 100644
> --- Makefile
> +++ Makefile
> @@ -2,10 +2,9 @@
>  
>  COMMENT =terminals served to term.js using Tornado websockets
>  
> -MODPY_EGG_VERSION =  0.8.2
> +MODPY_EGG_VERSION =  0.8.3
>  DISTNAME =   terminado-${MODPY_EGG_VERSION}
>  PKGNAME =py-${DISTNAME}
> -REVISION =   0
>  
>  CATEGORIES = www
>  
> @@ -23,6 +22,6 @@ RUN_DEPENDS +=  
> devel/py-ptyprocess${MODPY_FLAVOR} \
>   www/py-tornado${MODPY_FLAVOR}>=4
>  
>  FLAVORS =python3
> -FLAVOR ?=
> +FLAVOR ?=    python3

shouldn't this be FLAVOR = python3 ?


Cheers,

-- 
Paco Esteban.
5818130B8A6DBC03



CVS: cvs.openbsd.org: ports

2020-02-23 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/02/23 09:43:07

Log message:
Import www/p5-Test-LWP-UserAgent:
LWP::UserAgent for simulating and testing network calls

It overrides a few key low-level methods that are concerned with
actually sending your request over the network, allowing an interception
of that request and simulating a particular response.

With some corrections from jca@

ok jca@, sthen@, benoit@

Status:

Vendor Tag: paco
Release Tags:   paco_20200223

N ports/www/p5-Test-LWP-UserAgent/Makefile
N ports/www/p5-Test-LWP-UserAgent/distinfo
N ports/www/p5-Test-LWP-UserAgent/pkg/DESCR
N ports/www/p5-Test-LWP-UserAgent/pkg/PLIST

No conflicts created by this import



new: www/p5-Test-LWP-UserAgent

2020-02-20 Thread Paco Esteban
Hi ports@

This is a slightly modified version of a port I sent a long time ago:

https://marc.info/?l=openbsd-ports=154246569216247=2

That even got an ok:

https://marc.info/?l=openbsd-ports=154843970711942=2

About the port:

 This module is a subclass of LWP::UserAgent which overrides a few
 key low-level methods that are concerned with actually sending your
 request over the network, allowing an interception of that request and
 simulating a particular response.  This greatly facilitates testing of
 client networking code where the server follows a known protocol.

All test pass for me on amd64.

comments and/or ok appreciated.

Cheers,

-- 
Paco Esteban.
5818130B8A6DBC03


p5-Test-LWP-UserAgent.tar.gz
Description: Binary data


CVS: cvs.openbsd.org: ports

2020-02-20 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/02/20 12:38:05

Modified files:
devel/py-wheel : Makefile distinfo 
devel/py-wheel/pkg: PLIST 

Log message:
update devel/py-wheel to 0.34.2

ok kmos@



update: devel/py-wheel

2020-02-20 Thread Paco Esteban
.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wheel/cli/${MODPY_PYCACHE}unpack.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wheel/cli/convert.py
+lib/python${MODPY_VERSION}/site-packages/wheel/cli/pack.py
+lib/python${MODPY_VERSION}/site-packages/wheel/cli/unpack.py
+lib/python${MODPY_VERSION}/site-packages/wheel/macosx_libfile.py
 lib/python${MODPY_VERSION}/site-packages/wheel/metadata.py
-lib/python${MODPY_VERSION}/site-packages/wheel/paths.py
 lib/python${MODPY_VERSION}/site-packages/wheel/pep425tags.py
 lib/python${MODPY_VERSION}/site-packages/wheel/pkginfo.py
-lib/python${MODPY_VERSION}/site-packages/wheel/signatures/
-lib/python${MODPY_VERSION}/site-packages/wheel/signatures/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wheel/signatures/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/wheel/signatures/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/wheel/signatures/${MODPY_PYCACHE}djbec.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/wheel/signatures/${MODPY_PYCACHE}ed25519py.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/wheel/signatures/${MODPY_PYCACHE}keys.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/wheel/signatures/djbec.py
-lib/python${MODPY_VERSION}/site-packages/wheel/signatures/ed25519py.py
-lib/python${MODPY_VERSION}/site-packages/wheel/signatures/keys.py
-lib/python${MODPY_VERSION}/site-packages/wheel/tool/
-lib/python${MODPY_VERSION}/site-packages/wheel/tool/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wheel/tool/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/wheel/tool/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wheel/util.py
-lib/python${MODPY_VERSION}/site-packages/wheel/wininst2wheel.py
+lib/python${MODPY_VERSION}/site-packages/wheel/wheelfile.py

-- 
Paco Esteban.
5818130B8A6DBC03



Re: update: devel/py-babel

2020-02-19 Thread Paco Esteban
On Wed, 19 Feb 2020, Kurt Mosiejczuk wrote:
> You missed a small PLIST change. A new ga_GB.dat file. 

Oh, missed that one !

> Fix that PLIST change and ok kmos

Thanks. Commited.

-- 
Paco Esteban.
5818130B8A6DBC03



CVS: cvs.openbsd.org: ports

2020-02-19 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/02/19 08:35:39

Modified files:
devel/py-babel : Makefile distinfo 
devel/py-babel/pkg: PLIST 

Log message:
update devel/py-babel to 2.8.0

ok kmos@



update: devel/py-babel

2020-02-19 Thread Paco Esteban
Hi ports@,

This is an update for devel/py-babel from 2.7.0 to 2.8.0
Changelog reads:

Improvements
* CLDR: Upgrade to CLDR 36.0 - Aarni Koskela (#679)
* Messages: Don't even open files with the "ignore" extraction method
- @sebleblanc (#678)

Bugfixes
* Numbers: Fix formatting very small decimals when quantization is
disabled - Lev Lybin, @miluChen (#662)
* Messages: Attempt to sort all messages – Mario Frasca (#651, #606)

Docs
* Add years to changelog - Romuald Brunet
* Note that installation requires pytz - Steve (Gadget) Barnes

No big changes on the port.

All tests pass on amd64 for py2 and py3.

This one has some consumers.  Their regression tests behave exactly the
same before and after the upgrade.  Here are those results for
reference (as they are not that good):

  * devel/bpython
  2 tests fail for py2
  4 tests fail for py3
  * textproc/py-sphinx
  docutils library (and others) cannot be found.  Maybe test_depends
  should include run_depends ??
  py-alabaster is missing as a dep for tests
  2 test fail on py2
  3 tests fail on py3
  * textproc/py-sphinx-intl
  NO_TEST = Yes
  * www/odoo
  xlwt dependency missing and PRIVSEP prevents pip install, so no
  tests.
  * www/trac
  2 test fail

comments ? ok ?

Index: Makefile
===
RCS file: /home/cvs/ports/devel/py-babel/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile21 Aug 2019 14:21:51 -  1.29
+++ Makefile19 Feb 2020 09:08:08 -
@@ -2,7 +2,7 @@
 
 COMMENT=   I18N/L10N tools for Python
 
-MODPY_EGG_VERSION= 2.7.0
+MODPY_EGG_VERSION= 2.8.0
 DISTNAME=  Babel-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME:L}
 CATEGORIES=devel
Index: distinfo
===
RCS file: /home/cvs/ports/devel/py-babel/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo21 Aug 2019 14:21:51 -  1.9
+++ distinfo19 Feb 2020 09:08:44 -
@@ -1,2 +1,2 @@
-SHA256 (Babel-2.7.0.tar.gz) = 6GE1rhAeMeLI7CCk4MUiD07tEkh9XPP3i+fpjTpX/Cg=
-SIZE (Babel-2.7.0.tar.gz) = 8244870
+SHA256 (Babel-2.8.0.tar.gz) = Gqwq4tDY6jaPqQkGVn9cCEY9mK3hVcDEv+3WoPcWDjg=
+SIZE (Babel-2.8.0.tar.gz) = 8444381

-- 
Paco Esteban.
5818130B8A6DBC03



CVS: cvs.openbsd.org: ports

2020-02-18 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/02/18 08:26:48

Modified files:
infrastructure/bin: portimport 

Log message:
fix cvs error on the last step of portimport(1).

Thanks tb@ and stsp@ for the help

ok tb@, kmos@



fix cvs error on portimport(1)

2020-02-18 Thread Paco Esteban
Hi ports@,

This small diff (hopefully) fixes the error on the last cvs command of
portimport(1):

cvs server: failed to create lock directory for `/cvs' (/cvs/#cvs.lock): 
Permission denied
cvs server: failed to obtain dir lock in repository `/cvs'
cvs [server aborted]: read lock failed - giving up

It should remove the read lock which means the update command may be
executed in the middle of another user's commit.  But the chances of
that being a problem in this case are minimal, as this is executed on a
folder that the user of portimport(1) just imported to the tree.

comments ? ok ?


Index: infrastructure/bin/portimport
===
RCS file: /home/cvs/ports/infrastructure/bin/portimport,v
retrieving revision 1.7
diff -u -p -r1.7 portimport
--- infrastructure/bin/portimport   20 Dec 2019 19:52:26 -  1.7
+++ infrastructure/bin/portimport   18 Feb 2020 11:23:47 -
@@ -68,7 +68,7 @@ if [[ $ans == +(y|Y) ]]; then
cvs -d$cvsroot import ports/$pkgpath $user ${user}_$timestamp
grep -q "^@new" pkg/P* && echo "New users/groups, remember to commit 
infrastructure/db/user.list!"
cd "$portsdir/${pkgpath%/*}"
-   cvs -d$cvsroot update -AdP ${pkgpath##*/}
+   cvs -R -d$cvsroot update -AdP ${pkgpath##*/}
echo "Don't forget to commit the ${pkgpath%/*}/Makefile when you're 
done!"
pwd
 fi

-- 
Paco Esteban.
5818130B8A6DBC03



CVS: cvs.openbsd.org: ports

2020-02-17 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/02/17 09:32:00

Modified files:
devel  : Makefile 

Log message:
+git-crypt to devel

ok kmos@



CVS: cvs.openbsd.org: ports

2020-02-17 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/02/17 07:02:22

Log message:
Import devel/git-crypt: transparent file encryption in Git

git-crypt enables transparent encryption and decryption of files in a git
repository. Files which you choose to protect are encrypted when committed, 
and
decrypted when checked out.

With some help and corrections from jca@

ok jca@

Status:

Vendor Tag: paco
Release Tags:   paco_20200217

N ports/devel/git-crypt/Makefile
N ports/devel/git-crypt/distinfo
N ports/devel/git-crypt/pkg/DESCR
N ports/devel/git-crypt/pkg/PLIST

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2020-02-17 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/02/17 03:40:26

Modified files:
sysutils/py-prometheus_client: Makefile distinfo 

Log message:
update sysutils/py-prometheus_client to 0.7.1

ok kmos@



CVS: cvs.openbsd.org: ports

2020-02-14 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/02/14 08:44:32

Modified files:
geo/openbsd-developers: Makefile 
geo/openbsd-developers/files: OpenBSD 

Log message:
Adding myself to the list

OK kmos@



Re: net/ejabberd remove or update?

2020-02-14 Thread Paco Esteban
On Fri, 14 Feb 2020, Solene Rapenne wrote:

> On Fri, Feb 14, 2020 at 01:44:08PM +, Lucas wrote:
> > Solene Rapenne  wrote:
> > > Do we have a xmpp server in ports which is up to date?
> > 
> > There is net/profanity, made in Lua, which is almost up-to-date and I
> > was planning to update it this weekend. Current version works without
> > issues.
> > 
> > -Lucas
> 
> in net/profanity I read COMMENT= console based XMPP client
> 
> I don't think it is a XMPP server, if it is, we need to fix the COMMENT

As Lucas said:

prosody-0.11.2p1communications server for Jabber/XMPP written in Lua

We're only a couple of minors behind.  I've been using it for about
a year now (not much traffic to be honest), and works great.

Cheers,

-- 
Paco Esteban.
5818130B8A6DBC03



update: sysutils/py-prometheus_client

2020-02-12 Thread Paco Esteban
Hi ports@,

Here's an update of this port from 0.6.0 to 0.7.1
According to changelog:

[ENHANCEMENT] Multiprocess exposition speed boost (#421)
[ENHANCEMENT] optimize openmetrics text parsing (~4x perf) (#402)
[ENHANCEMENT] Add python3.7 support (#418)
[ENHANCEMENT] Change exemplar length limit to be only for label names+values 
(#397)
[BUGFIX] Disable gcCollector for pypy (#380)
[BUGFIX] multiprocess: don't crash on missing gauge_live/sum files (#424)
[BUGFIX] correctly bind method on Python 2.x (#403)

The pypi package does not include the tests folder, so I left the
NO_TEST as it is.

The only consumer for this port is www/jupyter-notebook
All tests pass for it, although I only tested py3.

Cheers,
Paco.


Index: Makefile
===
RCS file: /cvs/ports/sysutils/py-prometheus_client/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile12 Jul 2019 20:49:49 -  1.2
+++ Makefile12 Feb 2020 09:46:28 -
@@ -2,7 +2,7 @@
 
 COMMENT =  python client for the prometheus monitoring system
 
-MODPY_EGG_VERSION =0.6.0
+MODPY_EGG_VERSION =0.7.1
 DISTNAME = prometheus_client-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/py-prometheus_client/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo29 Apr 2019 13:05:01 -  1.1.1.1
+++ distinfo12 Feb 2020 09:46:28 -
@@ -1,2 +1,2 @@
-SHA256 (prometheus_client-0.6.0.tar.gz) = 
Gzi5WHUPZvIIvNmrkqYzwMmU2IWcgx96vB9Gck/O5JA=
-SIZE (prometheus_client-0.6.0.tar.gz) = 36583
+SHA256 (prometheus_client-0.7.1.tar.gz) = 
cc0korPrM1y4AMcVn0I98b1NzVFxsjS+FePzHsn2Ito=
+SIZE (prometheus_client-0.7.1.tar.gz) = 38440

-- 
Paco Esteban.
5818130B8A6DBC03



Re: new: devel/git-crypt

2020-02-11 Thread Paco Esteban
On Sat, 25 Jan 2020, Paco Esteban wrote:

> Hi ports@,
> 
> Here's a new port for git-crypt, which is a tool for transparently
> encrypt files on git repositories (so one can have sensitive information
> on remote repositories).  You can find more info here:
> 
> https://www.agwa.name/projects/git-crypt/
> 
> I decided not to include gnupg as a dependency.  The software can use
> pgp keys (for asymetric) or openssl (for symetric) encryption.  The
> build clearly depends on openssl (it seems to work fine with libressl as
> far as I can see), but for pgp it calls the gpg binary, so it does not
> depend on it for building.  Please correct me if this is wrong.
> 
> Another thing is that the man page generation leaves the resulting
> man page file on WRKSRC/git-crypt.1 but it should leave it on
> WRKSRC/man/man1/git-crypt.1 and I do not know why (when doing things
> manually outside of the ports infrastructure it works as expected),
> that's why I added the pre-fake hack.  If anyone knows a better way to
> deal with this, please tell me.

ping ?

(port attached for convenience)

-- 
Paco Esteban.
5818130B8A6DBC03


git-crypt.tar.gz
Description: Binary data


Re: update: audio/py-musicbrainzngs

2020-02-04 Thread Paco Esteban
Hi Stuart,

On Tue, 04 Feb 2020, Stuart Henderson wrote:

> Please update HOMEPAGE to https://python-musicbrainzngs.readthedocs.io/
> to use https and avoid redirects,

Did not catch that one.

> It will need an @pkgpath marker to allow updates to work.  To be honest
> since it still supports py2 I would leave that enabled until someone
> has figured out the best way to move an existing py2+3 port to py3-only...

I did it this way because it has only one consumer that is already
py3 only.  It would be good indeed to have a clear path to go to from
py2+py3 to py3 only, as this will happen to many ports.

Anyway, this is the updated diff, which makes my other email about
audio/beets unnecessary.  Thank you Stuart.

Index: Makefile
===
RCS file: /cvs/ports/audio/py-musicbrainzngs/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile12 Jul 2019 21:07:45 -  1.6
+++ Makefile4 Feb 2020 10:46:15 -
@@ -2,26 +2,25 @@
 
 COMMENT =  python bindings for musicbrainz NGS webservice
 
-MODPY_EGG_VERSION = 0.6
-REVISION = 1
+MODPY_EGG_VERSION = 0.7.1
 DISTNAME = musicbrainzngs-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 CATEGORIES =   audio
 
-HOMEPAGE = http://python-musicbrainzngs.readthedocs.org/
+HOMEPAGE = https://python-musicbrainzngs.readthedocs.org/
 
 # BSD
 PERMIT_PACKAGE =   Yes
 
-MODPY_PI = Yes
+MODPY_PI = Yes
 
-MODULES =  lang/python
-FLAVORS =  python3
+MODULES =  lang/python
+MODPY_SETUPTOOLS = Yes
+MODPY_PYTEST = Yes
+
+FLAVORS =  python3
 FLAVOR ?=
 
 TEST_ENV = LC_CTYPE=en_US.UTF-8
-
-do-test:
-   ${MODPY_TEST_TARGET}
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/audio/py-musicbrainzngs/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo27 Apr 2016 18:14:29 -  1.2
+++ distinfo4 Feb 2020 10:46:15 -
@@ -1,2 +1,2 @@
-SHA256 (musicbrainzngs-0.6.tar.gz) = 
KO8mGkId/94KJSgdqxqyFOG0B+7FaM0FpT5zJW9WrbU=
-SIZE (musicbrainzngs-0.6.tar.gz) = 111052
+SHA256 (musicbrainzngs-0.7.1.tar.gz) = 
qxwBAP0LMFhS5l8u1BE8beEuaK/VUYaYe47Zfg+Y5ic=
+SIZE (musicbrainzngs-0.7.1.tar.gz) = 117469
Index: pkg/PLIST
===
RCS file: /cvs/ports/audio/py-musicbrainzngs/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   11 Jun 2017 14:47:32 -  1.3
+++ pkg/PLIST   4 Feb 2020 10:46:15 -
@@ -1,6 +1,10 @@
 @comment $OpenBSD: PLIST,v 1.3 2017/06/11 14:47:32 sthen Exp $
 lib/python${MODPY_VERSION}/site-packages/musicbrainzngs/
-lib/python${MODPY_VERSION}/site-packages/musicbrainzngs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/musicbrainzngs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/musicbrainzngs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/musicbrainzngs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/musicbrainzngs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/musicbrainzngs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/musicbrainzngs/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/musicbrainzngs/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/musicbrainzngs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc

-- 
Paco Esteban.
5818130B8A6DBC03



update: audio/beets

2020-02-04 Thread Paco Esteban
Hi ports@,

This is a small diff on audio/beets needed because of the updates made
to audio/py-musicbrainzngs.  On that update I made it py3 only, so this
patch needs to be applied to beets.

I bumped REVISION.  Not sure if it's needed in this case.
CCd maintainer.

Cheers,
Paco

Index: Makefile
===
RCS file: /cvs/ports/audio/beets/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile19 Nov 2019 21:21:10 -  1.43
+++ Makefile4 Feb 2020 09:18:05 -
@@ -5,7 +5,7 @@ COMMENT=CLI tools to manage music colle
 MODPY_EGG_VERSION= 1.4.9
 DISTNAME=  beets-${MODPY_EGG_VERSION}
 CATEGORIES=audio
-REVISION=  2
+REVISION=  3
 
 MAINTAINER=Stuart Henderson 
 
@@ -23,7 +23,7 @@ MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3
 
 RUN_DEPENDS+=  audio/py-discogs-client${MODPY_FLAVOR}>=2.0.2 \
audio/py-last${MODPY_FLAVOR} \
-   audio/py-musicbrainzngs${MODPY_FLAVOR} \
+   audio/py-musicbrainzngs \
audio/py-mutagen${MODPY_FLAVOR} \
devel/py-algorithm-munkres \
devel/py-pathlib${MODPY_FLAVOR} \

-- 
Paco Esteban.
5818130B8A6DBC03



update: audio/py-musicbrainzngs

2020-02-04 Thread Paco Esteban
Hi ports@,

Here's an update of audio/py-musicbrainzngs from 0.6 to 0.7.1.  You can
find the changelog here:

https://github.com/alastair/python-musicbrainzngs/blob/master/CHANGES

About the changes on the port itself, I made it py3 only (which implies
some changes on consumer) and fixed tests (they were totally broken for
me on the last version).

The only consumer for this port is audio/beets, which needs a small
change on RUN_DEPENDS as py-musicbrainzngs is py3 only now.  I sent that
on a separate email.

Cheers,
Paco.

Index: Makefile
===
RCS file: /cvs/ports/audio/py-musicbrainzngs/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile12 Jul 2019 21:07:45 -  1.6
+++ Makefile4 Feb 2020 08:47:43 -
@@ -2,8 +2,7 @@
 
 COMMENT =  python bindings for musicbrainz NGS webservice
 
-MODPY_EGG_VERSION = 0.6
-REVISION = 1
+MODPY_EGG_VERSION = 0.7.1
 DISTNAME = musicbrainzngs-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 CATEGORIES =   audio
@@ -13,15 +12,13 @@ HOMEPAGE =  http://python-musicbrainzngs.
 # BSD
 PERMIT_PACKAGE =   Yes
 
-MODPY_PI = Yes
+MODPY_PI = Yes
 
-MODULES =  lang/python
-FLAVORS =  python3
-FLAVOR ?=
+MODULES =  lang/python
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
+MODPY_SETUPTOOLS = Yes
+MODPY_PYTEST = Yes
 
 TEST_ENV = LC_CTYPE=en_US.UTF-8
-
-do-test:
-   ${MODPY_TEST_TARGET}
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/audio/py-musicbrainzngs/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo27 Apr 2016 18:14:29 -  1.2
+++ distinfo4 Feb 2020 08:47:43 -
@@ -1,2 +1,2 @@
-SHA256 (musicbrainzngs-0.6.tar.gz) = 
KO8mGkId/94KJSgdqxqyFOG0B+7FaM0FpT5zJW9WrbU=
-SIZE (musicbrainzngs-0.6.tar.gz) = 111052
+SHA256 (musicbrainzngs-0.7.1.tar.gz) = 
qxwBAP0LMFhS5l8u1BE8beEuaK/VUYaYe47Zfg+Y5ic=
+SIZE (musicbrainzngs-0.7.1.tar.gz) = 117469
Index: pkg/PLIST
===
RCS file: /cvs/ports/audio/py-musicbrainzngs/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   11 Jun 2017 14:47:32 -  1.3
+++ pkg/PLIST   4 Feb 2020 08:47:43 -
@@ -1,6 +1,10 @@
 @comment $OpenBSD: PLIST,v 1.3 2017/06/11 14:47:32 sthen Exp $
 lib/python${MODPY_VERSION}/site-packages/musicbrainzngs/
-lib/python${MODPY_VERSION}/site-packages/musicbrainzngs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/musicbrainzngs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/musicbrainzngs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/musicbrainzngs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/musicbrainzngs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/musicbrainzngs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/musicbrainzngs/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/musicbrainzngs/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/musicbrainzngs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc

-- 
Paco Esteban.
5818130B8A6DBC03



Re: UPDATE: cad/openscad, graphics/opencsg, math/cgal

2020-02-01 Thread Paco Esteban
Hi Rafael,

On Sat, 01 Feb 2020, Rafael Sadowski wrote:

> On Sat Feb 01, 2020 at 02:57:46PM +0100, Rafael Sadowski wrote:
> > Here is an diff to update graphics/opencsg, math/cgal and switch
> > openscad from Qt4 to Qt5.
> 
> New diff after feedback from cwen@:

Just tried your diffs.  Here are my results (all on amd64):

* math/cgal: builds and installs just fine, but I have this:
  cgal-4.14.2v0(math/cgal):
  Missing lib: CGAL.1 (/usr/local/lib/libCGAL_Core.so.2.0) (NOT REACHABLE)
  Missing lib: Qt5Svg.2 (/usr/local/lib/libCGAL_Qt5.so.2.0) (NOT REACHABLE)

* graphics/opencsg gives me this on make regress
  make: don't know how to make test

  Is this normal ? Maybe needs NO_TEST ?

* cad/openscad: builds and installs ok for me.  Tried with a couple of
  models and they render fine and export to STL.  Haven't tried anything
  more complicated as this is basically my workflow when using openscad.

Cheers,

-- 
Paco Esteban.
5818130B8A6DBC03



Re: Remove: net/qsynergy

2020-01-28 Thread Paco Esteban
On Tue, 28 Jan 2020, Solene Rapenne wrote:

> ok for removing net/qsynergy but net/synergy is still useful, I
> installed it last week for openbsd->windows and it works fine. I've
> tried qsynergy and it wasn't helpful at all.

The version of net/synergy is quite outdated, and the newer versions of
it are not free IIRC.

Some months ago, Aaron Bieber sent a new port for barrier, which is
a libre fork of synergy.  I've used it with mac machines and it works
really well.  Also, no need to ssh tunnel anymore as it includes
encryption.

I'm not using it right now but, as fas as I remember, it has GUI
included.

Cheers,

-- 
Paco Esteban.
5818130B8A6DBC03



Re: NEW: devel/py-esptool 2.8

2020-01-28 Thread Paco Esteban
Hi Tracey,

On Mon, 27 Jan 2020, Tracey Emery wrote:

> Hello ports,
> 
> Attached is a python tool for burning firmware to esp8266 and esp32
> chips. It is a heavily edited version of a port I previously submitted.
> 
> devel/py-esptool: A Python-based, open source, platform independent, utility
> to communicate with the ROM bootloader in Espressif ESP8266 & ESP32 chips. The
> py-serial or py3-serial plugins required.
> 
> Is anyone willing to Ok and commit?

Find attached a modified version of your port.  It did not build for me
as you sent it, as they were some missing dependencies.  I also made it
py3 only.

I'm working on the tests part now.  This is a bit of a dependency rabbit
hole, but I think it's doable.

I do not have any binary to test burning, but I've tested things like
read_mac and flash_id without success.  I constantly get the error:

  A fatal error occurred: Failed to connect to ESP8266: Timed out
  waiting for packet header

I'm testing this on a NodeMCU board which has a CH340G chip that appears
as /dev/cuaU0.

I may interrogate you in private about your setup to develop for those
boards on OpenBSD if you don't mind :-P

Cheers,

-- 
Paco Esteban.
5818130B8A6DBC03


py-esptool-2.8-fix1.tgz
Description: Binary data


new: devel/git-crypt

2020-01-25 Thread Paco Esteban
Hi ports@,

Here's a new port for git-crypt, which is a tool for transparently
encrypt files on git repositories (so one can have sensitive information
on remote repositories).  You can find more info here:

https://www.agwa.name/projects/git-crypt/

I decided not to include gnupg as a dependency.  The software can use
pgp keys (for asymetric) or openssl (for symetric) encryption.  The
build clearly depends on openssl (it seems to work fine with libressl as
far as I can see), but for pgp it calls the gpg binary, so it does not
depend on it for building.  Please correct me if this is wrong.

Another thing is that the man page generation leaves the resulting
man page file on WRKSRC/git-crypt.1 but it should leave it on
WRKSRC/man/man1/git-crypt.1 and I do not know why (when doing things
manually outside of the ports infrastructure it works as expected),
that's why I added the pre-fake hack.  If anyone knows a better way to
deal with this, please tell me.

Cheers,

-- 
Paco Esteban.
5818130B8A6DBC03


git-crypt.tar.gz
Description: Binary data


Re: update: devel/py-country

2020-01-22 Thread Paco Esteban
On Wed, 22 Jan 2020, Kurt Mosiejczuk wrote:

> > WRKOBJDIR=/home/paco/ports/obj
> > DISTDIR=/home/paco/ports/distfiles
> > PACKAGE_REPOSITORY=/home/paco/ports/packages
> 
> All three of those lines should be able to be replaced with
> 
> PORTSDIR=/home/paco/ports
> 
> I suppose its possible since you aren't setting that that there is another
> DIR variable derived from PORTSDIR that isn't getting set and confusing
> update-plist

What I should do is reinstall this machine with a better suited
partition schema and start fresh.  I've been delaying it for too long.

Maybe this weekend.

Thank you both for your help.

-- 
Paco Esteban.
5818130B8A6DBC03



Re: update: devel/py-country

2020-01-22 Thread Paco Esteban
On Wed, 22 Jan 2020, Stuart Henderson wrote:

> Do you have any local changes in mk.conf or diffs in python ports
> infrastructure (python.port.mk etc)? Running "make plist" here doesn't add
> those lines.

This is my mk.conf (I have some things in /home because I built
this machine before going into the porting party.  I know, I should
reinstall):

WRKOBJDIR=/home/paco/ports/obj
DISTDIR=/home/paco/ports/distfiles
PACKAGE_REPOSITORY=/home/paco/ports/packages
SUDO=/usr/bin/doas
FETCH_PACKAGES=
PORTS_PRIVSEP=Yes

I don't have any diff on /usr/ports/infrastructure or
/usr/ports/lang/python

Cheers,

-- 
Paco Esteban.
5818130B8A6DBC03



Re: update: devel/py-country

2020-01-22 Thread Paco Esteban
On Tue, 21 Jan 2020, Stuart Henderson wrote:

> > blob - 031dc25d0da2814e24f88a0718ed0a0a7194a40d
> > blob + c778d79fc708ac37809fb11369e635cc9292160f
> > --- devel/py-country/pkg/PLIST
> > +++ devel/py-country/pkg/PLIST
> > @@ -1,4 +1,6 @@
> >  @comment $OpenBSD: PLIST,v 1.8 2019/02/17 20:22:22 sthen Exp $
> > +lib/python${MODPY_VERSION}/
> > +lib/python${MODPY_VERSION}/site-packages/
> 
> I'm not sure how these lines were added, the directories come from a
> dependency though and don't need listing. update-plist removes them here ..


Those lines come from update-plist.  I try not to touch PLIST manually,
only to remove lines like those (this time I did not see them, sorry).

I'll try to see next time when are they introduced, because is not the
first time I see them on an updated python port.

It seems that kmos has commited with your suggestions, so thank you both
:-)

-- 
Paco Esteban.
5818130B8A6DBC03



update: devel/py-country

2020-01-21 Thread Paco Esteban
-packages/pycountry/locales/sv/LC_MESSAGES/iso4217.mo
 
lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sv/LC_MESSAGES/iso639-3.mo
+lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sv/LC_MESSAGES/iso639-5.mo
 
lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sv/LC_MESSAGES/iso639_3.mo
 lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sw/
 lib/python${MODPY_VERSION}/site-packages/pycountry/locales/sw/LC_MESSAGES/
@@ -956,6 +981,7 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/loc
 
lib/python${MODPY_VERSION}/site-packages/pycountry/locales/uk/LC_MESSAGES/iso3166_2.mo
 
lib/python${MODPY_VERSION}/site-packages/pycountry/locales/uk/LC_MESSAGES/iso4217.mo
 
lib/python${MODPY_VERSION}/site-packages/pycountry/locales/uk/LC_MESSAGES/iso639-3.mo
+lib/python${MODPY_VERSION}/site-packages/pycountry/locales/uk/LC_MESSAGES/iso639-5.mo
 
lib/python${MODPY_VERSION}/site-packages/pycountry/locales/uk/LC_MESSAGES/iso639_3.mo
 lib/python${MODPY_VERSION}/site-packages/pycountry/locales/ur/
 lib/python${MODPY_VERSION}/site-packages/pycountry/locales/ur/LC_MESSAGES/
@@ -1030,6 +1056,9 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/loc
 
lib/python${MODPY_VERSION}/site-packages/pycountry/locales/zh_HK/LC_MESSAGES/iso3166-3.mo
 
lib/python${MODPY_VERSION}/site-packages/pycountry/locales/zh_HK/LC_MESSAGES/iso3166.mo
 
lib/python${MODPY_VERSION}/site-packages/pycountry/locales/zh_HK/LC_MESSAGES/iso4217.mo
+lib/python${MODPY_VERSION}/site-packages/pycountry/locales/zh_Hant/
+lib/python${MODPY_VERSION}/site-packages/pycountry/locales/zh_Hant/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/pycountry/locales/zh_Hant/LC_MESSAGES/iso639-5.mo
 lib/python${MODPY_VERSION}/site-packages/pycountry/locales/zh_TW/
 lib/python${MODPY_VERSION}/site-packages/pycountry/locales/zh_TW/LC_MESSAGES/
 
lib/python${MODPY_VERSION}/site-packages/pycountry/locales/zh_TW/LC_MESSAGES/iso15924.mo


-- 
Paco Esteban.
5818130B8A6DBC03



Re: [update] net/dnscontrol -> 2.10.0

2020-01-20 Thread Paco Esteban
Hi

On Mon, 20 Jan 2020, karlis.mikels...@lf.lv wrote:

> Hello,
> 
> Please find attached patch to update DNSControl to latest stable (2.10.0)
> version.

It builds and tests pass for me on amd64.  It also works fine with my
small dns zones.  #546 is specially useful for me.

Thanks for the update.

-- 
Paco Esteban.
5818130B8A6DBC03



Re: productivity/khard: Fix zsh completion

2020-01-17 Thread Paco Esteban
On Thu, 16 Jan 2020, Matthew Martin wrote:

> With this khard tab completes with no fpath changes.

Works fine for me.
Ok maintainer.

-- 
Paco Esteban.
5818130B8A6DBC03



Re: sysutils/fzf: install shell support files

2020-01-16 Thread Paco Esteban
Hi Edd,

On Thu, 16 Jan 2020, Edd Barrett wrote:

> Hi,
> 
> This diff packages the necessary support files for for integrating fzf
> with shells.
> 
> With this change, enabling support in (e.g.) zsh is as simple as:
> 
> ```
> export FZF_DEFAULT_OPTS="--ansi"
> . /usr/local/share/fzf/shell/key-bindings.zsh
> . /usr/local/share/fzf/shell/completion.zsh
> ```
> 
> OK?

On Nov 28, Aaron Bieber sent a patch to update fzf that included
something similar, but it was never imported:

https://marc.info/?l=openbsd-ports=157496223810600=2

I've been using it since with no issues.  You may want to take a look
(he did not put the files in the same place).

Cheers,

-- 
Paco Esteban.
5818130B8A6DBC03



Re: [Update] www/py-httpie : Update to 2.0.0

2020-01-13 Thread Paco Esteban
On Mon, 13 Jan 2020, wen heping wrote:

> Hi, all:
> 
>Here is a simple patch to update www/py-httpie to 2.0.0.
>It build well and run well and all but one test failed on
> amd64-current system.
>No other ports depends on it.

Hi,

It works fine for me and all tests pass on amd64, there's only one
warning.  I would add `MODPY_PYTEST = Yes`, unless anybody with more
knowledge thinks otherwise.

A part from that, ok maintainer.

-- 
Paco Esteban.
5818130B8A6DBC03



Re: [update request] nnn 1.8 -> 2.8.1

2020-01-08 Thread Paco Esteban
Hi,

On Mon, 06 Jan 2020, Martin Ziemer wrote:

> this patch updates nnn from 1.8 to 2.8.1.

I've been using it for a couple of days and it works fine for me on
amd64.  There are no tests so can't tell on that.

Cheers,

-- 
Paco Esteban.
5818130B8A6DBC03



Re: UPDATE: syncthing-1.3.2

2020-01-02 Thread Paco Esteban
On Mon, 30 Dec 2019, Edd Barrett wrote:

> Hi,
> 
> Minor update to the latest syncthing.

Tests pass and works for me on amd64.

Cheers,

-- 
Paco Esteban.
5818130B8A6DBC03



Re: update: textproc/py-semver

2019-12-17 Thread Paco Esteban
On Mon, 16 Dec 2019, Kurt Mosiejczuk wrote:

> > Index: pkg/PLIST
> > ===
> > RCS file: /cvs/ports/textproc/py-semver/pkg/PLIST,v
> > retrieving revision 1.2
> > diff -u -p -r1.2 PLIST
> > --- pkg/PLIST   30 Jul 2018 14:07:05 -  1.2
> > +++ pkg/PLIST   16 Dec 2019 17:09:29 -
> > @@ -1,8 +1,13 @@
> >  @comment $OpenBSD: PLIST,v 1.2 2018/07/30 14:07:05 jasper Exp $
> > +bin/pysemver
> 
> This above line is problematic. It means the two flavors will
> conflict. Could be solved by a potential rename. However, the only
> port that uses this is python3 only, so it might be of easier to
> convert the port to a python3-only port.

Here's the modified diff.  It's only py3 now.  I also drooped `REVISION`
which I forgot to remove earlier.

Cheers,
Paco.

Index: Makefile
===
RCS file: /cvs/ports/textproc/py-semver/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile12 Jul 2019 20:50:13 -  1.4
+++ Makefile17 Dec 2019 10:57:19 -
@@ -2,10 +2,9 @@
 
 COMMENT =  python helper for Semantic Versioning
 
-MODPY_EGG_VERSION =2.8.1
+MODPY_EGG_VERSION =2.9.0
 DISTNAME = semver-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
-REVISION = 0
 
 CATEGORIES =   textproc
 
@@ -17,10 +16,12 @@ PERMIT_PACKAGE =Yes
 MODULES =  lang/python
 MODPY_SETUPTOOLS = Yes
 MODPY_PI = Yes
-
-FLAVORS =  python3
-FLAVOR ?=
-
-NO_TEST =  Yes
+MODPY_PYTEST = Yes
+MODPY_PYTEST_ARGS =test_semver.py
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
+
+TEST_DEPENDS = devel/py-test-cov${MODPY_FLAVOR} \
+   devel/py-tox${MODPY_FLAVOR} \
+   devel/py-virtualenv${MODPY_FLAVOR}
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/textproc/py-semver/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo30 Jul 2018 14:07:05 -  1.2
+++ distinfo17 Dec 2019 10:57:19 -
@@ -1,2 +1,2 @@
-SHA256 (semver-2.8.1.tar.gz) = WwkBCmbZo4NyEbt65aINELqI+MtJ6SyxOaae+Q1QYNg=
-SIZE (semver-2.8.1.tar.gz) = 5576
+SHA256 (semver-2.9.0.tar.gz) = 7R7eqgwn9o/rdPCfcVB3/Qe3KERtwrt/xHD8D3N4c6A=
+SIZE (semver-2.9.0.tar.gz) = 13239
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/py-semver/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   30 Jul 2018 14:07:05 -  1.2
+++ pkg/PLIST   17 Dec 2019 10:57:19 -
@@ -1,8 +1,13 @@
 @comment $OpenBSD: PLIST,v 1.2 2018/07/30 14:07:05 jasper Exp $
+bin/pysemver
+lib/python${MODPY_VERSION}/
+lib/python${MODPY_VERSION}/site-packages/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}semver.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/semver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/semver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 
lib/python${MODPY_VERSION}/site-packages/semver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
 
lib/python${MODPY_VERSION}/site-packages/semver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/semver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
 
lib/python${MODPY_VERSION}/site-packages/semver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/semver.py

-- 
Paco Esteban.
5818130B8A6DBC03



update: textproc/py-semver

2019-12-16 Thread Paco Esteban
Hello ports@,

Here's an update for textproc/py-semver from 2.8.1 to 2.9.0.  You can
find the changes for this version here:

https://github.com/python-semver/python-semver/blob/master/CHANGELOG.rst#version-290

I took the opportunity to add tests that now pass for py2 and py3.
I'm not sure about a line `update-plist` introduced.  The one starting
with `${MODPY_COMMENT}...`.  Is it save to leave it there ?

And now the important bit:

Index: Makefile
===
RCS file: /cvs/ports/textproc/py-semver/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile12 Jul 2019 20:50:13 -  1.4
+++ Makefile16 Dec 2019 17:09:29 -
@@ -2,7 +2,7 @@
 
 COMMENT =  python helper for Semantic Versioning
 
-MODPY_EGG_VERSION =2.8.1
+MODPY_EGG_VERSION =2.9.0
 DISTNAME = semver-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 REVISION = 0
@@ -17,10 +17,14 @@ PERMIT_PACKAGE =Yes
 MODULES =  lang/python
 MODPY_SETUPTOOLS = Yes
 MODPY_PI = Yes
+MODPY_PYTEST = Yes
+MODPY_PYTEST_ARGS =test_semver.py
 
 FLAVORS =  python3
 FLAVOR ?=
 
-NO_TEST =  Yes
+TEST_DEPENDS = devel/py-test-cov${MODPY_FLAVOR} \
+   devel/py-tox${MODPY_FLAVOR} \
+   devel/py-virtualenv${MODPY_FLAVOR}
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/textproc/py-semver/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo30 Jul 2018 14:07:05 -  1.2
+++ distinfo16 Dec 2019 17:09:29 -
@@ -1,2 +1,2 @@
-SHA256 (semver-2.8.1.tar.gz) = WwkBCmbZo4NyEbt65aINELqI+MtJ6SyxOaae+Q1QYNg=
-SIZE (semver-2.8.1.tar.gz) = 5576
+SHA256 (semver-2.9.0.tar.gz) = 7R7eqgwn9o/rdPCfcVB3/Qe3KERtwrt/xHD8D3N4c6A=
+SIZE (semver-2.9.0.tar.gz) = 13239
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/py-semver/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   30 Jul 2018 14:07:05 -  1.2
+++ pkg/PLIST   16 Dec 2019 17:09:29 -
@@ -1,8 +1,13 @@
 @comment $OpenBSD: PLIST,v 1.2 2018/07/30 14:07:05 jasper Exp $
+bin/pysemver
+lib/python${MODPY_VERSION}/
+lib/python${MODPY_VERSION}/site-packages/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}semver.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/semver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/semver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 
lib/python${MODPY_VERSION}/site-packages/semver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
 
lib/python${MODPY_VERSION}/site-packages/semver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/semver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
 
lib/python${MODPY_VERSION}/site-packages/semver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/semver.py

-- 
Paco Esteban.
5818130B8A6DBC03



Re: Add MODPY_TEST (should be MODPY_PYTEST) as poisoned entry

2019-11-30 Thread Paco Esteban
On Fri, 29 Nov 2019, Kurt Mosiejczuk wrote:

> I'd like to add MODPY_TEST as a poisoned entry to mk.conf.template.  I
> used to make this typo a lot. Things look like they work right, but
> pytest isn't getting used at that point, just the usual setuptools
> testing mechanism.
> 
> ok?

For what is worth, it seems I tend to make this mistake a lot too.  A
big error in my face would help.

Cheers,

-- 
Paco Esteban.
5818130B8A6DBC03



Re: new: net/py-transmissionrpc-ng

2019-11-30 Thread Paco Esteban
On Sat, 30 Nov 2019, Kurt Mosiejczuk wrote:

> First, you've got spaces for indentiation rather than tabs, that needs to
> be fixed.

That happens when one sends things without engaging one's brain ...
Find attached the updated version.

> The tests all pass on amd64 and sparc64 for me, so make those changes
> and ok kmos

Thank you Kurt.

-- 
Paco Esteban.
5818130B8A6DBC03


py-transmissonrpc-ng.tar.gz
Description: Binary data


Re: Update: cad/kicad 5.1.4 >> 5.1.5

2019-11-29 Thread Paco Esteban
On Fri, 22 Nov 2019, Tracey Emery wrote:

> On Fri, Nov 22, 2019 at 01:49:57PM -0500, James Turner wrote:
> > 
> > Once EPOCH has been added to a port, you can't remove it.
> 
> The universe is once again, back in order. Epoch restored.

Tested on amd64.  Builds, installs and runs ok for me (cad/kicad-share
too).

Thanks for the update !

-- 
Paco Esteban.
5818130B8A6DBC03



Re: [update] sysutils/fzf to 0.19.0

2019-11-29 Thread Paco Esteban
On Thu, 28 Nov 2019, Aaron Bieber wrote:

> Hi,
> 
> Here is an update of fzf.
> 
> Port changes:
>  - Include shell completion / key-bindings.
>  - Update pledge to the "newer" PLedgePromises call.
> 
> FZF changes:
>  - https://github.com/junegunn/fzf/blob/master/CHANGELOG.md#0190
> 
> OK?

builds and works fine for me on amd64.  I've tried a couple of the new
functionalities just for fun (I do not need them) and they work ok.

It's really nice to have the completion and key bindings on /usr/local
now.

Cheers,

-- 
Paco Esteban.
5818130B8A6DBC03



new: net/py-transmissionrpc-ng

2019-11-28 Thread Paco Esteban
Hi ports@,

Here's a new port for transmissionrpc python module.
This is a simple one, it only depends on py-curl.

All tests pass and works fine for me on amd64.

Cheers,

-- 
Paco Esteban.
5818130B8A6DBC03


py-transmissonrpc-ng.tar.gz
Description: Binary data


<    1   2   3   4   5   6   7   >