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: s3 user annotations #2541

Merged
merged 5 commits into from
Jul 28, 2022
Merged

Conversation

atolopko-czi
Copy link
Contributor

#2540

Reviewers

Functional:
@ebezzi

Readability:


Changes

  • do not attempt to create the user annotations directory if an s3 location is specified.

QA

cellxgene launch --user-generated-data-dir s3://atolopko-tmp/cellxgene_desktop  ...

❯ aws s3 ls s3://atolopko-tmp/cellxgene_desktop/
                           PRE x-gene-sets-FXQEAGSB-backups/
2022-07-26 08:47:15        266 x-gene-sets-FXQEAGSB.csv

do _not_ attempt to create the user annotations directory if an s3 location is
specified.
@atolopko-czi atolopko-czi requested a review from ebezzi July 26, 2022 13:00
@atolopko-czi atolopko-czi self-assigned this Jul 26, 2022
@codecov
Copy link

codecov bot commented Jul 28, 2022

Codecov Report

Merging #2541 (0a52bbc) into main (de44739) will decrease coverage by 0.05%.
The diff coverage is 61.11%.

❗ Current head 0a52bbc differs from pull request most recent head 64b7741. Consider uploading reports for the commit 64b7741 to get more accurate results

@@            Coverage Diff             @@
##             main    #2541      +/-   ##
==========================================
- Coverage   71.64%   71.58%   -0.06%     
==========================================
  Files          94       94              
  Lines        6464     6500      +36     
  Branches      738      770      +32     
==========================================
+ Hits         4631     4653      +22     
- Misses       1757     1771      +14     
  Partials       76       76              
Flag Coverage Δ
frontend 71.58% <61.11%> (-0.06%) ⬇️
javascript 71.58% <61.11%> (-0.06%) ⬇️
smokeTestAnnotations ?
unitTest 71.58% <61.11%> (-0.06%) ⬇️

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

Impacted Files Coverage Δ
server/common/config/dataset_config.py 77.95% <22.22%> (-1.73%) ⬇️
client/src/annoMatrix/viewCreators.js 73.91% <100.00%> (+1.18%) ⬆️
client/src/annoMatrix/whereCache.js 100.00% <100.00%> (ø)
client/src/util/typedCrossfilter/crossfilter.js 92.61% <0.00%> (-1.12%) ⬇️
client/src/util/actionHelpers.js 76.27% <0.00%> (-0.93%) ⬇️
client/src/util/typedCrossfilter/bitArray.js 77.18% <0.00%> (-0.91%) ⬇️
client/src/util/stateManager/matrix.js 85.84% <0.00%> (-0.65%) ⬇️
client/src/util/typedCrossfilter/sort.js 89.17% <0.00%> (-0.51%) ⬇️
client/src/util/stateManager/colorHelpers.js 47.47% <0.00%> (-0.49%) ⬇️
...ent/__tests__/util/stateManager/sampleResponses.js 100.00% <0.00%> (ø)
... and 5 more

Help us with your feedback. Take ten seconds to tell us how you rate us.

@atolopko-czi atolopko-czi enabled auto-merge (squash) July 28, 2022 19:54
@atolopko-czi atolopko-czi merged commit 4df50a7 into main Jul 28, 2022
@atolopko-czi atolopko-czi deleted the atolopko/2540-fix-s3-user-annotations branch July 28, 2022 20: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

2 participants