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

fix combined_json for versions >0.3.10 #29

Merged
merged 7 commits into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased](https://github.com/vyperlang/vvm/)
### Changed
- Update contact information in `CONTRIBUTING.md`
- Update contact information in `CONTRIBUTING.md` ([#17](https://github.com/vyperlang/vvm/pull/17), [#18](https://github.com/vyperlang/vvm/pull/18))
- Update dependencies. Minimum python version is now 3.8 ([#22](https://github.com/vyperlang/vvm/pull/22))
- Add `output_format` argument to `compile_source` and `compile_files` ([#21](https://github.com/vyperlang/vvm/pull/21))
- New public function `detect_vyper_version_from_source` ([#23](https://github.com/vyperlang/vvm/pull/23))
- Fix `combine_json` for versions `>0.3.10` ([#29](https://github.com/vyperlang/vvm/pull/29))

## [0.1.0](https://github.com/vyperlang/vvm/tree/v0.1.0) - 2020-10-07
### Added
Expand Down
1 change: 1 addition & 0 deletions tests/test_compile_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ def test_compile_source(foo_source, vyper_version):
pytest.skip("vyper 0.4.0b1 to 0.4.0b5 have a bug with combined_json")
output = vvm.compile_source(foo_source)
assert "<stdin>" in output
assert "bytecode" in output["<stdin>"]


def test_compile_files(foo_path, vyper_version):
Expand Down
1 change: 1 addition & 0 deletions vvm/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ def compile_source(
)

if output_format in ("combined_json", None):
compiler_data.pop("version", None)
trocher marked this conversation as resolved.
Show resolved Hide resolved
return {"<stdin>": list(compiler_data.values())[0]}
return compiler_data

Expand Down
Loading