diff options
Diffstat (limited to 'recipes-containers/singularity/singularity/0001-Use-python3.patch')
-rw-r--r-- | recipes-containers/singularity/singularity/0001-Use-python3.patch | 148 |
1 files changed, 148 insertions, 0 deletions
diff --git a/recipes-containers/singularity/singularity/0001-Use-python3.patch b/recipes-containers/singularity/singularity/0001-Use-python3.patch new file mode 100644 index 00000000..dbfe06e4 --- /dev/null +++ b/recipes-containers/singularity/singularity/0001-Use-python3.patch | |||
@@ -0,0 +1,148 @@ | |||
1 | From 758c1edc7bf3d2a023954f4fcc9ddf46fd370272 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Thu, 21 May 2020 14:14:56 +0200 | ||
4 | Subject: [PATCH] Use python3 | ||
5 | |||
6 | * without /usr/bin/python this just fails to configure with: | ||
7 | | checking for python... no | ||
8 | | configure: error: Please install python before installing. | ||
9 | | WARNING: exit code 1 from a shell command. | ||
10 | |||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | --- | ||
13 | configure.ac | 6 +++--- | ||
14 | etc/configure_transform.py | 2 +- | ||
15 | libexec/python/helpers/json/add.py | 2 +- | ||
16 | libexec/python/helpers/json/delete.py | 2 +- | ||
17 | libexec/python/helpers/json/dump.py | 2 +- | ||
18 | libexec/python/helpers/json/get.py | 2 +- | ||
19 | libexec/python/helpers/json/inspect.py | 2 +- | ||
20 | libexec/python/import.py | 2 +- | ||
21 | libexec/python/pull.py | 2 +- | ||
22 | libexec/python/shub/api.py | 2 +- | ||
23 | libexec/python/size.py | 2 +- | ||
24 | 11 files changed, 13 insertions(+), 13 deletions(-) | ||
25 | |||
26 | diff --git a/configure.ac b/configure.ac | ||
27 | index 8ffa5ab32..71a1605b2 100644 | ||
28 | --- a/configure.ac | ||
29 | +++ b/configure.ac | ||
30 | @@ -251,15 +251,15 @@ fi | ||
31 | # PYTHON | ||
32 | # --------------------------------------------------------------------- | ||
33 | |||
34 | -AC_CHECK_PROG(PYTHON_CHECK,python,yes) | ||
35 | +AC_CHECK_PROG(PYTHON_CHECK,python3,yes) | ||
36 | if test x"$PYTHON_CHECK" != x"yes" ; then | ||
37 | - AC_MSG_ERROR([Please install python before installing.]) | ||
38 | + AC_MSG_ERROR([Please install python3 before installing.]) | ||
39 | else | ||
40 | |||
41 | PYTHON_MODULES="base64 datetime glob hashlib io itertools json math multiprocessing pickle pwd re shutil signal subprocess stat sys tarfile tempfile time" | ||
42 | for PYTHON_MODULE in $PYTHON_MODULES; do | ||
43 | AC_MSG_CHECKING([for the $PYTHON_MODULE python module]) | ||
44 | - python_module_result=`python -c "import $PYTHON_MODULE" 2>&1` | ||
45 | + python_module_result=`python3 -c "import $PYTHON_MODULE" 2>&1` | ||
46 | if test -z "$python_module_result"; then | ||
47 | AC_MSG_RESULT([yes]) | ||
48 | else | ||
49 | diff --git a/etc/configure_transform.py b/etc/configure_transform.py | ||
50 | index a1ff5c427..9ec445d21 100755 | ||
51 | --- a/etc/configure_transform.py | ||
52 | +++ b/etc/configure_transform.py | ||
53 | @@ -1,4 +1,4 @@ | ||
54 | -#!/usr/bin/env python | ||
55 | +#!/usr/bin/env python3 | ||
56 | # | ||
57 | # Copyright (c) 2017, SingularityWare, LLC. All rights reserved. | ||
58 | # | ||
59 | diff --git a/libexec/python/helpers/json/add.py b/libexec/python/helpers/json/add.py | ||
60 | index b24aec75a..22abbbeb9 100644 | ||
61 | --- a/libexec/python/helpers/json/add.py | ||
62 | +++ b/libexec/python/helpers/json/add.py | ||
63 | @@ -1,4 +1,4 @@ | ||
64 | -#!/usr/bin/env python | ||
65 | +#!/usr/bin/env python3 | ||
66 | |||
67 | ''' | ||
68 | |||
69 | diff --git a/libexec/python/helpers/json/delete.py b/libexec/python/helpers/json/delete.py | ||
70 | index 0975e4e60..07e255228 100644 | ||
71 | --- a/libexec/python/helpers/json/delete.py | ||
72 | +++ b/libexec/python/helpers/json/delete.py | ||
73 | @@ -1,4 +1,4 @@ | ||
74 | -#!/usr/bin/env python | ||
75 | +#!/usr/bin/env python3 | ||
76 | |||
77 | ''' | ||
78 | |||
79 | diff --git a/libexec/python/helpers/json/dump.py b/libexec/python/helpers/json/dump.py | ||
80 | index ddba06e4a..37a8edf70 100644 | ||
81 | --- a/libexec/python/helpers/json/dump.py | ||
82 | +++ b/libexec/python/helpers/json/dump.py | ||
83 | @@ -1,4 +1,4 @@ | ||
84 | -#!/usr/bin/env python | ||
85 | +#!/usr/bin/env python3 | ||
86 | |||
87 | ''' | ||
88 | |||
89 | diff --git a/libexec/python/helpers/json/get.py b/libexec/python/helpers/json/get.py | ||
90 | index 355be9040..d1d822aea 100644 | ||
91 | --- a/libexec/python/helpers/json/get.py | ||
92 | +++ b/libexec/python/helpers/json/get.py | ||
93 | @@ -1,4 +1,4 @@ | ||
94 | -#!/usr/bin/env python | ||
95 | +#!/usr/bin/env python3 | ||
96 | |||
97 | ''' | ||
98 | |||
99 | diff --git a/libexec/python/helpers/json/inspect.py b/libexec/python/helpers/json/inspect.py | ||
100 | index 65772a4ef..61c723495 100644 | ||
101 | --- a/libexec/python/helpers/json/inspect.py | ||
102 | +++ b/libexec/python/helpers/json/inspect.py | ||
103 | @@ -1,4 +1,4 @@ | ||
104 | -#!/usr/bin/env python | ||
105 | +#!/usr/bin/env python3 | ||
106 | |||
107 | ''' | ||
108 | |||
109 | diff --git a/libexec/python/import.py b/libexec/python/import.py | ||
110 | index 2ec208417..1c58eda5c 100644 | ||
111 | --- a/libexec/python/import.py | ||
112 | +++ b/libexec/python/import.py | ||
113 | @@ -1,4 +1,4 @@ | ||
114 | -#!/usr/bin/env python | ||
115 | +#!/usr/bin/env python3 | ||
116 | |||
117 | ''' | ||
118 | |||
119 | diff --git a/libexec/python/pull.py b/libexec/python/pull.py | ||
120 | index 1cd705c90..4431023f3 100644 | ||
121 | --- a/libexec/python/pull.py | ||
122 | +++ b/libexec/python/pull.py | ||
123 | @@ -1,4 +1,4 @@ | ||
124 | -#!/usr/bin/env python | ||
125 | +#!/usr/bin/env python3 | ||
126 | |||
127 | ''' | ||
128 | |||
129 | diff --git a/libexec/python/shub/api.py b/libexec/python/shub/api.py | ||
130 | index 850d167e7..3c8313ad5 100644 | ||
131 | --- a/libexec/python/shub/api.py | ||
132 | +++ b/libexec/python/shub/api.py | ||
133 | @@ -1,4 +1,4 @@ | ||
134 | -#!/usr/bin/env python | ||
135 | +#!/usr/bin/env python3 | ||
136 | |||
137 | ''' | ||
138 | |||
139 | diff --git a/libexec/python/size.py b/libexec/python/size.py | ||
140 | index 34331fd27..99581ce52 100644 | ||
141 | --- a/libexec/python/size.py | ||
142 | +++ b/libexec/python/size.py | ||
143 | @@ -1,4 +1,4 @@ | ||
144 | -#!/usr/bin/env python | ||
145 | +#!/usr/bin/env python3 | ||
146 | |||
147 | ''' | ||
148 | |||