Re: update: devel/py-wbem (and drop py2)

2020-06-17 Thread Jeremie Courreges-Anglas 
On Sun, Jun 14 2020, Paco Esteban  wrote:
> On Sat, 13 Jun 2020, Paco Esteban wrote:
>
>> On Sat, 13 Jun 2020, Paco Esteban wrote:
>> 
>> > Hi,
>> > 
>> > As suggested by sthen@ we can drop py2 for devel/py-wbem.
>> > 
>> > I took the opportunity to update it to its latest version.  I cannot
>> > (or don't know how to) test this myself and the pypi distfile does not
>> > include the tests (I opened an issue for this on their github repo), so
>> > if somebody can test it it would be nice.
>> > 
>> > Comments ? ok ?
>> 
>> Here it is again against the latest version in the ports tree and
>> including some suggestions from sthen@
>
> And here it is one more time to adapt to the latest commit by ajacoutot@

Setting both TEST_DEPENDS and NO_TEST=Yes is dubious, why install deps
if you won't run the tests and have a chance to verify that the
TEST_DEPENDS are indeed correct?

Anyway, NO_TEST=Yes isn't appropriate here, see bsd.port.mk(5).

A simple fix is to drop NO_TEST=Yes and the related comment, and keep
TEST_DEPENDS since they look correct (make test tries to download them
if not installed, and fails in a PORTS_PRIVSEP setup).

With this addressed, ok jca@

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: update: devel/py-wbem (and drop py2)

2020-06-14 Thread Klemens Nanni 
OK kn

Re: update: devel/py-wbem (and drop py2)

2020-06-14 Thread Paco Esteban 
On Sat, 13 Jun 2020, Paco Esteban wrote:

> On Sat, 13 Jun 2020, Paco Esteban wrote:
> 
> > Hi,
> > 
> > As suggested by sthen@ we can drop py2 for devel/py-wbem.
> > 
> > I took the opportunity to update it to its latest version.  I cannot
> > (or don't know how to) test this myself and the pypi distfile does not
> > include the tests (I opened an issue for this on their github repo), so
> > if somebody can test it it would be nice.
> > 
> > Comments ? ok ?
> 
> Here it is again against the latest version in the ports tree and
> including some suggestions from sthen@

And here it is one more time to adapt to the latest commit by ajacoutot@

Index: Makefile
===
RCS file: /home/cvs/ports/devel/py-wbem/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile14 Jun 2020 09:08:00 -  1.16
+++ Makefile14 Jun 2020 16:41:18 -
@@ -2,8 +2,7 @@
 
 COMMENT=   CIM operations over HTTP in Python
 
-MODPY_EGG_VERSION= 0.12.2
-REVISION=  2
+MODPY_EGG_VERSION= 0.17.2
 DISTNAME=  pywbem-${MODPY_EGG_VERSION}
 PKGNAME=   py-wbem-${MODPY_EGG_VERSION}
 CATEGORIES=devel
@@ -11,30 +10,29 @@ CATEGORIES= devel
 HOMEPAGE=  https://pywbem.github.io/
 
 # LGPLv2
-PERMIT_PACKAGE=Yes
+PERMIT_PACKAGE=Yes
 
 MODULES=   lang/python
 MODPY_PI=  Yes
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR =   python3
 
 BUILD_DEPENDS= ${RUN_DEPENDS}
 
-RUN_DEPENDS=   devel/py-pbr${MODPY_FLAVOR}>=1.10.0 \
-   devel/py-ply${MODPY_FLAVOR} \
+RUN_DEPENDS=   devel/py-ply${MODPY_FLAVOR} \
devel/py-six${MODPY_FLAVOR} \
-   security/py-M2Crypto${MODPY_FLAVOR} \
-   textproc/py-yaml${MODPY_FLAVOR}
+   textproc/py-yaml${MODPY_FLAVOR} \
+   www/py-requests${MODPY_FLAVOR}
 TEST_DEPENDS=  devel/py-mock${MODPY_FLAVOR} \
-   devel/py-ply${MODPY_FLAVOR}>=3.11
+   devel/py-ply${MODPY_FLAVOR}>=3.10
 
 MODPY_SETUPTOOLS=  Yes
 
+# the pypi tarball does not include tests
+NO_TEST =  Yes
+
 post-install:
rm ${PREFIX}/bin/*.bat
-   mv ${PREFIX}/bin/mof_compiler{,${MODPY_BIN_SUFFIX}}
-   mv ${PREFIX}/bin/wbemcli{,${MODPY_BIN_SUFFIX}}
-   mv ${PREFIX}/bin/wbemcli{,${MODPY_BIN_SUFFIX}}.py
 
 .include 
Index: distinfo
===
RCS file: /home/cvs/ports/devel/py-wbem/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo25 Apr 2018 10:10:48 -  1.5
+++ distinfo13 Jun 2020 17:03:39 -
@@ -1,2 +1,2 @@
-SHA256 (pywbem-0.12.2.tar.gz) = 2VzrGDW/sk4Uk2W8dhMzPYD68IWQ1+elTXUe+OWslMo=
-SIZE (pywbem-0.12.2.tar.gz) = 3852210
+SHA256 (pywbem-0.17.2.tar.gz) = hNrDP3fV/yw9jrQvx94v+20z9eSVTvidsNvz/mRqKAk=
+SIZE (pywbem-0.17.2.tar.gz) = 326882
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/devel/py-wbem/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST   10 May 2018 07:32:16 -  1.5
+++ pkg/PLIST   13 Jun 2020 21:48:34 -
@@ -1,66 +1,79 @@
 @comment $OpenBSD: PLIST,v 1.5 2018/05/10 07:32:16 ajacoutot Exp $
-bin/mof_compiler${MODPY_BIN_SUFFIX}
-bin/wbemcli${MODPY_BIN_SUFFIX}
-bin/wbemcli${MODPY_BIN_SUFFIX}.py
+@conflict py-wbem-*
+@pkgpath devel/py-wbem
+bin/mof_compiler
+bin/wbemcli
+bin/wbemcli.py
 lib/python${MODPY_VERSION}/site-packages/pywbem/
 
lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 
lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
 
lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json
 
lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
 
lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
 lib/python${MODPY_VERSION}/site-packages/pywbem/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc

Re: update: devel/py-wbem (and drop py2)

2020-06-14 Thread Stuart Henderson 
On 2020/06/14 03:23, Klemens Nanni wrote:
> On Sat, Jun 13, 2020 at 11:50:22PM +0200, Paco Esteban wrote:
> > Here it is again against the latest version in the ports tree and
> > including some suggestions from sthen@
> OK kn, but one thought inline.
>  
> >  post-install:
> > rm ${PREFIX}/bin/*.bat
> > -   mv ${PREFIX}/bin/mof_compiler{,${MODPY_BIN_SUFFIX}}
> > -   mv ${PREFIX}/bin/wbemcli{,${MODPY_BIN_SUFFIX}}
> > -   mv ${PREFIX}/bin/wbemcli{,${MODPY_BIN_SUFFIX}}.py
> That renames executables for the python3 flavor which is used by
> net/nagios/check_esxi_hardware: did you check whether this port needs
> adjustment regarding calls to one of these executables?
> 

check_esxi_hardware doesn't use them, only the python module.
Update is ok with me.

Re: update: devel/py-wbem (and drop py2)

2020-06-13 Thread Klemens Nanni 
On Sat, Jun 13, 2020 at 11:50:22PM +0200, Paco Esteban wrote:
> Here it is again against the latest version in the ports tree and
> including some suggestions from sthen@
OK kn, but one thought inline.
 
>  post-install:
>   rm ${PREFIX}/bin/*.bat
> - mv ${PREFIX}/bin/mof_compiler{,${MODPY_BIN_SUFFIX}}
> - mv ${PREFIX}/bin/wbemcli{,${MODPY_BIN_SUFFIX}}
> - mv ${PREFIX}/bin/wbemcli{,${MODPY_BIN_SUFFIX}}.py
That renames executables for the python3 flavor which is used by
net/nagios/check_esxi_hardware: did you check whether this port needs
adjustment regarding calls to one of these executables?

Re: update: devel/py-wbem (and drop py2)

2020-06-13 Thread Paco Esteban 
On Sat, 13 Jun 2020, Paco Esteban wrote:

> Hi,
> 
> As suggested by sthen@ we can drop py2 for devel/py-wbem.
> 
> I took the opportunity to update it to its latest version.  I cannot
> (or don't know how to) test this myself and the pypi distfile does not
> include the tests (I opened an issue for this on their github repo), so
> if somebody can test it it would be nice.
> 
> Comments ? ok ?

Here it is again against the latest version in the ports tree and
including some suggestions from sthen@

Index: Makefile
===
RCS file: /home/cvs/ports/devel/py-wbem/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile13 Jun 2020 16:17:24 -  1.15
+++ Makefile13 Jun 2020 21:46:19 -
@@ -2,8 +2,7 @@
 
 COMMENT=   CIM operations over HTTP in Python
 
-MODPY_EGG_VERSION= 0.12.2
-REVISION=  2
+MODPY_EGG_VERSION= 0.17.2
 DISTNAME=  pywbem-${MODPY_EGG_VERSION}
 PKGNAME=   py-wbem-${MODPY_EGG_VERSION}
 CATEGORIES=devel
@@ -11,28 +10,27 @@ CATEGORIES= devel
 HOMEPAGE=  https://pywbem.github.io/
 
 # LGPLv2
-PERMIT_PACKAGE=Yes
+PERMIT_PACKAGE=Yes
 
 MODULES=   lang/python
 MODPY_PI=  Yes
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR =   python3
 
-RUN_DEPENDS=   devel/py-pbr${MODPY_FLAVOR}>=1.10.0 \
-   devel/py-ply${MODPY_FLAVOR} \
+RUN_DEPENDS=   devel/py-ply${MODPY_FLAVOR} \
devel/py-six${MODPY_FLAVOR} \
-   security/py-M2Crypto${MODPY_FLAVOR} \
-   textproc/py-yaml${MODPY_FLAVOR}
+   textproc/py-yaml${MODPY_FLAVOR} \
+   www/py-requests${MODPY_FLAVOR}
 TEST_DEPENDS=  devel/py-mock${MODPY_FLAVOR} \
-   devel/py-ply${MODPY_FLAVOR}>=3.11
+   devel/py-ply${MODPY_FLAVOR}>=3.10
 
 MODPY_SETUPTOOLS=  Yes
 
+# the pypi tarball does not include tests
+NO_TEST =  Yes
+
 post-install:
rm ${PREFIX}/bin/*.bat
-   mv ${PREFIX}/bin/mof_compiler{,${MODPY_BIN_SUFFIX}}
-   mv ${PREFIX}/bin/wbemcli{,${MODPY_BIN_SUFFIX}}
-   mv ${PREFIX}/bin/wbemcli{,${MODPY_BIN_SUFFIX}}.py
 
 .include 
Index: distinfo
===
RCS file: /home/cvs/ports/devel/py-wbem/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo25 Apr 2018 10:10:48 -  1.5
+++ distinfo13 Jun 2020 17:03:39 -
@@ -1,2 +1,2 @@
-SHA256 (pywbem-0.12.2.tar.gz) = 2VzrGDW/sk4Uk2W8dhMzPYD68IWQ1+elTXUe+OWslMo=
-SIZE (pywbem-0.12.2.tar.gz) = 3852210
+SHA256 (pywbem-0.17.2.tar.gz) = hNrDP3fV/yw9jrQvx94v+20z9eSVTvidsNvz/mRqKAk=
+SIZE (pywbem-0.17.2.tar.gz) = 326882
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/devel/py-wbem/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST   10 May 2018 07:32:16 -  1.5
+++ pkg/PLIST   13 Jun 2020 21:48:34 -
@@ -1,66 +1,79 @@
 @comment $OpenBSD: PLIST,v 1.5 2018/05/10 07:32:16 ajacoutot Exp $
-bin/mof_compiler${MODPY_BIN_SUFFIX}
-bin/wbemcli${MODPY_BIN_SUFFIX}
-bin/wbemcli${MODPY_BIN_SUFFIX}.py
+@conflict py-wbem-*
+@pkgpath devel/py-wbem
+bin/mof_compiler
+bin/wbemcli
+bin/wbemcli.py
 lib/python${MODPY_VERSION}/site-packages/pywbem/
 
lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 
lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
 
lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json
 
lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
 
lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
 lib/python${MODPY_VERSION}/site-packages/pywbem/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_cim_constants.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_cim_http.${MODPY_PYC_MAGIC_TAG}pyc

update: devel/py-wbem (and drop py2)

2020-06-13 Thread Paco Esteban 
Hi,

As suggested by sthen@ we can drop py2 for devel/py-wbem.

I took the opportunity to update it to its latest version.  I cannot
(or don't know how to) test this myself and the pypi distfile does not
include the tests (I opened an issue for this on their github repo), so
if somebody can test it it would be nice.

Comments ? ok ?

Index: Makefile
===
RCS file: /home/cvs/ports/devel/py-wbem/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile12 Jul 2019 20:45:55 -  1.14
+++ Makefile13 Jun 2020 17:11:00 -
@@ -2,8 +2,7 @@
 
 COMMENT=   CIM operations over HTTP in Python
 
-MODPY_EGG_VERSION= 0.12.2
-REVISION=  2
+MODPY_EGG_VERSION= 0.17.2
 DISTNAME=  pywbem-${MODPY_EGG_VERSION}
 PKGNAME=   py-wbem-${MODPY_EGG_VERSION}
 CATEGORIES=devel
@@ -11,26 +10,28 @@ CATEGORIES= devel
 HOMEPAGE=  https://pywbem.github.io/
 
 # LGPLv2
-PERMIT_PACKAGE=Yes
+PERMIT_PACKAGE=Yes
 
 MODULES=   lang/python
 MODPY_PI=  Yes
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR =   python3
 
 BUILD_DEPENDS= ${RUN_DEPENDS} \
devel/py-pip${MODPY_FLAVOR}
 
-RUN_DEPENDS=   devel/py-pbr${MODPY_FLAVOR}>=1.10.0 \
-   devel/py-ply${MODPY_FLAVOR} \
+RUN_DEPENDS=   devel/py-ply${MODPY_FLAVOR} \
devel/py-six${MODPY_FLAVOR} \
-   security/py-M2Crypto${MODPY_FLAVOR} \
-   textproc/py-yaml${MODPY_FLAVOR}
+   textproc/py-yaml${MODPY_FLAVOR} \
+   www/py-requests${MODPY_FLAVOR}
 TEST_DEPENDS=  devel/py-mock${MODPY_FLAVOR} \
-   devel/py-ply${MODPY_FLAVOR}>=3.11
+   devel/py-ply${MODPY_FLAVOR}>=3.10
 
 MODPY_SETUPTOOLS=  Yes
+
+# the pypi tarball does not include tests
+NO_TEST =  Yes
 
 post-install:
rm ${PREFIX}/bin/*.bat
Index: distinfo
===
RCS file: /home/cvs/ports/devel/py-wbem/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo25 Apr 2018 10:10:48 -  1.5
+++ distinfo13 Jun 2020 17:03:39 -
@@ -1,2 +1,2 @@
-SHA256 (pywbem-0.12.2.tar.gz) = 2VzrGDW/sk4Uk2W8dhMzPYD68IWQ1+elTXUe+OWslMo=
-SIZE (pywbem-0.12.2.tar.gz) = 3852210
+SHA256 (pywbem-0.17.2.tar.gz) = hNrDP3fV/yw9jrQvx94v+20z9eSVTvidsNvz/mRqKAk=
+SIZE (pywbem-0.17.2.tar.gz) = 326882
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/devel/py-wbem/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST   10 May 2018 07:32:16 -  1.5
+++ pkg/PLIST   13 Jun 2020 17:05:55 -
@@ -1,66 +1,77 @@
 @comment $OpenBSD: PLIST,v 1.5 2018/05/10 07:32:16 ajacoutot Exp $
 bin/mof_compiler${MODPY_BIN_SUFFIX}
 bin/wbemcli${MODPY_BIN_SUFFIX}
-bin/wbemcli${MODPY_BIN_SUFFIX}.py
+bin/wbemcli-3.py
 lib/python${MODPY_VERSION}/site-packages/pywbem/
 
lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 
lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
 
lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json
 
lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
 
lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
 lib/python${MODPY_VERSION}/site-packages/pywbem/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_cim_constants.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_cim_http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_cim_obj.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_cim_operations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_cim_types.${MODPY_PYC_MAGIC_TAG}pyc