Skip to content

Conversation

@mscheltienne
Copy link
Member

Closes #10941

@mscheltienne mscheltienne changed the title Replace check_version from _testing.py with the same function in check.py MRG: Replace check_version from _testing.py with the same function in check.py Jul 25, 2022
@agramfort agramfort requested a review from hoechenberger July 26, 2022 07:21
@hoechenberger hoechenberger enabled auto-merge (squash) July 26, 2022 08:06
@mscheltienne
Copy link
Member Author

@hoechenberger
Copy link
Member

@larsoner It appears I cannot override the auto-merge-on-tests-pass thing, so now this PR is sitting here and I cannot merge it :(

@cbrnr cbrnr disabled auto-merge July 26, 2022 12:15
@cbrnr
Copy link
Contributor

cbrnr commented Jul 26, 2022

I disabled auto-merge and rebased, but it seems like all checks still need to pass.

@larsoner larsoner enabled auto-merge (squash) July 26, 2022 13:59
@larsoner larsoner merged commit 622dc0c into mne-tools:main Jul 26, 2022
@mscheltienne mscheltienne deleted the check_version branch July 26, 2022 16:55
larsoner added a commit to alexrockhill/mne-python that referenced this pull request Jul 27, 2022
* upstream/main:
  FIX: ctf data can sometimes have no date time. (mne-tools#10957)
  replace check_version from _testing.py with the one in check.py (mne-tools#10958)
  ENH:  mne-tools#10542 Adds __eq__() to DigMontage class and updates tests. (mne-tools#10942)
  Use HiDPI icons with PyQt5/PySide2 (mne-tools#10956)
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.

Duplicate function check:check_version and _testing:check_version with 2 slightly different behaviors

4 participants