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

Pass --raw or --raw-except=datalad to addurl #34

Merged
merged 3 commits into from
Jul 12, 2024
Merged

Pass --raw or --raw-except=datalad to addurl #34

merged 3 commits into from
Jul 12, 2024

Conversation

jwodder
Copy link
Member

@jwodder jwodder commented Mar 1, 2024

Closes #26.

@jwodder jwodder added the embargo Handling embargoed Dandisets & assets on the Archive label Mar 1, 2024
@jwodder
Copy link
Member Author

jwodder commented Mar 1, 2024

The tests are currently failing because neurodebian's git-annex-standalone is still on version 10.20231227.

@jwodder jwodder added the blocked Cannot be implemented until something else happens label Mar 1, 2024
@yarikoptic
Copy link
Member

now should be 10.20240227-1~ndall+1 . Rerunning the jobs

Copy link

codecov bot commented Mar 4, 2024

Codecov Report

Attention: Patch coverage is 65.21739% with 8 lines in your changes missing coverage. Please review.

Project coverage is 74.05%. Comparing base (02e2c9e) to head (c81b62b).
Report is 5 commits behind head on main.

Files Patch % Lines
src/backups2datalad/__main__.py 55.55% 4 Missing ⚠️
src/backups2datalad/util.py 50.00% 2 Missing and 2 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main      #34      +/-   ##
==========================================
- Coverage   74.77%   74.05%   -0.72%     
==========================================
  Files          17       17              
  Lines        2735     2787      +52     
  Branches      604      615      +11     
==========================================
+ Hits         2045     2064      +19     
- Misses        526      554      +28     
- Partials      164      169       +5     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@jwodder jwodder removed the blocked Cannot be implemented until something else happens label Mar 4, 2024
@jwodder jwodder marked this pull request as ready for review March 4, 2024 18:53
@jwodder jwodder requested a review from yarikoptic March 4, 2024 18:53
@jwodder
Copy link
Member Author

jwodder commented Mar 7, 2024

@yarikoptic Tests pass now. Can this be merged now?

@yarikoptic
Copy link
Member

to merge we need to ensure that recent enough git-annex is within that env:

dandi@drogon:/mnt/backup/dandi/dandisets$ source ~/.bashrc-miniconda

(base) dandi@drogon:/mnt/backup/dandi/dandisets$ conda activate dandisets-2

(dandisets-2) dandi@drogon:/mnt/backup/dandi/dandisets$ git-annex version 
git-annex version: 10.20230126-g36f5557
...
(dandisets-2) dandi@drogon:/mnt/backup/dandi/dandisets$ which git-annex
/home/dandi/miniconda3/envs/dandisets-2/bin/git-annex

but most recent annex is not on conda-forge due to problems building that ghc etc

any clues on how to progress that one forward? (alternative would be to remove conda installation of git-annex and rely on neurodebian one, but it would be slower since standalone build)

@yarikoptic
Copy link
Member

note: meanwhile upgraded system wide git-annex-standalone installation

@jwodder jwodder added the blocked Cannot be implemented until something else happens label Mar 11, 2024
@jwodder
Copy link
Member Author

jwodder commented May 22, 2024

@yarikoptic Does drogon have a recent enough version of git-annex that this can be merged now?

@jwodder
Copy link
Member Author

jwodder commented Jul 11, 2024

@yarikoptic Ping.

@yarikoptic
Copy link
Member

yes, we have git-annex upgraded systemwide and I removed its installation from conda-forge's environment:

dandi@drogon:~$ source ~/.bashrc-miniconda; conda activate dandisets-2
(dandisets-2) dandi@drogon:~$ git annex version --raw
10.20240430-1~ndall+1(dandisets-2) dandi@drogon:~$ which git-annex
/usr/bin/git-annex
(dandisets-2) dandi@drogon:~$ conda deactivate
(base) dandi@drogon:~$ git annex version --raw
10.20240430-1~ndall+1(base) 

README.md Show resolved Hide resolved
@jwodder jwodder removed the blocked Cannot be implemented until something else happens label Jul 11, 2024
@jwodder
Copy link
Member Author

jwodder commented Jul 11, 2024

Tests are failing because the Archive hasn't updated to the new dandischema: dandi/dandi-archive#1975

@jwodder
Copy link
Member Author

jwodder commented Jul 12, 2024

@yarikoptic Tests are passing now. Can this finally be merged?

def check_git_annex_version() -> None:
# Call this function at the start of subcommand functions rather than in
# `main()` so that it doesn't run if a user does `backups2datalad
# subcommand --help`
Copy link
Member

Choose a reason for hiding this comment

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

I bet there should be a way for a common to all subcommands CLI context handling outside of --help, or may be in the top level context handling to do it is there is no --version or --help

But ok for now to get us going

@yarikoptic
Copy link
Member

Thank you! I left a comment but let's proceed

@yarikoptic yarikoptic merged commit a064ac3 into main Jul 12, 2024
5 of 7 checks passed
@yarikoptic yarikoptic deleted the gh-26 branch July 12, 2024 22:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
embargo Handling embargoed Dandisets & assets on the Archive
Projects
None yet
Development

Successfully merging this pull request may close these issues.

return addurl --raw as  --raw-except=datalad
2 participants