On Thu, Aug 15, 2019 at 12:47:44AM -0400, Kurt Mosiejczuk wrote:
> On Wed, Mar 20, 2019 at 11:51:09AM -0400, Kurt Mosiejczuk wrote:
> > On Tue, Mar 19, 2019 at 11:12:28PM -0400, Kurt Mosiejczuk wrote:
> Reaching back in the sands of time... I've redone this diff so it will
> work with the current state of the ports tree.
> I switched it to use MODPY_SETUPTOOLS and MODPY_PYTEST, removing the
> need for devel/py-nose in the TEST_DEPENDS. I dropped the MODPY_FLAVOR
> off of py-pathlib since that is only used for python2.
> I patched setup.py to use setuptools rather than the obsolete disutils.
> This allows the desired --single-version-externally-managed for the
> ports tree. I was going to upstream the patch, but their github doesn't
> have a setup.py. ?!?
> All tests for consumers devel/ipython, devel/py-nbconvert, and
> devel/py-nbformat pass their regression tests exactly as before this
> update.
> OK?
Ping
--Kurt
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-testpath/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 12 Jul 2019 20:45:54 -0000 1.13
+++ Makefile 15 Aug 2019 04:34:24 -0000
@@ -2,10 +2,9 @@
COMMENT = test utilities working with files and commands
-MODPY_EGG_VERSION = 0.3.1
+MODPY_EGG_VERSION = 0.4.2
DISTNAME = testpath-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 2
CATEGORIES = devel
@@ -17,28 +16,26 @@ PERMIT_PACKAGE = Yes
MODULES = lang/python
MODPY_PI = Yes
+MODPY_SETUPTOOLS = Yes
+MODPY_PYTEST = Yes
FLAVORS = python3
FLAVOR ?=
BUILD_DEPENDS = textproc/py-sphinx${MODPY_FLAVOR}
-TEST_DEPENDS = devel/py-nose${MODPY_FLAVOR}
.if !${FLAVOR:Mpython3}
-RUN_DEPENDS = devel/py-pathlib${MODPY_FLAVOR}
+RUN_DEPENDS = devel/py-pathlib
.endif
post-build:
cd ${WRKSRC}/doc && PYTHONPATH=${WRKSRC} \
- ${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX} -N . _build/html
+ ${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX} -N . _build/html
DOCDIR = ${PREFIX}/share/doc/${MODPY_PY_PREFIX}testpath
post-install:
cp -r ${WRKBUILD}/doc/_build/html ${DOCDIR}
rm ${DOCDIR}/.buildinfo
chown -R ${SHAREOWN}:${SHAREGRP} ${DOCDIR}
-
-do-test:
- cd ${WRKSRC} && ${LOCALBASE}/bin/nosetests${MODPY_BIN_SUFFIX}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-testpath/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 29 May 2017 15:36:31 -0000 1.4
+++ distinfo 15 Aug 2019 04:34:24 -0000
@@ -1,2 +1,2 @@
-SHA256 (testpath-0.3.1.tar.gz) = DVM3g5x4jaWQDfcPjgEBWuwUGqP+eTbLDQopU/esdgk=
-SIZE (testpath-0.3.1.tar.gz) = 91663
+SHA256 (testpath-0.4.2.tar.gz) = tpSz2SiNvYFoXF0ucUC4E2XUbCn120vGWd5aprmHgPg=
+SIZE (testpath-0.4.2.tar.gz) = 92850
Index: patches/patch-setup_py
===================================================================
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-setup_py 15 Aug 2019 04:34:24 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Patch to use setuptools to allow --single-version-externally-managed
+
+Index: setup.py
+--- setup.py.orig
++++ setup.py
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env python
+ # setup.py generated by flit for tools that don't yet use PEP 517
+
+-from distutils.core import setup
++from setuptools import setup
+
+ packages = \
+ ['testpath']
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-testpath/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 29 May 2017 15:36:31 -0000 1.5
+++ pkg/PLIST 15 Aug 2019 04:34:24 -0000
@@ -1,6 +1,11 @@
@comment $OpenBSD: PLIST,v 1.5 2017/05/29 15:36:31 shadchin Exp $
lib/python${MODPY_VERSION}/site-packages/testpath/
-lib/python${MODPY_VERSION}/site-packages/testpath-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/testpath-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/testpath-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/testpath-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/testpath-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/testpath-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/testpath-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/testpath/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/testpath/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/testpath/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
No comments:
Post a Comment