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

Updates due dependency version changes. #1960

Merged
merged 3 commits into from Nov 1, 2020
Merged

Conversation

bmccandless
Copy link
Contributor

h5py recently changes and now values once returned as str are now returned as bytes.
This would have caused a much larger change, so instead the version is restricted to <3.0.0.

This caused the bulk of the testing failues.
A few other changes were needed to make a few other tests pass.

#1959

h5py recently changes and now values once returned as str are now returned as bytes.
This would have caused a much larger change, so instead the version is restricted to <3.0.0.

This caused the bulk of the testing failues.
A few other changes were needed to make a few other tests pass.

 #1959
@codecov-io
Copy link

codecov-io commented Oct 31, 2020

Codecov Report

❗ No coverage uploaded for pull request base (main@3b6c46b). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #1960   +/-   ##
=======================================
  Coverage        ?   65.61%           
=======================================
  Files           ?       52           
  Lines           ?     4196           
  Branches        ?        0           
=======================================
  Hits            ?     2753           
  Misses          ?     1443           
  Partials        ?        0           
Flag Coverage Δ
frontend 100.00% <ø> (?)
javascript 100.00% <ø> (?)
unitTest 100.00% <ø> (?)

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

Impacted Files Coverage Δ
data_anndata/anndata_adaptor.py 82.77% <0.00%> (ø)
converters/h5ad_data_file.py 95.08% <0.00%> (ø)
common/utils/cxg_constants.py 100.00% <0.00%> (ø)
data_common/fbs/NetEncoding/Column.py 77.77% <0.00%> (ø)
data_cxg/cxg_adaptor.py 53.22% <0.00%> (ø)
data_common/fbs/NetEncoding/Uint32Array.py 53.33% <0.00%> (ø)
common/config/client_config.py 6.38% <0.00%> (ø)
common/annotations/local_file_csv.py 56.91% <0.00%> (ø)
common/config/__init__.py 100.00% <0.00%> (ø)
common/health.py 0.00% <0.00%> (ø)
... and 42 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3b6c46b...3a08a9a. Read the comment docs.

cls.mock_oauth_process.start()
server_okay = False
for _ in range(5):
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you add a comment explaining why we need to retry in order for this setup to work?

Copy link
Contributor

Choose a reason for hiding this comment

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

Oops -- sorry I guess my comment wasn't clear. I was more wondering what necessitates the for _ in range(5): line (i.e. why do we need to retry). Does it take up to 5 seconds for the mock oauth server to be ready?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

All this is doing is polling until the mock server is ready. The issue is we are starting a mock oauth server, then we are starting a cellxgene server, which will start making requests to the mock oauth server. So there is a race condition because the mock oauth server needs to be ready before it gets requests. So, we check to see if it is ready, and if not we wait 1 second, then try again. If it gets to 5 seconds, which is shouldn't, we assume something has gone wrong and fail the test.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah got it -- this makes sense to me. Mind writing the same explanation as a comment above the for loop? That way, the next reader knows why we need that retry there.

Copy link
Contributor

@maniarathi maniarathi left a comment

Choose a reason for hiding this comment

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

After adding the comment, LGTM! Thank you!

@bmccandless
Copy link
Contributor Author

bmccandless commented Oct 31, 2020

After adding the comment, LGTM! Thank you!

@maniarathi Is it good now, or did you want the longer comment?

@maniarathi
Copy link
Contributor

Sorry I meant that I'd like to see your explanation to me about the race condition between the two servers and that the mock Auth0 server shouldn't take more than 5 seconds added to the inline comment in code. Then LGTM.

@maniarathi
Copy link
Contributor

Thanks for double checking!

@bmccandless bmccandless merged commit b9e132a into main Nov 1, 2020
seve added a commit that referenced this pull request Nov 5, 2020
* Updates due dependency version changes.

h5py recently changes and now values once returned as str are now returned as bytes.
This would have caused a much larger change, so instead the version is restricted to <3.0.0.

This caused the bulk of the testing failues.
A few other changes were needed to make a few other tests pass.

 #1959
@bmccandless bmccandless deleted the bmccandless/versionfix branch January 13, 2021 17:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants