CVS commit: pkgsrc/devel/py-setuptools_trial

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Apr  3 20:19:47 UTC 2018

Modified Files:
        pkgsrc/devel/py-setuptools_trial: Makefile PLIST distinfo
Added Files:
        pkgsrc/devel/py-setuptools_trial/patches: patch-setup.py

Log Message:
py-setuptools_trial: avoid conflict between Python versions; fix DEPENDS; bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/py-setuptools_trial/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-setuptools_trial/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-setuptools_trial/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/py-setuptools_trial/patches/patch-setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-setuptools_trial/Makefile
diff -u pkgsrc/devel/py-setuptools_trial/Makefile:1.14 pkgsrc/devel/py-setuptools_trial/Makefile:1.15
--- pkgsrc/devel/py-setuptools_trial/Makefile:1.14      Mon Sep  4 18:08:21 2017
+++ pkgsrc/devel/py-setuptools_trial/Makefile   Tue Apr  3 20:19:47 2018
@@ -1,18 +1,28 @@
-# $NetBSD: Makefile,v 1.14 2017/09/04 18:08:21 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2018/04/03 20:19:47 adam Exp $
 
 DISTNAME=      setuptools_trial-0.6.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=    devel
+PKGREVISION=   1
+CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/setuptools_trial/}
 
 MAINTAINER=    gdt%ir.bbn.com@localhost
-HOMEPAGE=      https://pypi.python.org/pypi/setuptools_trial/
+HOMEPAGE=      https://github.com/rutsky/setuptools-trial
 COMMENT=       Setuptools plugin for Twisted-based unit tests
 LICENSE=       modified-bsd
 
+DEPENDS+=      ${PYPKGPREFIX}-twisted>=2.4.0:../../net/py-twisted
+TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
+TEST_DEPENDS+= ${PYPKGPREFIX}-test-virtualenv-[0-9]*:../../devel/py-test-virtualenv
+TEST_DEPENDS+= ${PYPKGPREFIX}-virtualenv-[0-9]*:../../devel/py-virtualenv
+
 USE_LANGUAGES= # none
 
-DEPENDS+=       ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
+.include "../../lang/python/pyversion.mk"
+.if "${PYPKGPREFIX}" == "py27"
+DEPENDS+=      ${PYPKGPREFIX}-pathlib2-[0-9]*:../../devel/py-pathlib2
+.endif
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-setuptools_trial/PLIST
diff -u pkgsrc/devel/py-setuptools_trial/PLIST:1.3 pkgsrc/devel/py-setuptools_trial/PLIST:1.4
--- pkgsrc/devel/py-setuptools_trial/PLIST:1.3  Wed Apr 13 18:25:05 2016
+++ pkgsrc/devel/py-setuptools_trial/PLIST      Tue Apr  3 20:19:47 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2016/04/13 18:25:05 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/04/03 20:19:47 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -14,5 +14,3 @@ ${PYSITELIB}/setuptools_trial/_version.p
 ${PYSITELIB}/setuptools_trial/setuptools_trial.py
 ${PYSITELIB}/setuptools_trial/setuptools_trial.pyc
 ${PYSITELIB}/setuptools_trial/setuptools_trial.pyo
-share/doc/python-setuptools_trial/COPYING.SPL.txt
-share/doc/python-setuptools_trial/README.rst

Index: pkgsrc/devel/py-setuptools_trial/distinfo
diff -u pkgsrc/devel/py-setuptools_trial/distinfo:1.5 pkgsrc/devel/py-setuptools_trial/distinfo:1.6
--- pkgsrc/devel/py-setuptools_trial/distinfo:1.5       Wed Apr 13 18:25:05 2016
+++ pkgsrc/devel/py-setuptools_trial/distinfo   Tue Apr  3 20:19:47 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2016/04/13 18:25:05 wiz Exp $
+$NetBSD: distinfo,v 1.6 2018/04/03 20:19:47 adam Exp $
 
 SHA1 (setuptools_trial-0.6.0.tar.gz) = 5ea83c7b55a07c3ab9c7e48779b10b603668c007
 RMD160 (setuptools_trial-0.6.0.tar.gz) = 6653a4f01be35d7739ee49007afb76e7dbd891c6
 SHA512 (setuptools_trial-0.6.0.tar.gz) = 9104b98627f57ed53c90d22042346875c5324d7b30e1ec9ba1718b5c59a786915a8fe0a53789a5dbd9318a12b27122661234f5be403365261db6a8728ce39827
 Size (setuptools_trial-0.6.0.tar.gz) = 6227 bytes
+SHA1 (patch-setup.py) = 5bb008afe4aad6949799ca9d79da775ef47cdd5d

Added files:

Index: pkgsrc/devel/py-setuptools_trial/patches/patch-setup.py
diff -u /dev/null pkgsrc/devel/py-setuptools_trial/patches/patch-setup.py:1.1
--- /dev/null   Tue Apr  3 20:19:47 2018
+++ pkgsrc/devel/py-setuptools_trial/patches/patch-setup.py     Tue Apr  3 20:19:47 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-setup.py,v 1.1 2018/04/03 20:19:47 adam Exp $
+
+Do not install docs and avoid conflict between Python versions.
+
+--- setup.py.orig      2018-04-03 20:08:51.000000000 +0000
++++ setup.py
+@@ -86,7 +86,6 @@ setup(
+     license="BSD",
+     packages=find_packages(exclude=("tests",)),
+     include_package_data=True,
+-    data_files=data_files,
+     classifiers=trove_classifiers,
+     extras_require={
+         ":python_version == '2.7'": ["pathlib2"],