update tornado dependency to 2.1 #821

Merged
merged 2 commits into from Sep 24, 2011

Conversation

Projects
None yet
2 participants
@minrk
Member

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.

update tornado dependency to 2.1
The notebook server will no longer try to launch with 2.0.

Test imports and install doc updated to match.
@fperez

This comment has been minimized.

Show comment
Hide comment
@fperez

fperez Sep 23, 2011

My only thought here is that I wonder if it wouldn't be nicer to keep using test_for(), just to keep the code in iptest more regular, and simply teach test_for how to check something other than __version__.

I leave it as a suggestion for you, but I don't feel super strongly about it, so I'll leave the final choice up to you.

My only thought here is that I wonder if it wouldn't be nicer to keep using test_for(), just to keep the code in iptest more regular, and simply teach test_for how to check something other than __version__.

I leave it as a suggestion for you, but I don't feel super strongly about it, so I'll leave the final choice up to you.

This comment has been minimized.

Show comment
Hide comment
@minrk

minrk Sep 23, 2011

Owner

__version__ is so common, that I think special casing the exceptions makes sense. We might want to make some changes, since string comparison is risky, given that the next version of zmq is most likely to be 2.1.10, which will fail our test for 2.1.4.

Owner

minrk replied Sep 23, 2011

__version__ is so common, that I think special casing the exceptions makes sense. We might want to make some changes, since string comparison is risky, given that the next version of zmq is most likely to be 2.1.10, which will fail our test for 2.1.4.

This comment has been minimized.

Show comment
Hide comment
@fperez

fperez Sep 23, 2011

I guess I'm not sure what you mean by your reply: do you want to do the special-casing inside test_for or in the iptest file itself? We certainly need to handle the other-than-__version__ cases somewhere, I was just thinking we might be better off putting all that inside test_for, that's all.

I guess I'm not sure what you mean by your reply: do you want to do the special-casing inside test_for or in the iptest file itself? We certainly need to handle the other-than-__version__ cases somewhere, I was just thinking we might be better off putting all that inside test_for, that's all.

This comment has been minimized.

Show comment
Hide comment
@minrk

minrk Sep 23, 2011

Owner

I was simultaneously saying we don't need to change it to support tornado, but we do still need to change it to support two-digit sub-versions. I'll make a quick tweak so that check_for uses importstring.import_item, and make the zmq versioncheck fix as well.

Owner

minrk replied Sep 23, 2011

I was simultaneously saying we don't need to change it to support tornado, but we do still need to change it to support two-digit sub-versions. I'll make a quick tweak so that check_for uses importstring.import_item, and make the zmq versioncheck fix as well.

This comment has been minimized.

Show comment
Hide comment
@fperez

fperez Sep 23, 2011

sounds good, thanks!

sounds good, thanks!

@fperez

This comment has been minimized.

Show comment
Hide comment
@fperez

fperez Sep 23, 2011

Member

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

Thanks!

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!

allow more processing in test_for
* 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

This comment has been minimized.

Show comment
Hide comment
@minrk

minrk Sep 24, 2011

Member

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).

Member

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

This comment has been minimized.

Show comment
Hide comment
@fperez

fperez Sep 24, 2011

Member

great, thanks! Merging now.

Member

fperez commented Sep 24, 2011

great, thanks! Merging now.

fperez added a commit that referenced this pull request Sep 24, 2011

Merge pull request #821 from minrk/tornado21
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

Merge pull request #821 from minrk/tornado21
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