Skip to content

Conversation

@drammock
Copy link
Member

@drammock drammock commented Jun 4, 2020

fixes a 404 link, and converts the docstring to use footcite while we're at it.

@larsoner
Copy link
Member

larsoner commented Jun 4, 2020

CircleCI is broken, @GuillaumeFavelier can you look? It has to do with pyvistaqt. Locally when I switched to using pyvista master and pyvistaqt there were some tests that were not happy...

In the meantime, let's pin pyvista<0.25 (this PR is fine) to avoid this problem @drammock

@drammock
Copy link
Member Author

drammock commented Jun 4, 2020

hmm... a bunch of failures in test_brain and tst_3d in the azure 3.7 conda build, see here.

On the other hand, the docstring changes look good

@GuillaumeFavelier
Copy link
Contributor

GuillaumeFavelier commented Jun 4, 2020

I see that pyvista has been pinned to 0.24 in requirements.txt but not in environment.yml. That could explain the failures on conda

Copy link
Member

@larsoner larsoner left a comment

Choose a reason for hiding this comment

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

LGTM, please merge once CIs come back happy

@drammock drammock merged commit 121364d into mne-tools:master Jun 5, 2020
@drammock drammock deleted the linkfix branch June 5, 2020 00:21
larsoner added a commit to larsoner/mne-python that referenced this pull request Jun 5, 2020
* upstream/master:
  DOC: Order
  added reference
  FIX: Working
  working version
  ENH: More efficient
  actually working csd, needs review
  MAINT: Update dataset and add constant test (mne-tools#7866)
  DOC: update link to glasser supplementary info; convert to footbib (mne-tools#7864)
  FIX: Fix subtract_evoked with decim (mne-tools#7855)
  FIX: Fix reading of old TFRs (mne-tools#7851)
  DOC: Add evoked movecomp to example (mne-tools#7852)
  Deprecate meg=True in pick_types (mne-tools#7823)
  ENH: Allow reading broken file (mne-tools#7846)
  MRG, ENH: Add mixed source estimate support to compute_source_morph (mne-tools#7734)
  FIX: Fix bug with metadata and event_repeated (mne-tools#7733)
  MRG, ENH: Add axes to plot_evoked_white (mne-tools#7831)
  MRG, ENH: Add example of projection to source space (mne-tools#7705)
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