-
-
Notifications
You must be signed in to change notification settings - Fork 17.7k
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
CLN: Dead version checking code post minimum version bump #27063
Merged
jreback
merged 9 commits into
pandas-dev:master
from
mroeschke:clean_dateutil_version_tests
Jun 27, 2019
Merged
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
dcce744
Remove dateutil version check tests
1dc8845
Remove more dead version checking code
32fcd00
Flake8 and fix bs4 comparison
124b2c5
Use import_optional_dependency again
5b8a54f
Remove unused import
99bbc06
Merge remote-tracking branch 'upstream/master' into clean_dateutil_ve…
345cf3f
Change bs4 import test to check for ImportError and add whatsnew
de1d276
Some linting
33259db
noqa necessary imports
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,5 @@ | ||
from distutils.version import LooseVersion | ||
import pprint | ||
|
||
import dateutil | ||
import pytest | ||
import pytz # noqa # a test below uses pytz but only inside a `eval` call | ||
|
||
|
@@ -10,13 +8,8 @@ | |
|
||
class TestTimestampRendering: | ||
|
||
# dateutil zone change (only matters for repr) | ||
if LooseVersion(dateutil.__version__) >= LooseVersion('2.6.0'): | ||
timezones = ['UTC', 'Asia/Tokyo', 'US/Eastern', | ||
'dateutil/US/Pacific'] | ||
else: | ||
timezones = ['UTC', 'Asia/Tokyo', 'US/Eastern', | ||
'dateutil/America/Los_Angeles'] | ||
timezones = ['UTC', 'Asia/Tokyo', 'US/Eastern', | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. prob should use our fixture for these (future PR) |
||
'dateutil/US/Pacific'] | ||
|
||
@pytest.mark.parametrize('tz', timezones) | ||
@pytest.mark.parametrize('freq', ['D', 'M', 'S', 'N']) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does
bs4 = import_optional_dependency('bs4')
work here? I don't recall why I didn't use it.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So this actually done above:
But I think you're right;
bs4 = import_optional_dependency('bs4')
can be called here again with the raising behavior.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah so this wasn't changed because
import_optional_dependency
will raise aImportError
while this path raises aValueError
(there's a test for this).I think it's worth changing to an
ImportError
. Thoughts @TomAugspurger?