Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

MRG: Devdocs #370

Merged
merged 13 commits into from
Mar 25, 2020
Merged

MRG: Devdocs #370

merged 13 commits into from
Mar 25, 2020

Conversation

sappelhoff
Copy link
Member

@sappelhoff sappelhoff commented Mar 24, 2020

Main point of this PR: Make CircleCI build devdocs. See point 3 in #369

accompanying PR: #371 ... #371 MUST BE MERGED BEFORE THIS ONE

binder

I said before that Binder will only work for the stable docs ... fortunately I was wrong!

With the addition in this PR (filepath_prefix) binder links are enabled for all versions:

  • dev
  • stable
  • v0.3
  • the versions prior to v0.3 did not have binder when they were released ... so they also don't have it now

circleCI key

I securely added a new CircleCI SSH key so that Circle can push the docs to our branch. Following this tutorial

WIKI

I updated the release post, and added a new post to document the changes I made:

Merge checklist

Maintainer, please confirm the following before merging:

  • All comments resolved
  • This is not your own PR
  • All CIs are happy
  • PR title starts with [MRG]
  • whats_new.rst is updated
  • PR description includes phrase "closes <#issue-number>"
  • Commit history does not contain any merge commits

@codecov-io
Copy link

codecov-io commented Mar 24, 2020

Codecov Report

Merging #370 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #370   +/-   ##
=======================================
  Coverage   95.16%   95.16%           
=======================================
  Files          11       11           
  Lines        1364     1364           
=======================================
  Hits         1298     1298           
  Misses         66       66

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 c916594...c0ac14f. Read the comment docs.

@sappelhoff sappelhoff mentioned this pull request Mar 24, 2020
5 tasks
@sappelhoff sappelhoff changed the title [WIP] Devdocs MRG: Devdocs Mar 24, 2020
@sappelhoff
Copy link
Member Author

sappelhoff commented Mar 24, 2020

MacOSX failure on Travis is unrelated (a timeout during download)

EDIT: I did a re-run and now it's green.

@sappelhoff sappelhoff mentioned this pull request Mar 24, 2020
environment.yml Outdated
@@ -11,7 +11,7 @@ dependencies:
- scikit-learn
- matplotlib
- pip:
- mne>=0.19.1
- mne>=0.19.1,<0.20
Copy link
Member

Choose a reason for hiding this comment

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

why this?

Copy link
Member Author

@sappelhoff sappelhoff Mar 24, 2020

Choose a reason for hiding this comment

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

that was an accidental change while moving from ~= syntax to >=X,<Y syntax ... reverted in 2277373 Thanks!

git add * && \
git add .nojekyll && \
git commit -a -m 'Make install' && \
git push
Copy link
Member

Choose a reason for hiding this comment

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

any chance of modifying this instead of deleting the whole thing? I like it be able to push the docs manually instead of just through CircleCI.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, it'd be possible ... but what I came up with seems quite ugly --> and there are still some assumptions that need to be fulfilled in order for this to work. I added comments. Any idea on how to improve this?

# assuming in mne_bids/doc directory ... otherwise, "make install" would not work
git checkout master

# assuming remote is configured as upstream
git pull upstream master

# make sure the local branch is aligned 
git reset --hard upstream/master

# Go back to top directory and use the main Makefile
cd ..
make build-doc

# Temporarily store HTML outputs
cp -r doc/_build/html ~/tmp_mne_bids_docs

# Get gh-pages branch and make sure it is up to date
# assuming that the gh-pages branch already exists locally
git checkout gh-pages
git pull upstream gh-pages
git reset --hard upstream/gh-pages

# remove current dev docs from gh-pages branch and replace with new ones
rm -rf dev/
cp -r ~/tmp_mne_bids_docs dev/
rm -rf ~/tmp_mne_bids_docs

# add and push
git add .
git commit -m "manual update of dev docs [skip ci]"
git push

Copy link
Member Author

Choose a reason for hiding this comment

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

but maybe this can also be done in another PR, I am anxious to get this merged :-)

Copy link
Member

Choose a reason for hiding this comment

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

okay fair enough! mental sanity is important during work from home :)

@jasmainak
Copy link
Member

also this link seems broken: https://mne.tools/mne-bids/dev/index.html

@sappelhoff
Copy link
Member Author

sappelhoff commented Mar 25, 2020

also this link seems broken: https://mne.tools/mne-bids/dev/index.html

yes, it will only work once this is merged 😄

Edit: but preview it here: https://34-140864326-gh.circle-artifacts.com/0/html/index.html

@sappelhoff
Copy link
Member Author

@jasmainak bump to merge :-)

we can automate details later (#370 (comment))

@jasmainak jasmainak merged commit 7ccee73 into mne-tools:master Mar 25, 2020
@jasmainak
Copy link
Member

Done, thanks @sappelhoff !

@sappelhoff sappelhoff deleted the devdocs branch March 26, 2020 09:11
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants