Skip to content

Conversation

@drammock
Copy link
Member

@drammock drammock commented Jul 8, 2020

@larsoner not sure if I did the cherry-pick correctly; the diff ended up including some changes that weren't from #7971 ... but I think that's actually what we want in this case?

@larsoner
Copy link
Member

larsoner commented Jul 8, 2020

Technically we don't want to bump Travis on maint/0.20 to 3.6 because 0.20 still supports 3.5. But it probably does not matter much since we're releasing 0.21 in about two months, so if it's enough to make the CIs happy then I guess it's fine.

@drammock
Copy link
Member Author

drammock commented Jul 8, 2020

hmm, circle failures are all related to _dict stuff. I guess I need to cherry-pick the ignore-nitpicky lines in doc/conf.py?

@larsoner
Copy link
Member

larsoner commented Jul 8, 2020

Yep, that should do it

@drammock
Copy link
Member Author

@larsoner Circle is happy, and I've reverted all the changes except for the changes to the docs, and the nitpicky ignores in conf.py. Note that I had to add a new nitpick ignore to make Circle happy. Is this OK to merge then, to get the stable docs in sync with the current state of environment.yml?

@larsoner larsoner merged commit 76fc838 into mne-tools:maint/0.20 Jul 10, 2020
@larsoner
Copy link
Member

Thanks @drammock

@drammock drammock deleted the stable branch July 24, 2020 19:53
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.

2 participants