Mon Nov 1 18:47:17 2021 UTC ()
python: add versioned dependencies support for pyparsing


(wiz)
diff -r1.51 -r1.52 pkgsrc/lang/python/versioned_dependencies.mk
cvs diff -r1.51 -r1.52 pkgsrc/lang/python/versioned_dependencies.mk (expand / switch to unified diff)

--- pkgsrc/lang/python/versioned_dependencies.mk 2021/07/30 17:40:03 1.51
+++ pkgsrc/lang/python/versioned_dependencies.mk 2021/11/01 18:47:17 1.52
@@ -1,47 +1,48 @@ @@ -1,47 +1,48 @@
1# $NetBSD: versioned_dependencies.mk,v 1.51 2021/07/30 17:40:03 adam Exp $ 1# $NetBSD: versioned_dependencies.mk,v 1.52 2021/11/01 18:47:17 wiz Exp $
2# 2#
3# This file determines which separate distribution of a Python 3# This file determines which separate distribution of a Python
4# package is used as dependency, depending on the Python version 4# package is used as dependency, depending on the Python version
5# used. 5# used.
6# 6#
7# === User-settable variables === 7# === User-settable variables ===
8# 8#
9# PYTHON_VERSIONED_DEPENDENCIES 9# PYTHON_VERSIONED_DEPENDENCIES
10# The Python package which should be added as a dependency. 10# The Python package which should be added as a dependency.
11# 11#
12# Possible values: Pmw Pillow X cairo dialog eliot html2text hypothesis ipython jsonlib more-itertools pygments python-digest rsa setuptools sphinx test zipp 12# Possible values: Pmw Pillow X cairo dialog eliot html2text hypothesis ipython jsonlib more-itertools pygments pyparsing python-digest rsa setuptools sphinx test zipp
13# Default: (nothing) 13# Default: (nothing)
14# 14#
15 15
16.include "../../lang/python/pyversion.mk" 16.include "../../lang/python/pyversion.mk"
17 17
18# format: short name for PYTHON_VERSIONED_DEPENDENCIES<space>Python-2.x path<space>Python-3.x path 18# format: short name for PYTHON_VERSIONED_DEPENDENCIES<space>Python-2.x path<space>Python-3.x path
19_SUPPORTED_PACKAGES= # empty 19_SUPPORTED_PACKAGES= # empty
20_SUPPORTED_PACKAGES+= Pmw x11/py-Pmw x11/py-Pmw2 20_SUPPORTED_PACKAGES+= Pmw x11/py-Pmw x11/py-Pmw2
21_SUPPORTED_PACKAGES+= Pillow graphics/py-Pillow6 graphics/py-Pillow 21_SUPPORTED_PACKAGES+= Pillow graphics/py-Pillow6 graphics/py-Pillow
22_SUPPORTED_PACKAGES+= X textproc/py-X2 textproc/py-X 22_SUPPORTED_PACKAGES+= X textproc/py-X2 textproc/py-X
23_SUPPORTED_PACKAGES+= cairo graphics/py-cairo118 graphics/py-cairo 23_SUPPORTED_PACKAGES+= cairo graphics/py-cairo118 graphics/py-cairo
24_SUPPORTED_PACKAGES+= dialog devel/py-dialog2 devel/py-dialog 24_SUPPORTED_PACKAGES+= dialog devel/py-dialog2 devel/py-dialog
25_SUPPORTED_PACKAGES+= eliot sysutils/py-eliot17 sysutils/py-eliot 25_SUPPORTED_PACKAGES+= eliot sysutils/py-eliot17 sysutils/py-eliot
26# XXX feedparser 6.x is not only py27-incompatible, but also 5.x-API-incompatible 26# XXX feedparser 6.x is not only py27-incompatible, but also 5.x-API-incompatible
27#_SUPPORTED_PACKAGES+= feedparser textproc/py-feedparser5 textproc/py-feedparser 27#_SUPPORTED_PACKAGES+= feedparser textproc/py-feedparser5 textproc/py-feedparser
28_SUPPORTED_PACKAGES+= html2text textproc/py-html2text-2019.8.11 textproc/py-html2text 28_SUPPORTED_PACKAGES+= html2text textproc/py-html2text-2019.8.11 textproc/py-html2text
29_SUPPORTED_PACKAGES+= hypothesis devel/py-hypothesis4 devel/py-hypothesis 29_SUPPORTED_PACKAGES+= hypothesis devel/py-hypothesis4 devel/py-hypothesis
30_SUPPORTED_PACKAGES+= ipython devel/py-ipython5 devel/py-ipython 30_SUPPORTED_PACKAGES+= ipython devel/py-ipython5 devel/py-ipython
31_SUPPORTED_PACKAGES+= isort devel/py-isort4 devel/py-isort 31_SUPPORTED_PACKAGES+= isort devel/py-isort4 devel/py-isort
32_SUPPORTED_PACKAGES+= jsonlib textproc/py-jsonlib textproc/py-jsonlib3 32_SUPPORTED_PACKAGES+= jsonlib textproc/py-jsonlib textproc/py-jsonlib3
33_SUPPORTED_PACKAGES+= more-itertools devel/py-more-itertools2 devel/py-more-itertools 33_SUPPORTED_PACKAGES+= more-itertools devel/py-more-itertools2 devel/py-more-itertools
34_SUPPORTED_PACKAGES+= pygments textproc/py-pygments25 textproc/py-pygments 34_SUPPORTED_PACKAGES+= pygments textproc/py-pygments25 textproc/py-pygments
 35_SUPPORTED_PACKAGES+= pyparsing devel/py-pyparsing2 devel/py-pyparsing
35_SUPPORTED_PACKAGES+= python-digest www/py-python-digest www/py-python3-digest 36_SUPPORTED_PACKAGES+= python-digest www/py-python-digest www/py-python3-digest
36_SUPPORTED_PACKAGES+= rsa security/py-rsa40 security/py-rsa 37_SUPPORTED_PACKAGES+= rsa security/py-rsa40 security/py-rsa
37_SUPPORTED_PACKAGES+= setuptools devel/py-setuptools44 devel/py-setuptools 38_SUPPORTED_PACKAGES+= setuptools devel/py-setuptools44 devel/py-setuptools
38_SUPPORTED_PACKAGES+= sphinx textproc/py-sphinx1 textproc/py-sphinx 39_SUPPORTED_PACKAGES+= sphinx textproc/py-sphinx1 textproc/py-sphinx
39_SUPPORTED_PACKAGES+= test devel/py-test4 devel/py-test 40_SUPPORTED_PACKAGES+= test devel/py-test4 devel/py-test
40_SUPPORTED_PACKAGES+= zipp archivers/py-zipp1 archivers/py-zipp 41_SUPPORTED_PACKAGES+= zipp archivers/py-zipp1 archivers/py-zipp
41 42
42.for pattern in ${PYTHON_VERSIONED_DEPENDENCIES} 43.for pattern in ${PYTHON_VERSIONED_DEPENDENCIES}
43_PKG_MATCHED= no 44_PKG_MATCHED= no
44pkg:= ${pattern:C/:.*//} 45pkg:= ${pattern:C/:.*//}
45type:= ${pattern:C/[^:]*//} 46type:= ${pattern:C/[^:]*//}
46. for name py2dir py3dir in ${_SUPPORTED_PACKAGES} 47. for name py2dir py3dir in ${_SUPPORTED_PACKAGES}
47. if "${pkg}" == "${name}" 48. if "${pkg}" == "${name}"