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.

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

update tornado dependency to 2.1 #821

Merged
merged 2 commits into from Sep 24, 2011
Merged

update tornado dependency to 2.1 #821

merged 2 commits into from Sep 24, 2011

Conversation

minrk
Copy link
Member

@minrk minrk commented Sep 23, 2011

The notebook server will no longer try to launch with 2.0.

Test imports and install doc updated to match.

The only reason I didn't push directly to master is that 2.0 will technically still work with some browser versions.

But I don't think there's any need to support 2.0.

The notebook server will no longer try to launch with 2.0.

Test imports and install doc updated to match.
@fperez
Copy link
Member

fperez commented Sep 23, 2011

Other than the minor comment above, +1 from me. Merge away once you've decided what to do there.

Thanks!

* test_for uses import_item, instead of __import__
* test_for now allows a callback, for processing the result of import_item prior to comparison with min_zmq
* callback is only called when min_zmq is defined
* callback's default is to just return mod.__version__
* use this to check tornado version, and zmq as a version tuple
* fix pexpect check to use external.pexpect
@minrk
Copy link
Member Author

minrk commented Sep 24, 2011

test_for updated with a callback for processing, so it can do more sophisticated things. the zmq check has been updated to use it, and the pexpect check was also wrong (checked for pexpect instead of external.pexpect).

@fperez
Copy link
Member

fperez commented Sep 24, 2011

great, thanks! Merging now.

fperez added a commit that referenced this pull request Sep 24, 2011
update tornado dependency to 2.1, fixes to test_for in setup scripts.
@fperez fperez merged commit 2ecf55e into ipython:master Sep 24, 2011
mattvonrocketstein pushed a commit to mattvonrocketstein/ipython that referenced this pull request Nov 3, 2014
update tornado dependency to 2.1, fixes to test_for in setup scripts.
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.

None yet

2 participants