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 --- Makefile 13 Jun 2020 16:17:24 -0000 1.15 +++ Makefile 13 Jun 2020 21:46:19 -0000 @@ -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 <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/cvs/ports/devel/py-wbem/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo 25 Apr 2018 10:10:48 -0000 1.5 +++ distinfo 13 Jun 2020 17:03:39 -0000 @@ -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 -0000 1.5 +++ pkg/PLIST 13 Jun 2020 21:48:34 -0000 @@ -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 +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 +lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_cim_xml.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_cliutils.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_exceptions.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_listener.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_logging.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_mof_compiler.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_moflextab.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_mofparsetab.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_nocasedict.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_recorder.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_server.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_statistics.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_subscription_manager.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_tupleparse.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_tupletree.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_utils.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_valuemapping.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_version.${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 -lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}cim_xml.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}_warnings.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}mof_compiler.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}moflextab.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}mofparsetab.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}tupleparse.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}tupletree.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pywbem/_cim_constants.py +lib/python${MODPY_VERSION}/site-packages/pywbem/_cim_http.py +lib/python${MODPY_VERSION}/site-packages/pywbem/_cim_obj.py +lib/python${MODPY_VERSION}/site-packages/pywbem/_cim_operations.py +lib/python${MODPY_VERSION}/site-packages/pywbem/_cim_types.py +lib/python${MODPY_VERSION}/site-packages/pywbem/_cim_xml.py lib/python${MODPY_VERSION}/site-packages/pywbem/_cliutils.py +lib/python${MODPY_VERSION}/site-packages/pywbem/_exceptions.py lib/python${MODPY_VERSION}/site-packages/pywbem/_listener.py lib/python${MODPY_VERSION}/site-packages/pywbem/_logging.py +lib/python${MODPY_VERSION}/site-packages/pywbem/_mof_compiler.py +lib/python${MODPY_VERSION}/site-packages/pywbem/_moflextab.py +lib/python${MODPY_VERSION}/site-packages/pywbem/_mofparsetab.py +lib/python${MODPY_VERSION}/site-packages/pywbem/_nocasedict.py lib/python${MODPY_VERSION}/site-packages/pywbem/_recorder.py lib/python${MODPY_VERSION}/site-packages/pywbem/_server.py lib/python${MODPY_VERSION}/site-packages/pywbem/_statistics.py lib/python${MODPY_VERSION}/site-packages/pywbem/_subscription_manager.py +lib/python${MODPY_VERSION}/site-packages/pywbem/_tupleparse.py +lib/python${MODPY_VERSION}/site-packages/pywbem/_tupletree.py +lib/python${MODPY_VERSION}/site-packages/pywbem/_utils.py lib/python${MODPY_VERSION}/site-packages/pywbem/_valuemapping.py lib/python${MODPY_VERSION}/site-packages/pywbem/_version.py -lib/python${MODPY_VERSION}/site-packages/pywbem/cim_constants.py -lib/python${MODPY_VERSION}/site-packages/pywbem/cim_http.py -lib/python${MODPY_VERSION}/site-packages/pywbem/cim_obj.py -lib/python${MODPY_VERSION}/site-packages/pywbem/cim_operations.py -lib/python${MODPY_VERSION}/site-packages/pywbem/cim_types.py -lib/python${MODPY_VERSION}/site-packages/pywbem/cim_xml.py +lib/python${MODPY_VERSION}/site-packages/pywbem/_warnings.py lib/python${MODPY_VERSION}/site-packages/pywbem/config.py -lib/python${MODPY_VERSION}/site-packages/pywbem/exceptions.py -lib/python${MODPY_VERSION}/site-packages/pywbem/mof_compiler.py -lib/python${MODPY_VERSION}/site-packages/pywbem/moflextab.py -lib/python${MODPY_VERSION}/site-packages/pywbem/mofparsetab.py -lib/python${MODPY_VERSION}/site-packages/pywbem/tupleparse.py -lib/python${MODPY_VERSION}/site-packages/pywbem/tupletree.py lib/python${MODPY_VERSION}/site-packages/pywbem_mock/ lib/python${MODPY_VERSION}/site-packages/pywbem_mock/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pywbem_mock/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/pywbem_mock/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pywbem_mock/${MODPY_PYCACHE}_dmtf_cim_schema.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pywbem_mock/${MODPY_PYCACHE}_mockmofwbemconnection.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pywbem_mock/${MODPY_PYCACHE}_resolvermixin.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/pywbem_mock/${MODPY_PYCACHE}_wbemconnection_mock.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pywbem_mock/_dmtf_cim_schema.py +lib/python${MODPY_VERSION}/site-packages/pywbem_mock/_mockmofwbemconnection.py +lib/python${MODPY_VERSION}/site-packages/pywbem_mock/_resolvermixin.py lib/python${MODPY_VERSION}/site-packages/pywbem_mock/_wbemconnection_mock.py -- Paco Esteban. 0x5818130B8A6DBC03