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

add driver and simplecache example #20

Merged
merged 22 commits into from Feb 17, 2021
Merged

Conversation

aaronspring
Copy link
Collaborator

No description provided.

@aaronspring aaronspring mentioned this pull request Feb 17, 2021
andersy005 and others added 4 commits February 17, 2021 11:13
Co-authored-by: Aaron Spring <aaronspring@users.noreply.github.com>
@andersy005 andersy005 closed this Feb 17, 2021
@andersy005 andersy005 deleted the branch intake:main February 17, 2021 19:05
@andersy005 andersy005 reopened this Feb 17, 2021
@aaronspring
Copy link
Collaborator Author

I should have directly commited into #19. instead this PR want to commit into NCAR:add-docs

I resolved conflicts, https://intake-thredds--20.org.readthedocs.build/en/20/tutorial.html#id1 looks good. But I am unsure how to merge this PR into master. or should I just open a new PR?

@andersy005 andersy005 changed the base branch from add-docs to main February 17, 2021 19:35
@andersy005
Copy link
Member

I changed the base branch to main via the edit option

Screen Shot 2021-02-17 at 12 36 21 PM

Can you try rebasing against the upstream/main to address the conflicts? Sorry for the extra work :)

Co-authored-by: Anderson Banihirwe <axbanihirwe@ualr.edu>
Co-authored-by: Anderson Banihirwe <axbanihirwe@ualr.edu>
@aaronspring
Copy link
Collaborator Author

aaronspring commented Feb 17, 2021

This is also an issue in the main branch...

image

@andersy005
Copy link
Member

@aaronspring, yeah... I saw that. It's weird that the cell fails but everything else after it still works. Also, I notice some weird dask dependency issues in #19. Let's merge this as is for now and investigate the issue in a separate PR if need be.

@andersy005 andersy005 merged commit ccb3c46 into intake:main Feb 17, 2021
@aaronspring aaronspring deleted the add-docs branch February 18, 2021 09:34
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.

None yet

2 participants