Tue Jul 12 09:21:18 2022 UTC ()
python: remove zipp support from versioned_dependencies


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

--- pkgsrc/lang/python/versioned_dependencies.mk 2022/07/10 19:17:44 1.77
+++ pkgsrc/lang/python/versioned_dependencies.mk 2022/07/12 09:21:18 1.78
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: versioned_dependencies.mk,v 1.77 2022/07/10 19:17:44 wiz Exp $ 1# $NetBSD: versioned_dependencies.mk,v 1.78 2022/07/12 09:21:18 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: Pillow X cairo chardet click cryptography docstyle flake8 html2text hypothesis importlib-metadata jinja2 lama markdown mccabe more-itertools pip packaging pygments pyparsing pyphen python-digest rsa setuptools setuptools_scm test twisted zipp 12# Possible values: Pillow X cairo chardet click cryptography docstyle flake8 html2text hypothesis importlib-metadata jinja2 lama markdown mccabe more-itertools pip packaging pygments pyparsing pyphen python-digest rsa setuptools setuptools_scm test twisted
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+= Pillow graphics/py-Pillow6 graphics/py-Pillow 20_SUPPORTED_PACKAGES+= Pillow graphics/py-Pillow6 graphics/py-Pillow
21_SUPPORTED_PACKAGES+= X textproc/py-X2 textproc/py-X 21_SUPPORTED_PACKAGES+= X textproc/py-X2 textproc/py-X
22_SUPPORTED_PACKAGES+= cairo graphics/py-cairo118 graphics/py-cairo 22_SUPPORTED_PACKAGES+= cairo graphics/py-cairo118 graphics/py-cairo
23_SUPPORTED_PACKAGES+= chardet converters/py-chardet4 converters/py-chardet 23_SUPPORTED_PACKAGES+= chardet converters/py-chardet4 converters/py-chardet
24_SUPPORTED_PACKAGES+= click devel/py-click7 devel/py-click 24_SUPPORTED_PACKAGES+= click devel/py-click7 devel/py-click
25_SUPPORTED_PACKAGES+= cryptography security/py27-cryptography security/py-cryptography  25_SUPPORTED_PACKAGES+= cryptography security/py27-cryptography security/py-cryptography
@@ -35,27 +35,26 @@ _SUPPORTED_PACKAGES+= markdown textproc/ @@ -35,27 +35,26 @@ _SUPPORTED_PACKAGES+= markdown textproc/
35_SUPPORTED_PACKAGES+= mccabe devel/py-mccabe06 devel/py-mccabe 35_SUPPORTED_PACKAGES+= mccabe devel/py-mccabe06 devel/py-mccabe
36_SUPPORTED_PACKAGES+= more-itertools devel/py-more-itertools2 devel/py-more-itertools 36_SUPPORTED_PACKAGES+= more-itertools devel/py-more-itertools2 devel/py-more-itertools
37_SUPPORTED_PACKAGES+= packaging devel/py-packaging2 devel/py-packaging 37_SUPPORTED_PACKAGES+= packaging devel/py-packaging2 devel/py-packaging
38_SUPPORTED_PACKAGES+= pip devel/py-pip20 devel/py-pip 38_SUPPORTED_PACKAGES+= pip devel/py-pip20 devel/py-pip
39_SUPPORTED_PACKAGES+= pygments textproc/py-pygments25 textproc/py-pygments 39_SUPPORTED_PACKAGES+= pygments textproc/py-pygments25 textproc/py-pygments
40_SUPPORTED_PACKAGES+= pyparsing devel/py-pyparsing2 devel/py-pyparsing 40_SUPPORTED_PACKAGES+= pyparsing devel/py-pyparsing2 devel/py-pyparsing
41_SUPPORTED_PACKAGES+= pyphen textproc/py27-pyphen textproc/py-pyphen 41_SUPPORTED_PACKAGES+= pyphen textproc/py27-pyphen textproc/py-pyphen
42_SUPPORTED_PACKAGES+= python-digest www/py-python-digest www/py-python3-digest 42_SUPPORTED_PACKAGES+= python-digest www/py-python-digest www/py-python3-digest
43_SUPPORTED_PACKAGES+= rsa security/py-rsa40 security/py-rsa 43_SUPPORTED_PACKAGES+= rsa security/py-rsa40 security/py-rsa
44_SUPPORTED_PACKAGES+= setuptools devel/py-setuptools44 devel/py-setuptools 44_SUPPORTED_PACKAGES+= setuptools devel/py-setuptools44 devel/py-setuptools
45_SUPPORTED_PACKAGES+= setuptools_scm devel/py-setuptools_scm5 devel/py-setuptools_scm 45_SUPPORTED_PACKAGES+= setuptools_scm devel/py-setuptools_scm5 devel/py-setuptools_scm
46_SUPPORTED_PACKAGES+= test devel/py-test4 devel/py-test 46_SUPPORTED_PACKAGES+= test devel/py-test4 devel/py-test
47_SUPPORTED_PACKAGES+= twisted net/py-twisted19 net/py-twisted 47_SUPPORTED_PACKAGES+= twisted net/py-twisted19 net/py-twisted
48_SUPPORTED_PACKAGES+= zipp archivers/py-zipp1 archivers/py-zipp 
49 48
50.for pattern in ${PYTHON_VERSIONED_DEPENDENCIES} 49.for pattern in ${PYTHON_VERSIONED_DEPENDENCIES}
51_PKG_MATCHED= no 50_PKG_MATCHED= no
52pkg:= ${pattern:C/:.*//} 51pkg:= ${pattern:C/:.*//}
53type:= ${pattern:C/[^:]*//} 52type:= ${pattern:C/[^:]*//}
54. for name py2dir py3dir in ${_SUPPORTED_PACKAGES} 53. for name py2dir py3dir in ${_SUPPORTED_PACKAGES}
55. if "${pkg}" == "${name}" 54. if "${pkg}" == "${name}"
56_PKG_MATCHED= yes 55_PKG_MATCHED= yes
57. if ${_PYTHON_VERSION} == 27 56. if ${_PYTHON_VERSION} == 27
58dir:= ${py2dir} 57dir:= ${py2dir}
59. else 58. else
60dir:= ${py3dir} 59dir:= ${py3dir}
61. endif 60. endif