Re: update to py-setuptools-26.0.0

2016-09-16 Thread Stuart Henderson 
On 2016/09/15 22:10, Daniel Jakots wrote:
> On Sat, 27 Aug 2016 21:21:07 +0100, Stuart Henderson
>  wrote:
> 
> > You have to bump them all because otherwise packaging will fail
> > (PLIST_DB). If you are going to this trouble anyway it is probably
> > worth looking at setting PKGSPEC for setuputils to reduce the need
> > for future bumps..
> 
> So I'm looking again at this update.
> I looked at PKGSPEC. I looked at the +CONTENTS in a package that
> depends on setuptools and there is :
> @depend devel/py-setuptools:py-setuptools->=18.2v0:py-setuptools-18.2p0v0
> which must comes from 
> MODPY_SETUPUTILS_DEPEND ?= devel/py-setuptools${MODPY_FLAVOR}>=18.2v0
> in lang/python/python.port.mk
> 
> and AFAIU how PKGSPEC works, it would do the same thing so I don't
> really see how it would help? 

H. Looks like I may have been wrong, I've just done a bit of testing
and it seems that changing the version part of the package spec in
MODPY_SETUPUTILS_DEPEND actually does *not* require REVISION bumps for
dependent ports.

Here's the version using PKGSPEC, but from my newer testing I think that
this would be exactly equivalent to just changing MODPY_SETUPUTILS_DEPEND.

python.port.mk:

  MODPY_SETUPUTILS_DEPEND ?= devel/py-setuptools${MODPY_FLAVOR}

devel/py-setuptools/Makefile:

  PKGSPEC = ${MODPY_PY_PREFIX}setuptools->=18.2v0

Re: update to py-setuptools-26.0.0

2016-09-15 Thread Daniel Jakots 
On Sat, 27 Aug 2016 21:21:07 +0100, Stuart Henderson
 wrote:

> You have to bump them all because otherwise packaging will fail
> (PLIST_DB). If you are going to this trouble anyway it is probably
> worth looking at setting PKGSPEC for setuputils to reduce the need
> for future bumps..

So I'm looking again at this update.
I looked at PKGSPEC. I looked at the +CONTENTS in a package that
depends on setuptools and there is :
@depend devel/py-setuptools:py-setuptools->=18.2v0:py-setuptools-18.2p0v0
which must comes from 
MODPY_SETUPUTILS_DEPEND ?= devel/py-setuptools${MODPY_FLAVOR}>=18.2v0
in lang/python/python.port.mk

and AFAIU how PKGSPEC works, it would do the same thing so I don't
really see how it would help?

Re: update to py-setuptools-26.0.0

2016-08-27 Thread Stuart Henderson 
You have to bump them all because otherwise packaging will fail (PLIST_DB). 
If you are going to this trouble anyway it is probably worth looking at 
setting PKGSPEC for setuputils to reduce the need for future bumps..



On 27 August 2016 5:35:44 p.m. Daniel Jakots  wrote:


On Sat, 27 Aug 2016 18:08:32 +0200, Daniel Jakots 
wrote:


I looked at what happened last time it was updated, the update was
committed and then all ports that use setuptools were bumped, I don't
know if such thing would be needed this time?


Talking about it with aja an jca, I understand that it should be:

1. commit the py-setuptools diff
2. commit the python.port.mk diff
3. bump every port that have a RUN_DEPENDS on py-setuptools

to be sure that every thing use the new version of py-setuptools. Am I
right?

Re: update to py-setuptools-26.0.0

2016-08-27 Thread Daniel Jakots 
On Sat, 27 Aug 2016 18:08:32 +0200, Daniel Jakots 
wrote:

> I looked at what happened last time it was updated, the update was
> committed and then all ports that use setuptools were bumped, I don't
> know if such thing would be needed this time?

Talking about it with aja an jca, I understand that it should be:

1. commit the py-setuptools diff
2. commit the python.port.mk diff
3. bump every port that have a RUN_DEPENDS on py-setuptools

to be sure that every thing use the new version of py-setuptools. Am I
right?

Re: update to py-setuptools-26.0.0

2016-08-27 Thread Daniel Jakots 
On Sat, 27 Aug 2016 18:08:32 +0200, Daniel Jakots 
wrote:

> Hi,
> 
> I'd like to update py-setuptools to not to lag too much on upstream. I
> cooked a diff that I used on a test machine (i386 fwiw).

This time it's attached to it won't get mangled.Index: Makefile
===
RCS file: /cvs/ports/devel/py-setuptools/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile	29 Sep 2015 10:52:11 -	1.28
+++ Makefile	26 Aug 2016 15:18:18 -
@@ -2,13 +2,12 @@
 
 COMMENT=	simplified packaging system for Python modules
 
-MODPY_EGG_VERSION=	18.2
+MODPY_EGG_VERSION=	26.0.0
 DISTNAME=		setuptools-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME:S/c/./}
 EPOCH = 		0
 CATEGORIES=		devel
 PKG_ARCH=		*
-REVISION=		0
 
 
 MODPY_PI =	Yes
Index: distinfo
===
RCS file: /cvs/ports/devel/py-setuptools/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo	29 Sep 2015 08:49:37 -	1.10
+++ distinfo	26 Aug 2016 15:18:18 -
@@ -1,2 +1,2 @@
-SHA256 (setuptools-18.2.tar.gz) = CZSljfJ+pdxSN4KmATV6IZi3ST3MmaMNUYJ6I1hbWx0=
-SIZE (setuptools-18.2.tar.gz) = 630990
+SHA256 (setuptools-26.0.0.tar.gz) = RbUC1/OWrHtg3x8dW9Afkopr1ZeXJfosZT3ZP+ts1oY=
+SIZE (setuptools-26.0.0.tar.gz) = 632557
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/devel/py-setuptools/patches/patch-setup_py,v
retrieving revision 1.4
diff -u -p -r1.4 patch-setup_py
--- patches/patch-setup_py	29 Sep 2015 08:49:37 -	1.4
+++ patches/patch-setup_py	26 Aug 2016 15:18:18 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-setup_py,v 1.4 2015/09/29 08:49:37 edd Exp $
 setup.py.orig	Sat Aug 22 12:30:32 2015
-+++ setup.py	Sat Aug 22 12:30:38 2015
-@@ -85,7 +85,7 @@ setup_params = dict(
+--- setup.py.orig	Sun Aug 21 00:28:03 2016
 setup.py	Fri Aug 26 16:28:07 2016
+@@ -102,7 +102,7 @@ setup_params = dict(
  
  py_modules=['easy_install'],
  
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-setuptools/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST	29 Sep 2015 08:49:37 -	1.10
+++ pkg/PLIST	26 Aug 2016 15:18:18 -
@@ -5,12 +5,6 @@
 bin/easy_install-${MODPY_VERSION}
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}easy_install.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_markerlib/
-lib/python${MODPY_VERSION}/site-packages/_markerlib/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/_markerlib/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/_markerlib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_markerlib/${MODPY_PYCACHE}markers.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_markerlib/markers.py
 lib/python${MODPY_VERSION}/site-packages/easy_install.py
 lib/python${MODPY_VERSION}/site-packages/pkg_resources/
 lib/python${MODPY_VERSION}/site-packages/pkg_resources/__init__.py
@@ -20,6 +14,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/${MODPY_PYCACHE}pyparsing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/${MODPY_PYCACHE}six.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/
 lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/__about__.py
 lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/__init__.py
@@ -28,12 +24,24 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/${MODPY_PYCACHE}_structures.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/${MODPY_PYCACHE}markers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/${MODPY_PYCACHE}requirements.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/${MODPY_PYCACHE}specifiers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-pa