Skip to content

Commit 29bedfa

Browse files
Clean tools key of obsolete version on next release (#6258)
Fixes #6068 Drop from the tools key all version:"1.20.0-26-gb404fb9" entries (which were pre-2.0.0 and whose entry in platform versions was deleted on last release).
1 parent 3cc64f7 commit 29bedfa

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

package/build_boards_manager_package.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ new_json=package_esp8266com_index.json
156156

157157
set +e
158158
# Merge the old and new, then drop any obsolete package versions
159-
python ../../merge_packages.py $new_json $old_json | python ../../drop_versions.py - platforms 1.6.5-947-g39819f0 2.5.0-beta1 2.5.0-beta2 2.5.0-beta3 2.4.0-rc1 2.4.0-rc2 >tmp && mv tmp $new_json && rm $old_json
159+
python ../../merge_packages.py $new_json $old_json | python ../../drop_versions.py - tools 1.20.0-26-gb404fb9 >tmp && mv tmp $new_json && rm $old_json
160160

161161
# Verify the JSON file can be read, fail if it's not OK
162162
set -e

package/drop_versions.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
from __future__ import print_function
55
import json
66
import sys
7+
from collections import OrderedDict
78

89
def load_package(filename):
910
if filename == "-":
10-
pkg = json.load(sys.stdin)['packages'][0]
11+
pkg = json.load(sys.stdin, object_pairs_hook=OrderedDict)['packages'][0]
1112
else:
12-
pkg = json.load(open(filename))['packages'][0]
13+
pkg = json.load(open(filename), object_pairs_hook=OrderedDict)['packages'][0]
1314
print("Loaded package {0} from {1}".format(pkg['name'], filename), file=sys.stderr)
1415
print("{0} platform(s), {1} tools".format(len(pkg['platforms']), len(pkg['tools'])), file=sys.stderr)
1516
return pkg

0 commit comments

Comments
 (0)