Skip to content

feat: bump protobuf#371

Merged
hanxiao merged 28 commits intomainfrom
bump-protobuf
Aug 26, 2022
Merged

feat: bump protobuf#371
hanxiao merged 28 commits intomainfrom
bump-protobuf

Conversation

@JoanFM
Copy link
Copy Markdown
Member

@JoanFM JoanFM commented May 26, 2022

closes: #376

@codecov
Copy link
Copy Markdown

codecov bot commented May 26, 2022

Codecov Report

Merging #371 (1f0f517) into main (7c91c7b) will decrease coverage by 3.00%.
The diff coverage is 40.00%.

@@            Coverage Diff             @@
##             main     #371      +/-   ##
==========================================
- Coverage   86.53%   83.52%   -3.01%     
==========================================
  Files         134      136       +2     
  Lines        6704     6726      +22     
==========================================
- Hits         5801     5618     -183     
- Misses        903     1108     +205     
Flag Coverage Δ
docarray 83.52% <40.00%> (-3.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
docarray/helper.py 68.77% <ø> (-13.13%) ⬇️
docarray/proto/pb/docarray_pb2.py 0.00% <0.00%> (ø)
docarray/proto/pb2/docarray_pb2.py 60.37% <60.37%> (ø)
docarray/proto/docarray_pb2.py 75.00% <75.00%> (-25.00%) ⬇️
docarray/__init__.py 75.00% <100.00%> (ø)
docarray/array/mixins/embed.py 10.52% <0.00%> (-78.95%) ⬇️
docarray/array/mixins/post.py 18.60% <0.00%> (-74.42%) ⬇️
docarray/array/mixins/group.py 69.23% <0.00%> (-17.95%) ⬇️
docarray/document/mixins/sugar.py 56.00% <0.00%> (-12.00%) ⬇️
... and 1 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@JoanFM JoanFM closed this Jun 2, 2022
@JoanFM JoanFM reopened this Jun 2, 2022
@JoanFM JoanFM marked this pull request as draft June 2, 2022 10:05
@JoanFM JoanFM closed this Jul 1, 2022
@JoanFM JoanFM reopened this Jul 1, 2022
@JoanFM JoanFM closed this Jul 5, 2022
@JoanFM JoanFM reopened this Jul 5, 2022
@hanxiao hanxiao closed this Aug 21, 2022
@hanxiao hanxiao reopened this Aug 21, 2022
@hanxiao
Copy link
Copy Markdown
Member

hanxiao commented Aug 21, 2022

@alaeddine-13 please take care of this PR thanks, we have to move forward. It doesn't make sense to be blocked by paddle because of the lack of maintenance on their side. Please refactor the tests, or in the worst case, remove paddle tests (or even functions). Move this PR forward at any cost.

Ref: https://jinaai.slack.com/archives/C02AC4T8Y5T/p1661117495528849

@alaeddine-13
Copy link
Copy Markdown
Member

we're proceeding like so:

  1. create another protoc gen image with new version
  2. build protos in 2 versions (old and new)
  3. in docarray and jina, dynamically find the version of protobuf and accordingly, use the appropriate protobuf file

@@ -0,0 +1,12 @@
from google.protobuf import __version__ as __pb__version__

if __pb__version__.startswith('4'):
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

aha, smart

Copy link
Copy Markdown
Member

@hanxiao hanxiao left a comment

Choose a reason for hiding this comment

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

could you also change __version__ = 0.16.0 so

after this merge,

  1. the corresponding PR in core has to be merged, with version restriction of docarray >=0.16.0 and its own __version=3.18.0
  2. docarray release 0.16.0
  3. jina release 3.8.0

@alaeddine-13
Copy link
Copy Markdown
Member

could you also change __version__ = 0.16.0 so

after this merge,

  1. the corresponding PR in core has to be merged, with version restriction of docarray >=0.16.0 and its own __version=3.18.0
  2. docarray release 0.16.0
  3. jina release 3.8.0

I agree on this
old jina versions will no more be compatible with new docarray and installing old versions of jina becomes buggy
the dependency here should be fixed to use docarray~=0.16.0: https://github.com/jina-ai/jina/blob/master/extra-requirements.txt#L35

@hanxiao
Copy link
Copy Markdown
Member

hanxiao commented Aug 26, 2022

i haven't looked at the protobuf docs generation, is it affected?

@hanxiao hanxiao marked this pull request as ready for review August 26, 2022 15:50
@hanxiao hanxiao merged commit 24be6ba into main Aug 26, 2022
@hanxiao hanxiao deleted the bump-protobuf branch August 26, 2022 16:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

bump protobuf version

3 participants