@@ -34,8 +34,12 @@ def is_success_build(pkg_name: str, output: str, error: str = None):
34
34
for line in output .splitlines ():
35
35
if any ([
36
36
error is not None and 'error' not in error ,
37
- 'successfully installed' in line and pkg_name in line ,
38
- 'requirement already satisfied' in line and pkg_name in line ,
37
+ 'successfully installed' in line and f' { pkg_name } ' in line ,
38
+ all ([
39
+ 'requirement already satisfied' in line ,
40
+ f' { pkg_name } ' in line ,
41
+ 'from {pkg_name}' not in line ,
42
+ ]),
39
43
]):
40
44
return True
41
45
return False
@@ -142,10 +146,13 @@ def gen_packages(
142
146
return packages
143
147
144
148
145
- def gen_until_index (packages : list , until : str = None ):
149
+ def gen_until_index (packages : list , until : str = None , since_index : int = 0 ):
150
+ """
151
+ from all index to index of generated packages
152
+ """
146
153
if until :
147
154
if until .isdigit ():
148
- until_index = int (until )
155
+ until_index = int (until ) - since_index
149
156
else :
150
157
until_index = packages .index (until )
151
158
else :
@@ -166,7 +173,7 @@ def build(
166
173
167
174
print (f'Building wheels for pypy { ver } ...' )
168
175
packages = gen_packages (plat , since , only , retry , ver )
169
- until_index = gen_until_index ( packages , until )
176
+ all_packages = gen_packages ( plat )
170
177
success = []
171
178
failed = []
172
179
@@ -198,16 +205,18 @@ def build(
198
205
if EXTRA_CDN not in pip_conf :
199
206
extra_index_flag = f'--extra-index-url { EXTRA_INDEX_URL } '
200
207
208
+ # since_index is index of all packages
201
209
if since :
202
210
if since .isdigit ():
203
211
since_index = int (since )
204
212
else :
205
- with open (f'{ pkg_dir } /packages.txt' , 'r' ) as f :
206
- all_packages = f .read ().splitlines ()
207
213
since_index = all_packages .index (since )
208
214
else :
209
215
since_index = 0
210
216
217
+ # until_index is index of generated packages
218
+ until_index = gen_until_index (packages , until , since_index )
219
+
211
220
env = os .environ
212
221
pbar = tqdm (packages , initial = since_index , total = len (packages ) + since_index )
213
222
count = 0
0 commit comments