Skip to content

[FIX] Errors parsing $DISPLAY #2363

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
Merged
merged 14 commits into from
Jan 19, 2018
Merged

[FIX] Errors parsing $DISPLAY #2363

merged 14 commits into from
Jan 19, 2018

Conversation

oesteban
Copy link
Contributor

@oesteban oesteban commented Jan 9, 2018 •
edited
Loading

The format for $DISPLAY is <host>:<display>[.<screen>]. When
screen is specified, the config object fails.

This patch fixes #2362

EDIT: extra addons

  • New parametric test for the new feature
  • Added tests mocking Mac and non-Mac systems
  • Skip tests that would always fail in Mac systems

@oesteban
[FIX] Errors parsing $DISPLAY
1a35f44 
The format for ``$DISPLAY`` is ``<host>:<display>[.<screen>]``. When
screen is specified, the config object fails.

This patch fixes nipy#2362
@oesteban
add test
e1ef2e5
@oesteban
Update CHANGES
6a9bc46
@oesteban
fix test name
2383177
@oesteban
fix implementation of get_display()
fbac4ee
@oesteban
use mokeypatch.setenv
4dc5896
@oesteban
fix test for Travis and Circle
5de504a
@oesteban
Copy link
Contributor Author

Experts on Circle and Travis: why I can't redefine environment variables ($DISPLAY in particular) in any of them? I've tried both os.environ and monkeypatching. Both work locally, but fail on CI engines.

cc @satra

@oesteban
Copy link
Contributor Author

I still need to find out why tests work locally (whether it is containerized or not does not really matter) but consistently fails in Travis AND Circle. This one will need to wait.

@oesteban
Copy link
Contributor Author

Seems to work now!

@effigies
Copy link
Member

@oesteban Can you cancel https://circleci.com/gh/oesteban/nipype/942?

@effigies effigies merged commit 3c43f0c into nipy:master Jan 19, 2018
@oesteban oesteban mentioned this pull request Jan 19, 2018
Closed
@mgxd mgxd added this to the 1.0 milestone Jan 21, 2018
@chrisgorgo chrisgorgo mentioned this pull request Feb 19, 2018
Closed
@oesteban oesteban deleted the fix/displaynumber branch October 26, 2018 06:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@effigies effigies effigies approved these changes

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

Successfully merging this pull request may close these issues.

issue with MIPAV module
3 participants
@oesteban @effigies @mgxd