mpflash 0.9.0__py3-none-any.whl → 0.9.1__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (42) hide show
  1. mpflash/add_firmware.py +1 -1
  2. mpflash/ask_input.py +1 -1
  3. mpflash/bootloader/__init__.py +2 -37
  4. mpflash/bootloader/activate.py +60 -0
  5. mpflash/bootloader/detect.py +82 -0
  6. mpflash/bootloader/manual.py +10 -11
  7. mpflash/bootloader/micropython.py +2 -0
  8. mpflash/bootloader/touch1200.py +13 -22
  9. mpflash/cli_download.py +1 -1
  10. mpflash/cli_flash.py +3 -3
  11. mpflash/cli_group.py +18 -5
  12. mpflash/cli_main.py +3 -5
  13. mpflash/common.py +1 -0
  14. mpflash/config.py +2 -1
  15. mpflash/connected.py +9 -5
  16. mpflash/download.py +9 -5
  17. mpflash/downloaded.py +1 -1
  18. mpflash/{flash.py → flash/__init__.py} +3 -3
  19. mpflash/{flash_esp.py → flash/esp.py} +1 -1
  20. mpflash/{flash_stm32.py → flash/stm32.py} +4 -3
  21. mpflash/{flash_stm32_dfu.py → flash/stm32_dfu.py} +1 -1
  22. mpflash/{flash_uf2.py → flash/uf2/__init__.py} +19 -20
  23. mpflash/{flash_uf2_linux.py → flash/uf2/linux.py} +12 -11
  24. mpflash/{flash_uf2_macos.py → flash/uf2/macos.py} +11 -6
  25. mpflash/{flash_uf2_windows.py → flash/uf2/windows.py} +11 -6
  26. mpflash/{worklist.py → flash/worklist.py} +7 -5
  27. mpflash/list.py +13 -3
  28. mpflash/mpboard_id/__init__.py +1 -1
  29. mpflash/mpboard_id/add_boards.py +2 -2
  30. mpflash/mpboard_id/board_id.py +1 -1
  31. mpflash/mpremoteboard/__init__.py +7 -11
  32. mpflash/{vendor/versions.py → versions.py} +10 -5
  33. {mpflash-0.9.0.dist-info → mpflash-0.9.1.dist-info}/METADATA +16 -5
  34. mpflash-0.9.1.dist-info/RECORD +52 -0
  35. mpflash/flash_stm32_cube.py +0 -111
  36. mpflash/vendor/basicgit.py +0 -288
  37. mpflash-0.9.0.dist-info/RECORD +0 -52
  38. /mpflash/{flash_uf2_boardid.py → flash/uf2/boardid.py} +0 -0
  39. /mpflash/{uf2disk.py → flash/uf2/uf2disk.py} +0 -0
  40. {mpflash-0.9.0.dist-info → mpflash-0.9.1.dist-info}/LICENSE +0 -0
  41. {mpflash-0.9.0.dist-info → mpflash-0.9.1.dist-info}/WHEEL +0 -0
  42. {mpflash-0.9.0.dist-info → mpflash-0.9.1.dist-info}/entry_points.txt +0 -0
@@ -1,288 +0,0 @@
1
- """
2
- Simple Git module, where needed via powershell
3
-
4
- Some of the functions are based on the PyGithub module
5
- """
6
-
7
- import os
8
- import subprocess
9
- from pathlib import Path
10
- from typing import List, Optional, Union
11
-
12
- import cachetools.func
13
- from github import Auth, Github
14
- from loguru import logger as log
15
- from packaging.version import parse
16
-
17
- # from stubber.utils.versions import SET_PREVIEW
18
-
19
- # Token with no permissions to avoid throttling
20
- # https://docs.github.com/en/rest/using-the-rest-api/rate-limits-for-the-rest-api?apiVersion=2022-11-28#getting-a-higher-rate-limit
21
- PAT_NO_ACCESS = (
22
- "github_pat" + "_11AAHPVFQ0qAkDnSUaMKSp" + "_ZkDl5NRRwBsUN6EYg9ahp1Dvj4FDDONnXVgimxC2EtpY7Q7BUKBoQ0Jq72X"
23
- )
24
- PAT = os.environ.get("GITHUB_TOKEN") or PAT_NO_ACCESS
25
- GH_CLIENT = Github(auth=Auth.Token(PAT))
26
-
27
-
28
- def _run_local_git(
29
- cmd: List[str],
30
- repo: Optional[Union[Path, str]] = None,
31
- expect_stderr=False,
32
- capture_output=True,
33
- echo_output=True,
34
- ):
35
- "run a external (git) command in the repo's folder and deal with some of the errors"
36
- try:
37
- if repo:
38
- if isinstance(repo, str):
39
- repo = Path(repo)
40
- result = subprocess.run(
41
- cmd, capture_output=capture_output, check=True, cwd=repo.absolute().as_posix(), encoding="utf-8"
42
- )
43
- else:
44
- result = subprocess.run(cmd, capture_output=capture_output, check=True, encoding="utf-8")
45
- except (NotADirectoryError, FileNotFoundError) as e: # pragma: no cover
46
- return None
47
- except subprocess.CalledProcessError as e: # pragma: no cover
48
- # add some logging for github actions
49
- log.error(f"{str(e)} : { e.stderr}")
50
- return None
51
- if result.stderr and result.stderr != b"":
52
- stderr = result.stderr
53
- if "cloning into" in stderr.lower():
54
- # log.info(stderr)
55
- expect_stderr = True
56
- if "warning" in stderr.lower():
57
- log.warning(stderr)
58
- expect_stderr = True
59
- elif capture_output and echo_output: # pragma: no cover
60
- log.info(stderr)
61
- if not expect_stderr:
62
- raise ChildProcessError(stderr)
63
-
64
- if result.returncode and result.returncode < 0:
65
- raise ChildProcessError(result.stderr)
66
- return result
67
-
68
-
69
- def clone(remote_repo: str, path: Path, shallow: bool = False, tag: Optional[str] = None) -> bool:
70
- """git clone [--depth 1] [--branch <tag_name>] <remote> <directory>"""
71
- cmd = ["git", "clone"]
72
- if shallow:
73
- cmd += ["--depth", "1"]
74
- if tag in {"preview", "latest", "master"}:
75
- tag = None
76
- cmd += [remote_repo, "--branch", tag, str(path)] if tag else [remote_repo, str(path)]
77
- if result := _run_local_git(cmd, expect_stderr=True, capture_output=False):
78
- return result.returncode == 0
79
- else:
80
- return False
81
-
82
-
83
- def get_local_tag(repo: Optional[Union[str, Path]] = None, abbreviate: bool = True) -> Union[str, None]:
84
- """
85
- get the most recent git version tag of a local repo
86
- repo Path should be in the form of : repo = "./repo/micropython"
87
-
88
- returns the tag or None
89
- """
90
- if not repo:
91
- repo = Path(".")
92
- elif isinstance(repo, str):
93
- repo = Path(repo)
94
-
95
- result = _run_local_git(
96
- # ["git", "describe", "--tags"],
97
- ["git", "describe", "--tags", "--dirty", "--always", "--match", "v[1-9].*"],
98
- repo=repo.as_posix(),
99
- expect_stderr=True,
100
- )
101
- if not result:
102
- return None
103
- tag: str = result.stdout
104
- tag = tag.replace("\r", "").replace("\n", "")
105
- if not abbreviate or "-" not in tag:
106
- return tag
107
- if "-preview" in tag:
108
- tag = tag.split("-preview")[0] + "-preview"
109
- return tag
110
-
111
-
112
- def get_local_tags(repo: Optional[Path] = None, minver: Optional[str] = None) -> List[str]:
113
- """
114
- get list of all tags of a local repo
115
- """
116
- if not repo:
117
- repo = Path(".")
118
-
119
- result = _run_local_git(["git", "tag", "-l"], repo=repo.as_posix(), expect_stderr=True)
120
- if not result or result.returncode != 0:
121
- return []
122
- tags = result.stdout.replace("\r", "").split("\n")
123
- tags = [tag for tag in tags if tag.startswith("v")]
124
- if minver:
125
- tags = [tag for tag in tags if parse(tag) >= parse(minver)]
126
- return sorted(tags)
127
-
128
-
129
- @cachetools.func.ttl_cache(maxsize=16, ttl=60) # 60 seconds
130
- def get_tags(repo: str, minver: Optional[str] = None) -> List[str]:
131
- """
132
- Get list of tag of a repote github repo
133
- """
134
- if not repo or not isinstance(repo, str) or "/" not in repo: # type: ignore
135
- return []
136
- try:
137
- gh_repo = GH_CLIENT.get_repo(repo)
138
- except ConnectionError as e:
139
- # TODO: unable to capture the exeption
140
- log.warning(f"Unable to get tags - {e}")
141
- return []
142
- tags = [tag.name for tag in gh_repo.get_tags()]
143
- if minver:
144
- tags = [tag for tag in tags if parse(tag) >= parse(minver)]
145
- return sorted(tags)
146
-
147
-
148
- def checkout_tag(tag: str, repo: Optional[Union[str, Path]] = None) -> bool:
149
- """
150
- checkout a specific git tag
151
- """
152
- cmd = ["git", "checkout", tag, "--quiet", "--force"]
153
- result = _run_local_git(cmd, repo=repo, expect_stderr=True, capture_output=True)
154
- if not result:
155
- return False
156
- # actually a good result
157
- msg = {result.stdout}
158
- if msg != {""}:
159
- log.warning(f"git message: {msg}")
160
- return True
161
-
162
-
163
- def sync_submodules(repo: Optional[Union[Path, str]] = None) -> bool:
164
- """
165
- make sure any submodules are in sync
166
- """
167
- cmds = [
168
- ["git", "submodule", "sync", "--quiet"],
169
- # ["git", "submodule", "update", "--quiet"],
170
- ["git", "submodule", "update", "--init", "lib/micropython-lib"],
171
- ]
172
- for cmd in cmds:
173
- if result := _run_local_git(cmd, repo=repo, expect_stderr=True):
174
- # actually a good result
175
- log.debug(result.stderr)
176
- else:
177
- return False
178
- return True
179
-
180
-
181
- def checkout_commit(commit_hash: str, repo: Optional[Union[Path, str]] = None) -> bool:
182
- """
183
- Checkout a specific commit
184
- """
185
- cmd = ["git", "checkout", commit_hash, "--quiet", "--force"]
186
- result = _run_local_git(cmd, repo=repo, expect_stderr=True)
187
- if not result:
188
- return False
189
- # actually a good result
190
- log.debug(result.stderr)
191
- return True
192
-
193
-
194
- def switch_tag(tag: Union[str, Path], repo: Optional[Union[Path, str]] = None) -> bool:
195
- """
196
- switch to the specified version tag of a local repo
197
- repo should be in the form of : path/.git
198
- repo = '../micropython/.git'
199
- returns None
200
- """
201
-
202
- cmd = ["git", "switch", "--detach", tag, "--quiet", "--force"]
203
- result = _run_local_git(cmd, repo=repo, expect_stderr=True)
204
- if not result:
205
- return False
206
- # actually a good result
207
- log.debug(result.stderr)
208
- return True
209
-
210
-
211
- def switch_branch(branch: str, repo: Optional[Union[Path, str]] = None) -> bool:
212
- """
213
- switch to the specified branch in a local repo"
214
- repo should be in the form of : path/.git
215
- repo = '../micropython/.git'
216
- returns None
217
- """
218
- cmd = ["git", "switch", branch, "--quiet", "--force"]
219
- result = _run_local_git(cmd, repo=repo, expect_stderr=True)
220
- if not result:
221
- return False
222
- # actually a good result
223
- log.debug(result.stderr)
224
- return True
225
-
226
-
227
- def fetch(repo: Union[Path, str]) -> bool:
228
- """
229
- fetches a repo
230
- repo should be in the form of : path/.git
231
- repo = '../micropython/.git'
232
- returns True on success
233
- """
234
- if not repo:
235
- raise NotADirectoryError
236
-
237
- cmd = ["git", "fetch", "--all", "--tags", "--quiet"]
238
- result = _run_local_git(cmd, repo=repo, echo_output=False)
239
- return result.returncode == 0 if result else False
240
-
241
-
242
- def pull(repo: Union[Path, str], branch: str = "main") -> bool:
243
- """
244
- pull a repo origin into main
245
- repo should be in the form of : path/.git
246
- repo = '../micropython/.git'
247
- returns True on success
248
- """
249
- if not repo:
250
- raise NotADirectoryError
251
- repo = Path(repo)
252
- # first checkout HEAD
253
- cmd = ["git", "checkout", branch, "--quiet", "--force"]
254
- result = _run_local_git(cmd, repo=repo, expect_stderr=True)
255
- if not result:
256
- log.error("error during git checkout main", result)
257
- return False
258
-
259
- cmd = ["git", "pull", "origin", branch, "--quiet", "--autostash"]
260
- result = _run_local_git(cmd, repo=repo, expect_stderr=True)
261
- if not result:
262
- log.error("error durign pull", result)
263
- return False
264
- return result.returncode == 0
265
-
266
-
267
- def get_git_describe(folder: Optional[str] = None):
268
- """
269
- Based on MicroPython makeversionhdr.py
270
- returns : current git tag, commits ,commit hash : "v1.19.1-841-g3446"
271
- """
272
- # Note: git describe doesn't work if no tag is available
273
- try:
274
- git_describe = subprocess.check_output(
275
- ["git", "describe", "--tags", "--dirty", "--always", "--match", "v[1-9].*"],
276
- stderr=subprocess.STDOUT,
277
- universal_newlines=True,
278
- cwd=folder,
279
- ).strip()
280
- except subprocess.CalledProcessError as er:
281
- if er.returncode == 128:
282
- # git exit code of 128 means no repository found
283
- return None
284
- git_describe = ""
285
- except OSError:
286
- return None
287
- # format
288
- return git_describe
@@ -1,52 +0,0 @@
1
- mpflash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
2
- mpflash/add_firmware.py,sha256=QXk9P1UC0xvDlWhJ3Kj-Acy2wuxxK7R0L61KKiAjk1U,3337
3
- mpflash/ask_input.py,sha256=GGyOOlzpvhYmxyILVuNSj7hJlAvpPFXpP95erinTyCs,8717
4
- mpflash/bootloader/__init__.py,sha256=AbZJVbubvgcV0bQtItS9PEAvvPOKWLZpgi8DX5a5f5A,1282
5
- mpflash/bootloader/manual.py,sha256=tebIE2YBYvsWx2YmAcUcWnTnSjCqR1AwkXKVHJvnQkA,3002
6
- mpflash/bootloader/micropython.py,sha256=of9OuCchiGoczXPi6i0NT9LZHB9FgvigtZxWWvAcb2Q,399
7
- mpflash/bootloader/touch1200.py,sha256=D9yB1n2bSR-nyQDdQXJtCsNknSfHhI6hRziBqOv_HJI,1466
8
- mpflash/cli_download.py,sha256=qKZzHmuHazw5fhj_EGDu4DsqYCan41BK99nk1YWELFE,3527
9
- mpflash/cli_flash.py,sha256=IQfloZM1UK4VO4bo-8OxQkwH-RTGUFs7IWb-m4gFJJg,7136
10
- mpflash/cli_group.py,sha256=s180-nyUVNEwA5bPlkIum4mZPEW0Udf6oBAElnrjsvQ,2236
11
- mpflash/cli_list.py,sha256=AvYq5_Z7l0Z4rkbr23TwFNzstuZsQgopFpdcrTLwUvs,1965
12
- mpflash/cli_main.py,sha256=nFe30fOZZoz4zl3VkLUNoGv478etVtEEN-ccBmok9Tk,1093
13
- mpflash/common.py,sha256=ZfJR8dKKUy4VDZUgnDTILzuaem2o1Ix2haLxHQ47Z0o,5765
14
- mpflash/config.py,sha256=7-IL4R9oHeSh0jO-hppw8pDv990nEI31dwBzZFD50eY,1007
15
- mpflash/connected.py,sha256=vzQ6heV7w5Mnu76nR2dr9FiQ7Ja1x1Q_k0TGgdV1lT8,2955
16
- mpflash/download.py,sha256=EL17R88QO4TaiX-80GjjlEd6CNZ0vDOcWPuwewZ0_zs,13875
17
- mpflash/downloaded.py,sha256=n2iSVv3pS6rZmUr5ry8tOh-jSCZJdI-g_QJG8N5R1As,4815
18
- mpflash/errors.py,sha256=6lUhVtECY3syV2bBGKzegGH4pPKXhevvhYQZd74sy6o,238
19
- mpflash/flash.py,sha256=aC1z4Jq8b8a8O6rCTX1gdGcO5yM1vGoWlZGIWgKuHro,2059
20
- mpflash/flash_esp.py,sha256=j-VdSAKzNQZRVVO7oM9NcRAJWPDHsUianOien8rnYE8,2252
21
- mpflash/flash_stm32.py,sha256=JNY1bL-VNlnaQ6AhY9drKj8EgwpGwty0WAH1JD-Ecfs,584
22
- mpflash/flash_stm32_cube.py,sha256=TnLNqmJcdwRXWj_t0W4o-NmwBjd3z94qpjuyz77oP9o,3859
23
- mpflash/flash_stm32_dfu.py,sha256=GUJTU6bmxu4m9cK_wQKRCXPKSIf7F8BAxKMSDs59TwQ,2985
24
- mpflash/flash_uf2.py,sha256=f9CwUaBwnmgO9q7I5-Psbd0cStxyeiu0XDcu_OHlmVc,2796
25
- mpflash/flash_uf2_boardid.py,sha256=2s4K3QiKWK5HKFKWYsDV3hI8alfWSxEOMeurER3eZtM,408
26
- mpflash/flash_uf2_linux.py,sha256=I6KYbLrnn6lFvzoG-LFETak86VHuMG3XKpdrjCGH2co,3945
27
- mpflash/flash_uf2_macos.py,sha256=HqQ2HjXlTYzCC5DzjNaoCOR4QKKi5UzjqJcfZVJLaKM,998
28
- mpflash/flash_uf2_windows.py,sha256=Pg2siQENEqLddM7KKl9PdXtP7HzBsPICxo8uVCgn57E,1050
29
- mpflash/list.py,sha256=pSV9WJozObPSnW-oYs2JPdmh2PtCPJUNgvrozclpnU4,2874
30
- mpflash/logger.py,sha256=BAVrSXMGZLfSDRFbtVBtvb7Rl0sTJxooCgBS5t-6bXo,1057
31
- mpflash/mpboard_id/__init__.py,sha256=yeSWAP1YJWYWB2i8KZlBK1l8loJRcDo-xdymuCv92nU,3723
32
- mpflash/mpboard_id/add_boards.py,sha256=JgSXbK9aKtrSWQMIMYYW9OivuWXb1LLTIAmRthi1FC8,9429
33
- mpflash/mpboard_id/board.py,sha256=yQ8IDHQS09AelvTvmPhpmsL4oX3L7IXGqHorkxDOkoE,1114
34
- mpflash/mpboard_id/board_id.py,sha256=G5s-kMKAD-LGUAuU5eYnq25-MGIQPyB-zJojjcGawa4,2878
35
- mpflash/mpboard_id/board_info.zip,sha256=F6YowS96DAqjten4ySe4MXgZwPtE-saZOUfY5OQkqKk,19759
36
- mpflash/mpboard_id/store.py,sha256=lQQgHSxcaM_ZURcfZNSUv3-ZJjUKMC_xEOOSdpzVvBU,1493
37
- mpflash/mpremoteboard/__init__.py,sha256=j-Cex6TlihDp125gjGB01S_zE9nIq4mdRfamWjnOJoA,7549
38
- mpflash/mpremoteboard/mpy_fw_info.py,sha256=BTupe4rZDTs3UHRqvs429XqWHCchSpwa05yACOiOt5U,4413
39
- mpflash/mpremoteboard/runner.py,sha256=YUmo5Y0aOgMaww8CXSdNdgXD-wRKncILuMZ0OB_2qRU,4646
40
- mpflash/uf2disk.py,sha256=dQ8_U6e3qkFOyfXZDpWAsvEBIlMr-ZzLkzTDD8SADqM,286
41
- mpflash/vendor/basicgit.py,sha256=b6-gdK_DT0dmW3jEY9T0cjKR-TSEQOSl9U9sRcJh538,9257
42
- mpflash/vendor/click_aliases.py,sha256=K98inhtze8td1dw312kexJS7OX_0ojlptPQ5Z0SHxJY,3065
43
- mpflash/vendor/dfu.py,sha256=jGsiD3lbSV1Ar9qJubhoY_hy-L8FI-K55aow8vgwoYQ,5590
44
- mpflash/vendor/pydfu.py,sha256=1ObubGsPFrQ7T9M3JRlIPNIG2xx8uYffaEe0Y6bdf_g,19937
45
- mpflash/vendor/readme.md,sha256=ZVg7kuUYyXcWcrWkaSJ0CunwebCqu2SiS2sqDadwrT8,84
46
- mpflash/vendor/versions.py,sha256=osv5yFyg47_BZ85k3LRrzjyPu6T4psx56rgBN3YXMyM,3885
47
- mpflash/worklist.py,sha256=j64PVJXm8jhLzPUQt3rnJXCbT1JEczTax46mRWID9bM,5809
48
- mpflash-0.9.0.dist-info/LICENSE,sha256=xHwgxGNkI0R2iN4KNfbPbQSzRomWyRz7bJnR1O2mln8,1057
49
- mpflash-0.9.0.dist-info/METADATA,sha256=B5R5UZfNdyGhHZJZboAlHOOmxzwHW4PmTbzmI9Xh0TY,15275
50
- mpflash-0.9.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
51
- mpflash-0.9.0.dist-info/entry_points.txt,sha256=Jk_visOhYOsZIcSP2Ms9hKqfKy1iorR-6dYltSoWCpY,52
52
- mpflash-0.9.0.dist-info/RECORD,,
File without changes
File without changes