Skip to content

Commit c3d5353

Browse files
Quetzacoalt91Quetzacoalt91
committed
Always keep data that has been manually added in versions.py
1 parent 56b5d7a commit c3d5353

File tree

2 files changed

+52
-64
lines changed

2 files changed

+52
-64
lines changed

‎prestashop_docker/backlog.py‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def generate(self):
3737

3838
print('Step 3/3: Building list')
3939
versions_dict = self.parse_prestashop_versions(prestashop_data, available_php_versions)
40-
branches_dict = self.get_branches_and_nightly_from_existing_file()
40+
branches_dict = self.previous_state_versions
4141
self.write_versions_py(versions_dict | branches_dict)
4242

4343
def get_available_php_versions(self):
@@ -49,15 +49,6 @@ def get_available_php_versions(self):
4949
available_versions.add(match.group(1))
5050
return available_versions
5151

52-
# Branches and nightly entries are manually added in versions.py file.
53-
# Let's reuse the existing contents on each generation.
54-
def get_branches_and_nightly_from_existing_file(self):
55-
branches = {}
56-
for branch, php_versions in self.previous_state_versions.items():
57-
if branch == self.NIGHTLY or branch.endswith('x'):
58-
branches[branch] = (tuple(php_versions))
59-
return branches
60-
6152
def parse_prestashop_versions(self, prestashop_json, available_php_versions):
6253
versions = {}
6354
for entry in prestashop_json:

‎versions.py‎

Lines changed: 51 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
VERSIONS = {
2-
# OSS Edition
32
'1.7.7.0': (
43
'7.1',
54
'7.2',
@@ -129,6 +128,12 @@
129128
'7.3',
130129
'7.4',
131130
),
131+
'1.7.8.x': (
132+
'7.1',
133+
'7.2',
134+
'7.3',
135+
'7.4',
136+
),
132137
'8.0.0': (
133138
'7.2',
134139
'7.3',
@@ -157,251 +162,231 @@
157162
'8.0',
158163
'8.1',
159164
),
160-
'8.0.2': (
165+
'8.0.1-classic': (
161166
'7.2',
162167
'7.3',
163168
'7.4',
164169
'8.0',
165170
'8.1',
166171
),
167-
'8.0.3': (
172+
'8.0.2': (
168173
'7.2',
169174
'7.3',
170175
'7.4',
171176
'8.0',
172177
'8.1',
173178
),
174-
'8.0.4': (
179+
'8.0.2-classic': (
175180
'7.2',
176181
'7.3',
177182
'7.4',
178183
'8.0',
179184
'8.1',
180185
),
181-
'8.0.5': (
186+
'8.0.3': (
182187
'7.2',
183188
'7.3',
184189
'7.4',
185190
'8.0',
186191
'8.1',
187192
),
188-
'8.1.0': (
193+
'8.0.4': (
189194
'7.2',
190195
'7.3',
191196
'7.4',
192197
'8.0',
193198
'8.1',
194199
),
195-
'8.1.0-beta.1': (
200+
'8.0.4-classic': (
196201
'7.2',
197202
'7.3',
198203
'7.4',
199204
'8.0',
200205
'8.1',
201206
),
202-
'8.1.0-rc.1': (
207+
'8.0.5': (
203208
'7.2',
204209
'7.3',
205210
'7.4',
206211
'8.0',
207212
'8.1',
208213
),
209-
'8.1.1': (
214+
'8.0.x': (
210215
'7.2',
211216
'7.3',
212217
'7.4',
213218
'8.0',
214219
'8.1',
215220
),
216-
'8.1.2': (
221+
'8.1.0': (
217222
'7.2',
218223
'7.3',
219224
'7.4',
220225
'8.0',
221226
'8.1',
222227
),
223-
'8.1.3': (
228+
'8.1.0-beta.1': (
224229
'7.2',
225230
'7.3',
226231
'7.4',
227232
'8.0',
228233
'8.1',
229234
),
230-
'8.1.4': (
235+
'8.1.0-classic': (
231236
'7.2',
232237
'7.3',
233238
'7.4',
234239
'8.0',
235240
'8.1',
236241
),
237-
'8.1.5': (
242+
'8.1.0-rc.1': (
238243
'7.2',
239244
'7.3',
240245
'7.4',
241246
'8.0',
242247
'8.1',
243248
),
244-
'8.1.6': (
249+
'8.1.1': (
245250
'7.2',
246251
'7.3',
247252
'7.4',
248253
'8.0',
249254
'8.1',
250255
),
251-
'8.1.7': (
256+
'8.1.1-classic': (
252257
'7.2',
253258
'7.3',
254259
'7.4',
255260
'8.0',
256261
'8.1',
257262
),
258-
'8.2.0': (
263+
'8.1.2': (
259264
'7.2',
260265
'7.3',
261266
'7.4',
262267
'8.0',
263268
'8.1',
264269
),
265-
'8.2.1': (
270+
'8.1.2-classic': (
266271
'7.2',
267272
'7.3',
268273
'7.4',
269274
'8.0',
270275
'8.1',
271276
),
272-
# Nightly Build (OSS)
273-
'1.7.8.x': (
274-
'7.1',
275-
'7.2',
276-
'7.3',
277-
'7.4',
278-
),
279-
'8.0.x': (
277+
'8.1.3': (
280278
'7.2',
281279
'7.3',
282280
'7.4',
283281
'8.0',
284282
'8.1',
285283
),
286-
'8.1.x': (
284+
'8.1.3-classic': (
287285
'7.2',
288286
'7.3',
289287
'7.4',
290288
'8.0',
291289
'8.1',
292290
),
293-
'8.2.2': (
291+
'8.1.4': (
294292
'7.2',
295293
'7.3',
296294
'7.4',
297295
'8.0',
298296
'8.1',
299297
),
300-
'8.2.x': (
298+
'8.1.4-classic': (
301299
'7.2',
302300
'7.3',
303301
'7.4',
304302
'8.0',
305303
'8.1',
306304
),
307-
'9.0.x': (
308-
'8.1',
309-
'8.2',
310-
'8.3',
311-
'8.4',
312-
),
313-
'nightly': (
314-
'8.1',
315-
'8.2',
316-
'8.3',
317-
'8.4',
318-
),
319-
# Classic Edition
320-
'8.0.1-classic': (
305+
'8.1.5': (
321306
'7.2',
322307
'7.3',
323308
'7.4',
324309
'8.0',
325310
'8.1',
326311
),
327-
'8.0.2-classic': (
312+
'8.1.5-classic': (
328313
'7.2',
329314
'7.3',
330315
'7.4',
331316
'8.0',
332317
'8.1',
333318
),
334-
'8.0.4-classic': (
319+
'8.1.6': (
335320
'7.2',
336321
'7.3',
337322
'7.4',
338323
'8.0',
339324
'8.1',
340325
),
341-
'8.1.0-classic': (
326+
'8.1.6-classic': (
342327
'7.2',
343328
'7.3',
344329
'7.4',
345330
'8.0',
346331
'8.1',
347332
),
348-
'8.1.1-classic': (
333+
'8.1.7': (
349334
'7.2',
350335
'7.3',
351336
'7.4',
352337
'8.0',
353338
'8.1',
354339
),
355-
'8.1.2-classic': (
340+
'8.1.7-classic': (
356341
'7.2',
357342
'7.3',
358343
'7.4',
359344
'8.0',
360345
'8.1',
361346
),
362-
'8.1.3-classic': (
347+
'8.1.x': (
363348
'7.2',
364349
'7.3',
365350
'7.4',
366351
'8.0',
367352
'8.1',
368353
),
369-
'8.1.4-classic': (
354+
'8.2.0': (
370355
'7.2',
371356
'7.3',
372357
'7.4',
373358
'8.0',
374359
'8.1',
375360
),
376-
'8.1.5-classic': (
361+
'8.2.0-classic': (
377362
'7.2',
378363
'7.3',
379364
'7.4',
380365
'8.0',
381366
'8.1',
382367
),
383-
'8.1.6-classic': (
368+
'8.2.1': (
384369
'7.2',
385370
'7.3',
386371
'7.4',
387372
'8.0',
388373
'8.1',
389374
),
390-
'8.1.7-classic': (
375+
'8.2.1-classic': (
391376
'7.2',
392377
'7.3',
393378
'7.4',
394379
'8.0',
395380
'8.1',
396381
),
397-
'8.2.0-classic': (
382+
'8.2.2': (
398383
'7.2',
399384
'7.3',
400385
'7.4',
401386
'8.0',
402387
'8.1',
403388
),
404-
'8.2.1-classic': (
389+
'8.2.x': (
405390
'7.2',
406391
'7.3',
407392
'7.4',
@@ -426,4 +411,16 @@
426411
'8.3',
427412
'8.4',
428413
),
414+
'9.0.x': (
415+
'8.1',
416+
'8.2',
417+
'8.3',
418+
'8.4',
419+
),
420+
'nightly': (
421+
'8.1',
422+
'8.2',
423+
'8.3',
424+
'8.4',
425+
),
429426
}

0 commit comments

Comments
 (0)