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.

Sign up for GitHub

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

Jump to bottom

try to fix nullcontext #7908

Merged
merged 1 commit into from
Jun 18, 2020
Merged

try to fix nullcontext #7908

merged 1 commit into from
Jun 18, 2020

Conversation

drammock
Copy link
Member

closes #7907

@drammock
Copy link
Member Author

@larsoner I don't think these changes are actually getting tested; AFAICT our only py3.6 test run is on Travis, and it skips all the pyvista-related tests. Feel free to look into it and push here; otherwise I'll try to dig deeper tomorrow.

@larsoner larsoner merged commit 437ae47 into mne-tools:master Jun 18, 2020
@larsoner
Copy link
Member

Thanks @drammock

@drammock drammock deleted the nullcontext branch June 18, 2020 16:40
larsoner added a commit to larsoner/mne-python that referenced this pull request Jun 23, 2020
@larsoner
Merge remote-tracking branch 'upstream/master' into refactor
67164aa 
* upstream/master:
  MRG, ENH: Add method to project onto max power ori (mne-tools#7883)
  WIP: Warn if untested NIRX device (mne-tools#7905)
  MRG, BUG: Fix bug with volume morph and subject_to!="fsaverage" (mne-tools#7896)
  MRG, MAINT: Clean up use of bool, float, int (mne-tools#7917)
  ENH: Better error message for incompatible Evoked objects (mne-tools#7910)
  try to fix nullcontext (mne-tools#7908)
larsoner added a commit to larsoner/mne-python that referenced this pull request Jun 25, 2020
@larsoner
Merge remote-tracking branch 'upstream/master' into resize
3f48e4e 
* upstream/master: (23 commits)
  MAINT: Add mne.surface to docstring tests (mne-tools#7930)
  MRG: Add smoothing controller to TimeViewer for the notebook backend (mne-tools#7928)
  MRG: TimeViewer matplotlib figure color (mne-tools#7925)
  fix typos (mne-tools#7924)
  MRG, ENH: Add method to project onto max power ori (mne-tools#7883)
  WIP: Warn if untested NIRX device (mne-tools#7905)
  MRG, BUG: Fix bug with volume morph and subject_to!="fsaverage" (mne-tools#7896)
  MRG, MAINT: Clean up use of bool, float, int (mne-tools#7917)
  ENH: Better error message for incompatible Evoked objects (mne-tools#7910)
  try to fix nullcontext (mne-tools#7908)
  WIP: Fix Travis (mne-tools#7906)
  WIP: Prototype of notebook viz (screencast) (mne-tools#7758)
  MRG, FIX: Speed up I/O tests, mark some slow (mne-tools#7904)
  Proper attribution for Blender tutorial (mne-tools#7900)
  MAINT: Check usage [ci skip] (mne-tools#7902)
  Allow find_bad_channels_maxwell() to return scores (mne-tools#7845)
  Warn if NIRx directory structure has been modified from original format (mne-tools#7898)
  Pin pvyista to 0.24.3 (mne-tools#7899)
  MRG: Add support for reading and writing sufaces to .obj (mne-tools#7824)
  Fix _auto_topomap_coords docstring. (mne-tools#7895)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@agramfort agramfort agramfort approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Python version dependency issue
3 participants
@drammock @larsoner @agramfort