Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge remaining changes from '24 #642

Open
wants to merge 59 commits into
base: EOY_mpflash
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
33ffdf6
stubber: get_frozen > hack to add arduino_lib to the paths to resolve…
Josverl Jul 8, 2024
687797e
chore: Cleanup and fix parsing errors in enrich.py and merge_docstubs.py
Josverl Jul 10, 2024
e98f892
stubber: docstubs and merge handle stubs in a complex package format …
Josverl Jul 11, 2024
5f33b88
stubber: docstub.pyi refactoring
Josverl Jul 12, 2024
a30c412
stubber: update add_machine_pin_call to new docstub structure
Josverl Jul 12, 2024
b85b806
stubber: Use ALL matching docstub candidates to enrich
Josverl Jul 12, 2024
241faa5
stubber/docstubs: Skip spaces in python module name.
Josverl Jul 15, 2024
d03fa96
stubber: Add lookup pyb.hid_* is a tple
Josverl Jul 17, 2024
b2987da
stubber: GeneratorExit as Exception.
Josverl Jul 26, 2024
690dfa3
chore: Spelling.
Josverl Jul 26, 2024
f9dc78b
stubber: Add --no-clean-rst option and notebook to copy stubs.
Josverl Aug 4, 2024
b6798b6
stubber: Add import submodules to docstub generation.
Josverl Aug 20, 2024
00475ce
stubber: Merge @overload 1 of ...
Josverl Aug 21, 2024
dfc211c
stubber: Refactor merge Annotation storage.
Josverl Aug 21, 2024
76a8c0d
stubber: Merge @overload 2 of ...
Josverl Aug 22, 2024
62b206f
stubber: Merge overloads, fix adding unused overloads.
Josverl Aug 23, 2024
21accc5
stubber: Docstubs tweak no-clean-rst actions.
Josverl Aug 23, 2024
6dd2826
stubber: Merge @overloads 3 of ...
Josverl Aug 25, 2024
9b1dc37
stubber: Docstubs - Fix/undo removal of positional only `/)` from par…
Josverl Aug 25, 2024
64474dd
stubber: Merge @overloads 4 of ...
Josverl Aug 25, 2024
95ceb6a
stubber: Fix enrich tests
Josverl Aug 28, 2024
1514eca
Stubber: Avoid merge conflicts between static and class methods.
Josverl Aug 28, 2024
be1c4de
stubber: Merge @overloads 5 of ...
Josverl Aug 30, 2024
27ddfec
stubber:Add --params-only to Merge command.
Josverl Sep 25, 2024
b80e06a
Manual docstub source and and enrich tuning
Josverl Sep 29, 2024
07ad1bc
stubber: Also merge TypeVars
Josverl Oct 27, 2024
d2bd283
stubber: Add lookups for _rp2.DMA and _rp2.PIO
Josverl Oct 27, 2024
97c76d9
stubber: Also merge TypeAliases
Josverl Oct 27, 2024
e28b655
Refactor type lookup logic and improve signature parsing
Josverl Oct 28, 2024
a204c5d
stubber: Fix fetching repositories and getting the current checked o…
Josverl Oct 28, 2024
1689bd8
fix: MergeCommand.typevars init
Josverl Nov 10, 2024
98c106e
tests: add overload tests
Josverl Nov 13, 2024
3baaf78
enrich_tester : parameterize versions and overload source
Josverl Nov 15, 2024
547d909
Reference Update to v1.24.
Josverl Nov 15, 2024
6c30b71
merge overloads - from hlovatt
Josverl Nov 18, 2024
5e8dea8
stubber: Fix _IRQ lookups
Josverl Nov 22, 2024
ed68d75
Docstubs: modify module imports for compatibility
Josverl Dec 7, 2024
a64b75f
stubber: createstubs - Fix Final.
Josverl Jan 1, 2025
1debb45
stubber: Handle errors while reading pyproject.toml
Josverl Jul 18, 2024
995c05b
Merge commit '33ffdf6fd07d15e647f1208be24ac644769c4425' into EOY_stubber
Josverl Jan 1, 2025
b9ead19
Merge branch 'EOY_stubber' into EOY_24
Josverl Jan 1, 2025
3a6ab39
stubber: Fix preview version handling
Josverl Jan 1, 2025
976c7f2
stubber: Fix test for machine.UART return type
Josverl Jan 1, 2025
459c360
stubber: Improve handling of `arduino-lib` for frozen files
Josverl Jan 1, 2025
44529e2
stubber: chore - suppress warning
Josverl Jan 2, 2025
303f00f
chore: cleanup settings
Josverl Jan 2, 2025
6a46e29
Update pytest_mpflash.yml
Josverl Jan 2, 2025
98980d0
Update pytest.yml
Josverl Jan 2, 2025
1372025
stubber: Fix TypeError: unsupported operand type(s) for |: 'type' and…
Josverl Jan 2, 2025
4521e44
chore: remove unused workflows
Josverl Jan 2, 2025
c8eba7c
stybber : enrich : Fix TypeAlias/ TypeVar added multiple times
Josverl Jan 4, 2025
7a41de6
stubber: Fixes for docstub generation and reference -> docstub merges
Josverl Jan 9, 2025
f139724
Stubber: and enhance folder enrichment logic, add testdata v1.24.1 d…
Josverl Jan 13, 2025
25fb073
stubber: Merge - avoid import for target_module and add test for ove…
Josverl Jan 16, 2025
84d6433
stubber: Enhance merge candidate logic and add tests for candidate se…
Josverl Jan 20, 2025
a1ca3bd
stubber: Add @overload merging to undefined targets.
Josverl Jan 20, 2025
b0719cf
stubber: Add 'machine' module to U_MODULES and enhance docstub enrich…
Josverl Jan 20, 2025
4451aa4
stubber: Remove add_machine_pin_call function and related logic from …
Josverl Jan 20, 2025
3631c7e
stubber: Refactor enrich_folder to use copy_type_modules and add merg…
Josverl Jan 21, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
stubber: Handle errors while reading pyproject.toml
Signed-off-by: Jos Verlinde <[email protected]>
  • Loading branch information
Josverl committed Jan 1, 2025
commit 1debb45fe0b744bd0ce9d5d80ed6c379135ab9b9
8 changes: 6 additions & 2 deletions src/stubber/publish/stubpackage.py
Original file line number Diff line number Diff line change
@@ -255,8 +255,12 @@ def pyproject(self) -> Union[Dict[str, Any], None]:
pyproject = None
_toml = self.toml_path
if (_toml).exists():
with open(_toml, "rb") as f:
pyproject = tomllib.load(f)
log.info(f"Load pyproject from {_toml}")
try:
with open(_toml, "rb") as f:
pyproject = tomllib.load(f)
except tomllib.TOMLDecodeError as e:
log.error(f"Could not load pyproject.toml file {e}")
return pyproject

@pyproject.setter