diff options
| author | wiz <wiz@pkgsrc.org> | 2020-08-31 23:05:33 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2020-08-31 23:05:33 +0000 |
| commit | 8463eae86f68a95cac5a7072f628468ae05fc902 (patch) | |
| tree | 302749b3819a120d3d9c0a565f75718d6540f01d /lang/python | |
| parent | 6ea263c1d07e9521f31c16b4ffb94b0a0864d915 (diff) | |
| download | pkgsrc-8463eae86f68a95cac5a7072f628468ae05fc902.tar.gz | |
python: add versioned_dependencies support for py-setuptools
Handle both py-setuptools packages in egg.mk
Diffstat (limited to 'lang/python')
| -rw-r--r-- | lang/python/egg.mk | 8 | ||||
| -rw-r--r-- | lang/python/versioned_dependencies.mk | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lang/python/egg.mk b/lang/python/egg.mk index e9d40a15190..84dfc739265 100644 --- a/lang/python/egg.mk +++ b/lang/python/egg.mk @@ -1,4 +1,4 @@ -# $NetBSD: egg.mk,v 1.28 2019/07/17 18:34:16 rillig Exp $ +# $NetBSD: egg.mk,v 1.29 2020/08/31 23:05:33 wiz Exp $ # # Common logic to handle Python Eggs # @@ -50,7 +50,11 @@ do-build: ensurepip ensurepip: ${SETENV} ${MAKE_ENV} ${PYTHONBIN} -m ensurepip --user .else -DEPENDS+= ${PYPKGPREFIX}-setuptools>=0.8:../../devel/py-setuptools +. if ${PYVERSSUFFIX} == "py27" +DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools44 +. else +DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools +. endif .endif INSTALLATION_DIRS+= ${PYSITELIB} diff --git a/lang/python/versioned_dependencies.mk b/lang/python/versioned_dependencies.mk index faaec02f012..9043d3d95eb 100644 --- a/lang/python/versioned_dependencies.mk +++ b/lang/python/versioned_dependencies.mk @@ -1,4 +1,4 @@ -# $NetBSD: versioned_dependencies.mk,v 1.41 2020/07/01 08:54:30 adam Exp $ +# $NetBSD: versioned_dependencies.mk,v 1.42 2020/08/31 23:05:33 wiz Exp $ # # This file determines which separate distribution of a Python # package is used as dependency, depending on the Python version @@ -27,6 +27,7 @@ _SUPPORTED_PACKAGES+= ipython devel/py-ipython5 devel/py-ipython _SUPPORTED_PACKAGES+= jsonlib textproc/py-jsonlib textproc/py-jsonlib3 _SUPPORTED_PACKAGES+= more-itertools devel/py-more-itertools2 devel/py-more-itertools _SUPPORTED_PACKAGES+= python-digest www/py-python-digest www/py-python3-digest +_SUPPORTED_PACKAGES+= setuptools devel/py-setuptools44 devel/py-setuptools _SUPPORTED_PACKAGES+= sphinx textproc/py-sphinx1 textproc/py-sphinx _SUPPORTED_PACKAGES+= test devel/py-test4 devel/py-test _SUPPORTED_PACKAGES+= zipp archivers/py-zipp1 archivers/py-zipp |