Sat May 16 08:56:50 2020 UTC ()
fix pytest->test


(adam)
diff -r1.39 -r1.40 pkgsrc/lang/python/versioned_dependencies.mk
cvs diff -r1.39 -r1.40 pkgsrc/lang/python/versioned_dependencies.mk (switch to unified diff)

--- pkgsrc/lang/python/versioned_dependencies.mk 2020/05/16 08:03:35 1.39
+++ pkgsrc/lang/python/versioned_dependencies.mk 2020/05/16 08:56:50 1.40
@@ -1,61 +1,61 @@ @@ -1,61 +1,61 @@
1# $NetBSD: versioned_dependencies.mk,v 1.39 2020/05/16 08:03:35 adam Exp $ 1# $NetBSD: versioned_dependencies.mk,v 1.40 2020/05/16 08:56:50 adam 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 X cherrypy dialog html2text ipython jsonlib more-itertools pytest python-digest sphinx zipp 12# Possible values: Pmw X cherrypy dialog html2text ipython jsonlib more-itertools python-digest 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+= X textproc/py-X2 textproc/py-X 21_SUPPORTED_PACKAGES+= X textproc/py-X2 textproc/py-X
22_SUPPORTED_PACKAGES+= cherrypy www/py-cherrypy17 www/py-cherrypy 22_SUPPORTED_PACKAGES+= cherrypy www/py-cherrypy17 www/py-cherrypy
23_SUPPORTED_PACKAGES+= dialog devel/py-dialog2 devel/py-dialog 23_SUPPORTED_PACKAGES+= dialog devel/py-dialog2 devel/py-dialog
24_SUPPORTED_PACKAGES+= html2text textproc/py-html2text-2019.8.11 textproc/py-html2text 24_SUPPORTED_PACKAGES+= html2text textproc/py-html2text-2019.8.11 textproc/py-html2text
25_SUPPORTED_PACKAGES+= ipython devel/py-ipython5 devel/py-ipython 25_SUPPORTED_PACKAGES+= ipython devel/py-ipython5 devel/py-ipython
26_SUPPORTED_PACKAGES+= jsonlib textproc/py-jsonlib textproc/py-jsonlib3 26_SUPPORTED_PACKAGES+= jsonlib textproc/py-jsonlib textproc/py-jsonlib3
27_SUPPORTED_PACKAGES+= more-itertools devel/py-more-itertools2 devel/py-more-itertools 27_SUPPORTED_PACKAGES+= more-itertools devel/py-more-itertools2 devel/py-more-itertools
28_SUPPORTED_PACKAGES+= pytest devel/py-test4 devel/py-test 
29_SUPPORTED_PACKAGES+= python-digest www/py-python-digest www/py-python3-digest 28_SUPPORTED_PACKAGES+= python-digest www/py-python-digest www/py-python3-digest
30_SUPPORTED_PACKAGES+= sphinx textproc/py-sphinx1 textproc/py-sphinx 29_SUPPORTED_PACKAGES+= sphinx textproc/py-sphinx1 textproc/py-sphinx
 30_SUPPORTED_PACKAGES+= test devel/py-test4 devel/py-test
31_SUPPORTED_PACKAGES+= zipp archivers/py-zipp1 archivers/py-zipp 31_SUPPORTED_PACKAGES+= zipp archivers/py-zipp1 archivers/py-zipp
32 32
33.for pattern in ${PYTHON_VERSIONED_DEPENDENCIES} 33.for pattern in ${PYTHON_VERSIONED_DEPENDENCIES}
34_PKG_MATCHED= no 34_PKG_MATCHED= no
35pkg:= ${pattern:C/:.*//} 35pkg:= ${pattern:C/:.*//}
36type:= ${pattern:C/[^:]*//} 36type:= ${pattern:C/[^:]*//}
37. for name py2dir py3dir in ${_SUPPORTED_PACKAGES} 37. for name py2dir py3dir in ${_SUPPORTED_PACKAGES}
38. if "${pkg}" == "${name}" 38. if "${pkg}" == "${name}"
39_PKG_MATCHED= yes 39_PKG_MATCHED= yes
40. if ${_PYTHON_VERSION} == 27 40. if ${_PYTHON_VERSION} == 27
41dir:= ${py2dir} 41dir:= ${py2dir}
42. else 42. else
43dir:= ${py3dir} 43dir:= ${py3dir}
44. endif 44. endif
45. if "${type}" == ":link" 45. if "${type}" == ":link"
46.include "../../${dir}/buildlink3.mk" 46.include "../../${dir}/buildlink3.mk"
47. elif "${type}" == ":build" 47. elif "${type}" == ":build"
48BUILD_DEPENDS:= ${BUILD_DEPENDS} ${PYPKGPREFIX}-${pkg}-[0-9]*:../../${dir} 48BUILD_DEPENDS:= ${BUILD_DEPENDS} ${PYPKGPREFIX}-${pkg}-[0-9]*:../../${dir}
49. elif "${type}" == ":test" 49. elif "${type}" == ":test"
50TEST_DEPENDS:= ${TEST_DEPENDS} ${PYPKGPREFIX}-${pkg}-[0-9]*:../../${dir} 50TEST_DEPENDS:= ${TEST_DEPENDS} ${PYPKGPREFIX}-${pkg}-[0-9]*:../../${dir}
51. elif "${type}" == ":tool" 51. elif "${type}" == ":tool"
52TOOL_DEPENDS:= ${TOOL_DEPENDS} ${PYPKGPREFIX}-${pkg}-[0-9]*:../../${dir} 52TOOL_DEPENDS:= ${TOOL_DEPENDS} ${PYPKGPREFIX}-${pkg}-[0-9]*:../../${dir}
53. else 53. else
54DEPENDS:= ${DEPENDS} ${PYPKGPREFIX}-${pkg}-[0-9]*:../../${dir} 54DEPENDS:= ${DEPENDS} ${PYPKGPREFIX}-${pkg}-[0-9]*:../../${dir}
55. endif 55. endif
56. endif 56. endif
57. endfor 57. endfor
58. if ${_PKG_MATCHED} == "no" 58. if ${_PKG_MATCHED} == "no"
59PKG_FAIL_REASON+= "${pkg} unsupported in PYTHON_VERSIONED_DEPENDENCIES" 59PKG_FAIL_REASON+= "${pkg} unsupported in PYTHON_VERSIONED_DEPENDENCIES"
60. endif 60. endif
61.endfor 61.endfor