Skip to content

bpo-40683: Add zoneinfo to LIBSUBDIRS#20229

Merged
pganssle merged 1 commit into
python:masterfrom
pganssle:include_zoneinfo
May 19, 2020
Merged

bpo-40683: Add zoneinfo to LIBSUBDIRS#20229
pganssle merged 1 commit into
python:masterfrom
pganssle:include_zoneinfo

Conversation

@pganssle

@pganssle pganssle commented May 19, 2020

Copy link
Copy Markdown
Member

Without this, only the _zoneinfo module is getting installed, not the zoneinfo module. I believe this was not noticed earlier because test.test_zoneinfo was also not being installed.

With this fix, the tests are passing correctly locally:

$ TARGET_DIR=$(mktemp -d)
$ ./configure --prefix=$TARGET_DIR 1>/dev/null
$ make -j 1>/dev/null && make 1>/dev/null
$ $TARGET_DIR/bin/python3 -m test test_zoneinfo
0:00:00 load avg: 3.02 Run tests sequentially
0:00:00 load avg: 3.02 [1/1] test_zoneinfo

== Tests result: SUCCESS ==

1 test OK.

Total duration: 288 ms
Tests result: SUCCESS

https://bugs.python.org/issue40683

Without this, only the _zoneinfo module is getting installed, not the
zoneinfo module. I believe this was not noticed earlier because
test.test_zoneinfo was also not being installed.
@pganssle
pganssle force-pushed the include_zoneinfo branch from 5ae6d36 to 0b72dc4 Compare May 19, 2020 14:54

@vstinner vstinner left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM with a nitpick comment :-D

Comment thread Makefile.pre.in
Comment on lines +1454 to +1455
curses pydoc_data \
zoneinfo

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

nitpick:

Suggested change
curses pydoc_data \
zoneinfo
curses pydoc_data zoneinfo

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

What's the rule here? I don't know what pydoc_data is, but it seems like everything else is separated along conceptual lines (unittest stuff by itself, venv stuff by itself, asyncio by itself, etc).

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

There is no rule. Only personal perferences. I would expect sorting, but it seems like we lost that long time ago.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

You're free to ignore my coding-style comment ;-)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

OK, I think I prefer it to be separated conceptually. Would be good to actually have a rule at some point (maybe with an autoformatter). I'm going to go ahead and merge.

@pganssle
pganssle merged commit 2abeded into python:master May 19, 2020
@bedevere-bot

Copy link
Copy Markdown

@pganssle: Please replace # with GH- in the commit message next time. Thanks!

@miss-islington

Copy link
Copy Markdown
Contributor

Thanks @pganssle for the PR 🌮🎉.. I'm working now to backport this PR to: 3.9.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@bedevere-bot

Copy link
Copy Markdown

GH-20230 is a backport of this pull request to the 3.9 branch.

miss-islington added a commit that referenced this pull request May 19, 2020
Without this, only the _zoneinfo module is getting installed, not the
zoneinfo module. I believe this was not noticed earlier because
test.test_zoneinfo was also not being installed.
(cherry picked from commit 2abeded)

Co-authored-by: Paul Ganssle <paul@ganssle.io>
arturoescaip pushed a commit to arturoescaip/cpython that referenced this pull request May 24, 2020
Without this, only the _zoneinfo module is getting installed, not the
zoneinfo module. I believe this was not noticed earlier because
test.test_zoneinfo was also not being installed.
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.

5 participants