Skip to content

Conversation

@aschatten
Copy link

@jarondl this is an updated version of #150. Had to re-create because I somehow messed up my branch and was not merge upstream changes properly.
Fixes #93.

@aschatten
Copy link
Author

Travis build fails for 3.5, though I see no errors running it with tox. Looks like it's not related to my change.

@pganssle
Copy link
Member

pganssle commented Dec 4, 2015

@aschatten Not sure why, I think one of my responses got eaten by e-mail or something. I restarted the build and that fixed the Python 3.5 issue.

Did you do some weird rebasing on this branch or something? This PR seems to have a bunch of already-merged commits in it for some reason.

@aschatten
Copy link
Author

@pganssle thanks for restarting the build. The diff looks right to me, but indeed history seems to be too wide. I can re-create the branch and make a new PR tomorrow.

@pganssle
Copy link
Member

@aschatten Did you ever create a new version of this with the right history?

@pganssle pganssle added this to the 2.5.1 milestone Feb 18, 2016
@aschatten aschatten force-pushed the issue_93_parse_tz_full_name branch from 0a3d645 to 8627841 Compare March 3, 2016 08:20
@aschatten aschatten force-pushed the issue_93_parse_tz_full_name branch from 8627841 to 9128310 Compare March 3, 2016 08:33
@aschatten
Copy link
Author

@pganssle I was finally able to fix the history.

@pganssle
Copy link
Member

pganssle commented Mar 3, 2016

Thanks, much nicer now. I'll look at this more throughly ASAP and target inclusion in the 2.5.1 release.

@pganssle pganssle modified the milestones: 2.5.1, Next bugfix release Mar 3, 2016
@pganssle
Copy link
Member

pganssle commented Mar 8, 2016

@aschatten Sorry to be a pain, but after some extensive changes to the tests, it looks like this is going to need to be rebased to the current master.

I can probably apply the changes myself, but I'm not so good with git that I can guarantee that contributions are properly attributed in the git history, so it's probably best if you do it. If you want me to just go ahead and try myself let me know.

@aschatten
Copy link
Author

@pganssle No problem at all! I will apply the changes myself. I am thinking that I will be able to get it done this weekend.

@pganssle pganssle modified the milestones: Next bugfix release, 2.5.1 Mar 17, 2016
@pganssle
Copy link
Member

I pushed this to the next release since it's not particularly urgent. Will merge whenever the rebase is ready.

@pganssle
Copy link
Member

@aschatten FYI, looks like a new time zone database update is going to be released soon. I'm trying to get out point releases soon after tzdb updates (at least for now), so I think that will be the next opportunity to get this into the stable version of dateutil.

@pganssle pganssle modified the milestones: 2.5.2, Bugfix release Mar 18, 2016
@pganssle
Copy link
Member

@aschatten FYI, I was able to merge this locally without a problem. I'm working out some kinks before pushing the merged branch to master.

tmplst = tmplst.union(info[0])
tz_parserinfo.info = (tmplst, max(3, info[1]))

return tz_parserinfo.info
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aschatten Can you explain what this is supposed to be? I get the sense that it's for identifying strings that might be time zones we know about, but what is the 2nd parameter for? The maximum number of segments it could be?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pganssle You are right, 1st parameter is a set of possible prefixes and 2nd – maximum number of segments in a full timezone name.

@pganssle pganssle modified the milestones: 2.6.0, 2.5.2 Mar 24, 2016
@pganssle
Copy link
Member

Superceded by #227.

@pganssle pganssle closed this Mar 24, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants