Sun Feb 13 08:43:43 2022 UTC ()
versioned_dependencies.mk: support py-twisted


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

--- pkgsrc/lang/python/versioned_dependencies.mk 2022/01/31 11:54:44 1.64
+++ pkgsrc/lang/python/versioned_dependencies.mk 2022/02/13 08:43:43 1.65
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: versioned_dependencies.mk,v 1.64 2022/01/31 11:54:44 wiz Exp $ 1# $NetBSD: versioned_dependencies.mk,v 1.65 2022/02/13 08:43:43 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 click flake8 html2text hypothesis importlib-metadata ipython markdown mccabe more-itertools pip packaging pygments pyparsing python-digest rsa setuptools setuptools_scm sphinx test testtools zipp 12# Possible values: Pmw Pillow X cairo click flake8 html2text hypothesis importlib-metadata ipython markdown mccabe more-itertools pip packaging pygments pyparsing python-digest rsa setuptools setuptools_scm sphinx test testtools twisted 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+= click devel/py-click7 devel/py-click 24_SUPPORTED_PACKAGES+= click devel/py-click7 devel/py-click
25# XXX feedparser 6.x is not only py27-incompatible, but also 5.x-API-incompatible 25# XXX feedparser 6.x is not only py27-incompatible, but also 5.x-API-incompatible
@@ -34,26 +34,27 @@ _SUPPORTED_PACKAGES+= markdown textproc/ @@ -34,26 +34,27 @@ _SUPPORTED_PACKAGES+= markdown textproc/
34_SUPPORTED_PACKAGES+= mccabe devel/py-mccabe06 devel/py-mccabe 34_SUPPORTED_PACKAGES+= mccabe devel/py-mccabe06 devel/py-mccabe
35_SUPPORTED_PACKAGES+= more-itertools devel/py-more-itertools2 devel/py-more-itertools 35_SUPPORTED_PACKAGES+= more-itertools devel/py-more-itertools2 devel/py-more-itertools
36_SUPPORTED_PACKAGES+= packaging devel/py-packaging2 devel/py-packaging 36_SUPPORTED_PACKAGES+= packaging devel/py-packaging2 devel/py-packaging
37_SUPPORTED_PACKAGES+= pip devel/py-pip20 devel/py-pip 37_SUPPORTED_PACKAGES+= pip devel/py-pip20 devel/py-pip
38_SUPPORTED_PACKAGES+= pygments textproc/py-pygments25 textproc/py-pygments 38_SUPPORTED_PACKAGES+= pygments textproc/py-pygments25 textproc/py-pygments
39_SUPPORTED_PACKAGES+= pyparsing devel/py-pyparsing2 devel/py-pyparsing 39_SUPPORTED_PACKAGES+= pyparsing devel/py-pyparsing2 devel/py-pyparsing
40_SUPPORTED_PACKAGES+= python-digest www/py-python-digest www/py-python3-digest 40_SUPPORTED_PACKAGES+= python-digest www/py-python-digest www/py-python3-digest
41_SUPPORTED_PACKAGES+= rsa security/py-rsa40 security/py-rsa 41_SUPPORTED_PACKAGES+= rsa security/py-rsa40 security/py-rsa
42_SUPPORTED_PACKAGES+= setuptools devel/py-setuptools44 devel/py-setuptools 42_SUPPORTED_PACKAGES+= setuptools devel/py-setuptools44 devel/py-setuptools
43_SUPPORTED_PACKAGES+= setuptools_scm devel/py-setuptools_scm5 devel/py-setuptools_scm 43_SUPPORTED_PACKAGES+= setuptools_scm devel/py-setuptools_scm5 devel/py-setuptools_scm
44_SUPPORTED_PACKAGES+= sphinx textproc/py-sphinx1 textproc/py-sphinx 44_SUPPORTED_PACKAGES+= sphinx textproc/py-sphinx1 textproc/py-sphinx
45_SUPPORTED_PACKAGES+= test devel/py-test4 devel/py-test 45_SUPPORTED_PACKAGES+= test devel/py-test4 devel/py-test
46_SUPPORTED_PACKAGES+= testtools devel/py-testtools24 devel/py-testtools 46_SUPPORTED_PACKAGES+= testtools devel/py-testtools24 devel/py-testtools
 47_SUPPORTED_PACKAGES+= twisted net/py-twisted19 net/py-twisted
47_SUPPORTED_PACKAGES+= zipp archivers/py-zipp1 archivers/py-zipp 48_SUPPORTED_PACKAGES+= zipp archivers/py-zipp1 archivers/py-zipp
48 49
49.for pattern in ${PYTHON_VERSIONED_DEPENDENCIES} 50.for pattern in ${PYTHON_VERSIONED_DEPENDENCIES}
50_PKG_MATCHED= no 51_PKG_MATCHED= no
51pkg:= ${pattern:C/:.*//} 52pkg:= ${pattern:C/:.*//}
52type:= ${pattern:C/[^:]*//} 53type:= ${pattern:C/[^:]*//}
53. for name py2dir py3dir in ${_SUPPORTED_PACKAGES} 54. for name py2dir py3dir in ${_SUPPORTED_PACKAGES}
54. if "${pkg}" == "${name}" 55. if "${pkg}" == "${name}"
55_PKG_MATCHED= yes 56_PKG_MATCHED= yes
56. if ${_PYTHON_VERSION} == 27 57. if ${_PYTHON_VERSION} == 27
57dir:= ${py2dir} 58dir:= ${py2dir}
58. else 59. else
59dir:= ${py3dir} 60dir:= ${py3dir}