Skip to content
This repository was archived by the owner on Mar 8, 2020. It is now read-only.

Fix PB imports (#122) - #124

Merged
dennwc merged 2 commits into
bblfsh:masterfrom
vmarkovtsev:master
Sep 5, 2018
Merged

dennwc merged 2 commits into
bblfsh:masterfrom
vmarkovtsev:master

Conversation

@vmarkovtsev

Copy link
Copy Markdown
Contributor

Changes:

  1. Place pb files inside proto
  2. Fix the generated grpc stubs. The grpc plugin is crazy and ignores ".in." in imports, it also does not respect the directory structure.
  3. Prepend "bblfsh" to all the imports in the bindings
  4. Remove the sys.path hacks
  5. Add isinstance test

So now we have absolute imports starting with "bblfsh" everywhere and no classes are duplicated.

Signed-off-by: Vadim Markovtsev [email protected]

@vmarkovtsev

Copy link
Copy Markdown
Contributor Author

@bzz This is the proper fix. No changes are required for the downstream projects.

Changes:

1. Place pb files inside proto
2. Fix the generated grpc stubs. The grpc plugin is crazy and ignores ".in." in imports, it also does not respect the directory structure.
3. Prepend "bblfsh" to all the imports in the bindings
4. Remove the sys.path hacks
5. Add `isinstance` test

So now we have absolute imports starting with "bblfsh" **everywhere** and no classes are duplicated.

Signed-off-by: Vadim Markovtsev <[email protected]>
Signed-off-by: Vadim Markovtsev <[email protected]>
@vmarkovtsev

Copy link
Copy Markdown
Contributor Author

@dennwc Can you please merge and publish a new release on PyPi.

@dennwc
dennwc merged commit da6ceba into bblfsh:master Sep 5, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants