forked from adafruit/circuitpython
-
Notifications
You must be signed in to change notification settings - Fork 1
Expand file tree
/
Copy pathmerge_micropython.py
More file actions
250 lines (231 loc) · 5.32 KB
/
Copy pathmerge_micropython.py
File metadata and controls
250 lines (231 loc) · 5.32 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
"""
This is a helper script for merging in new versions of MicroPython. You *must*
evaluate its correctness and adapt it for each MP version. This is committed
in the repo more for reference than "fire and forget" use.
I have found I have to run each piece separately, because there are some errors.
For instance, there are file renames in the porcelain output that are not handled.
I add a sys.exit(0) after a section, and once a section runs, I delete it temporarily
and move on to the next section. -- dhalbert
Updated for v1.25.0 merge - dhalbert
"""
from io import StringIO
import sh
from sh import git
import sys
def rm_paths(base, paths):
for path in paths:
try:
git.rm("-rf", base + "/" + path)
except sh.ErrorReturnCode_128:
pass
def checkout_ours(always_ours):
for ours in always_ours:
out_buf = StringIO()
git.status("--porcelain=1", ours, _out=out_buf)
out_buf.seek(0)
line = out_buf.readline()
while line:
state, path = line.split()
if state == "UU":
print("ours", path)
git.checkout("--ours", path)
git.add(path)
else:
print(state, path)
line = out_buf.readline()
rm_paths(
"ports",
[
"alif",
"bare-arm",
"cc3200",
"embed",
"esp32",
"esp8266",
"mimxrt",
"minimal",
"nrf",
"pic16bit",
"powerpc",
"qemu",
"renesas-ra",
"rp2",
"samd",
"stm32",
"webassembly",
"windows",
"zephyr",
],
)
# Delete MicroPython-specific docs.
rm_paths(
"docs",
[
"conf.py",
"develop",
"differences",
"esp32",
"esp8266",
"library/bluetooth.rst",
"library/btree.rst",
"library/cryptolib.rst",
"library/esp*.rst",
"library/framebuf.rst",
"library/hashlib.rst",
"library/lcd160cr.rst",
"library/machine*.rst",
"library/math.rst",
"library/network*.rst",
"library/os.rst",
"library/pyb*.rst",
"library/random.rst",
"library/rp2*.rst",
"library/uos.rst",
"library/socket.rst",
"library/ssl.rst",
"library/stm.rst",
"library/struct.rst",
"library/_thread.rst",
"library/time.rst",
"library/uasyncio.rst",
"library/uctypes.rst",
"library/vfs.rst",
"library/wipy.rst",
"library/wm8960.rst",
"library/zephyr*.rst",
"library/zlib.rst",
"make.bat",
"mimxrt",
"pyboard",
"renesas-ra",
"rp2",
"samd",
"templates/topindex.html",
"wipy",
"zephyr",
],
)
# Delete MicroPython-specific tests.
rm_paths(
"tests",
[
"esp32",
"multi_bluetooth",
"multi_espnow",
"multi_net",
"multi_pyb_can",
"multi_wlan",
"net_hosted",
"net_inet",
"ports",
"pyb",
"wipy",
],
)
# libs we don't use
rm_paths(
"lib",
[
"alif*",
"asf4",
"btstack",
"libhydrogen",
"lwip",
"mynewt-nimble",
"nrfx",
"nxp_driver",
"pico-sdk",
"protobuf-c",
"stm32lib",
"wiznet5k",
],
)
# extmod modules we don't use
rm_paths(
"extmod",
[
"btstack",
"extmod.cmake",
"machine_*",
"mbedtls",
"modbluetooth.*",
"modbtree.*",
"modframebuf.*",
"modlwip.*",
"modmachine.*",
"modnetwork.*",
"modonewire.*",
"moducryptolib.*",
"modsocket.*",
"modssl_*",
"modtls_*",
"modtimeq.*",
"modwebsocket.*",
"modwebrepl.*",
"mpbthci.*",
"network_*",
"nimble",
"virtpin.*",
],
)
# shared things we don't use
rm_paths(
"shared",
[
"netutils",
"tinyusb",
"runtime/softtimer.*",
],
)
# top-level files and dirs we don't use
rm_paths(
"",
[
"drivers",
"LICENSE_MicroPython",
"README.md",
"CODEOFCONDUCT.md",
"CODECONVENTIONS.md",
],
)
# .github and CI we don't use
rm_paths(
".github",
[
"dependabot.yml",
"FUNDING.yml",
"ISSUE_TEMPLATE/feature_request.yml",
"ISSUE_TEMPLATE/documentation.yml",
"ISSUE_TEMPLATE/security.yml",
"workflows/biome.yml",
"workflows/code_formatting.yml",
"workflows/code_size_comment.yml",
"workflows/code_size.yml",
"workflows/codespell.yml",
"workflows/commit_formatting.yml",
"workflows/docs.yml",
"workflows/examples.ymlworkflows/mpremote.yml",
"workflows/mpy_format.yml",
"workflows/ports_*.yml",
"workflows/ruff.yml",
],
)
# Always ours:
checkout_ours(
[
".github",
"devices",
"lib/mbedtls_config",
"supervisor",
"shared-bindings",
"shared-module",
"ports/atmel-samd",
"ports/cxd56",
"ports/espressif",
"ports/mimxrt10xx",
"ports/raspberrypi",
"ports/silabs",
# We inherit stm32 changes into stm because we did a git rename.
"ports/stm",
]
)