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

Some schema updates #286

Merged
merged 154 commits into from
Dec 1, 2020
Merged

Some schema updates #286

merged 154 commits into from
Dec 1, 2020

Conversation

satra
Copy link
Member

@satra satra commented Nov 30, 2020

No description provided.

jwodder and others added 30 commits September 3, 2020 11:49
* 'master' of https://github.com/dandi/dandi-cli:
  Skip cache+symlink test on pre-3.8 Python on Windows
  Fix bug in test_memoize_path
  Run GitHub Actions tests daily
  BF: account for API returning metadata for dandiset now not nested within yet another key
  BF: ensure_datetime for mtime beore taking .timestamp
  BF: always install dateutil and use it by default for parsing ISO datetime strings
…dandiarchive

So that it could be used also for ls or any other code which needs to
go through the thing (dandiset, folder, assets()) in the archive.
ATM we need to flip between Girder and DANDI API, so hat helper abstracts
that away a bit more on top of having GirderCli and DandiAPIClient
Add dandi-publish to Docker Compose setup
It also adds listing of dandisets themselves for local paths (unless -r is used).

No harmornization for records from URLs (API) is performed ATM
Co-authored-by: John T. Wodder II <jwodder@users.noreply.github.com>
RF: move+RF code for navigating dandi archive url from download into (new) dandiarchive module
With RFings in master we can screw it up, and also web ui is fragile
to wrong metadata records atm and there is no validation yet.  Since
we already have a header saying that all changes would be lost, I think the
best course of action is just to not upload it at all!
Also harmonized returned value to always return the metadata record,
otherwise how would Python user know what was registered?
ENH: provide original exception message while preparing LockingError exception
jwodder and others added 20 commits November 19, 2020 12:26
Co-authored-by: Yaroslav Halchenko <debian@onerussian.com>
To avoid maintaining two documentations, where each one coughs get out of sync.

Closes dandi#278
DOC: strip away duplicate with the handbook information
Add workflow for publishing model schemata to dandi/schema
h5py 3.0 introduced breaking changes (see e.g. dandi#282)
and hdmf yet to account for them.  We better cache that version too to improve
consistency of outputs etc
Add rudimentary duecredit support using zenodo's dandi-cli DOI
* upstream/master: (116 commits)
  ENH: basic duecredit support
  DOC: strip away duplicate with the handbook information
  Update CHANGELOG.md [skip ci]
  Tweak pubschemata commit message
  Adjust workflow path triggers
  Add comment to numpy API warning ignore setting
  Workflow for publishing model schemata to dandi/schema
  [dandi#275] Ignore numpy API warning
  Support h5py 3.0
  Add healthchecks for the Postgres and minio Docker containers
  Include item path in "Multiple files found for item" message
  Copy files with `cp --reflink=auto` where supported
  Test the rest of keyring_lookup()
  More keyring_lookup() tests
  Test askyesno()
  Test that keyring backends specified with env vars take precedence over config files
  Test keyring_lookup() when backend is set via config file
  Test asking for an API key twice via input()
  Test keyring_lookup() when backend is set via env var
  Basic test of getting an API key via input()
  ...
Fix publish-schemata workflow
change from disease to disorder
@yarikoptic
Copy link
Member

@satra may be just push directly into nwb2asset which is also used for #226 so we could finally merge that one after one more review cycle (to make sure that no side-effects for any current behavior of master)?

yarikoptic and others added 2 commits December 1, 2020 10:08
BF: add h5py.__version__ into the list of tokens for caching
@satra
Copy link
Member Author

satra commented Dec 1, 2020

i wanted to fix some tests here before merging this.

* upstream/master:
  Update CHANGELOG.md [skip ci]
  change from disease to disorder
  Fix publish-schemata workflow
  updated just models
  BF: add h5py.__version__ into the list of tokens for caching
@yarikoptic
Copy link
Member

ok. I will then push just the merge of master you have made (f110465) into that PR so this diff starts to look sensible and we have conflict resolved in that PR

@codecov
Copy link

codecov bot commented Dec 1, 2020

Codecov Report

Merging #286 (7be857f) into nwb2asset (33c7e53) will increase coverage by 0.08%.
The diff coverage is 90.26%.

Impacted file tree graph

@@              Coverage Diff              @@
##           nwb2asset     #286      +/-   ##
=============================================
+ Coverage      82.29%   82.38%   +0.08%     
=============================================
  Files             51       56       +5     
  Lines           4333     4735     +402     
=============================================
+ Hits            3566     3901     +335     
- Misses           767      834      +67     
Flag Coverage Δ
unittests 82.38% <90.26%> (+0.08%) ⬆️

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

Impacted Files Coverage Δ
dandi/cli/cmd_register.py 75.00% <0.00%> (+5.76%) ⬆️
dandi/tests/test_metadata.py 100.00% <ø> (ø)
dandi/dandiapi.py 48.62% <23.07%> (-34.03%) ⬇️
dandi/cli/cmd_ls.py 64.86% <59.52%> (-4.08%) ⬇️
dandi/due.py 68.00% <68.00%> (ø)
dandi/register.py 74.07% <75.00%> (+3.70%) ⬆️
dandi/utils.py 75.83% <84.61%> (+0.25%) ⬆️
dandi/dandiarchive.py 86.48% <86.48%> (ø)
dandi/download.py 83.88% <92.59%> (+0.54%) ⬆️
dandi/dandiset.py 88.88% <92.85%> (+0.65%) ⬆️
... and 27 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 33c7e53...7be857f. Read the comment docs.

@satra
Copy link
Member Author

satra commented Dec 1, 2020

i'm going to merge this. i think this is ok.

@satra satra merged commit e13bc12 into dandi:nwb2asset Dec 1, 2020
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.

3 participants