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.

Sign up for GitHub

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

Add possible abi version to lock info #27

Merged
merged 1 commit into from
May 21, 2024
Merged

Add possible abi version to lock info #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

## [0.1.0a6] - 2024-04-03

### Added

- The `info` field now contains an optional `abi_version`.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR number is incorrect.

[#86](https://github.com/pyodide/pyodide-lock/pull/86)

## [0.1.0a5] - 2024-04-03

### Changed
Expand Down
1 change: 1 addition & 0 deletions pyodide_lock/spec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ class InfoSpec(BaseModel):
platform: str
version: str
python: str
abi_version: str | None = None
model_config = ConfigDict(extra="forbid")


Expand Down
2 changes: 1 addition & 1 deletion pyodide_lock/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def _generate_package_hash(full_path: Path) -> str:


def _get_marker_environment(
platform: str, version: str, arch: str, python: str
platform: str, version: str, arch: str, python: str, abi_version: str | None = None
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The parameter doesn't seem to be used anywhere?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But it gets passed and will crash if we don't accept it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see... we should probably update the contest.py file then.

) -> dict[str, str]:
"""
Get the marker environment for this pyodide-lock file. If running
Expand Down
Loading