summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2020-05-19 16:13:15 (GMT)
committerGitHub <noreply@github.com>2020-05-19 16:13:15 (GMT)
commitb5bd4358fc2dea2e7c84d0c56974627fc43217cd (patch)
treecf4e127bf6534c89657578b9a83ba8e8fa9628ac
parent20736b35b77cac1bb6ae51661ec8efe250cb4149 (diff)
downloadcpython-b5bd4358fc2dea2e7c84d0c56974627fc43217cd.zip
cpython-b5bd4358fc2dea2e7c84d0c56974627fc43217cd.tar.gz
cpython-b5bd4358fc2dea2e7c84d0c56974627fc43217cd.tar.bz2
bpo-40683: Add zoneinfo to LIBSUBDIRS (GH-20229)
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 2abededbc4165d2daa14ae9d74b1f33cce0593d7) Co-authored-by: Paul Ganssle <paul@ganssle.io>
-rw-r--r--Makefile.pre.in4
-rw-r--r--Misc/NEWS.d/next/Build/2020-05-19-10-54-08.bpo-40683.W8JHrr.rst2
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index de50f6b..5a18704 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1429,6 +1429,7 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \
test/test_importlib/source \
test/test_importlib/zipdata01 \
test/test_importlib/zipdata02 \
+ test/test_zoneinfo test/test_zoneinfo/data \
test/ziptestdata \
asyncio \
test/test_asyncio \
@@ -1450,7 +1451,8 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \
multiprocessing multiprocessing/dummy \
unittest unittest/test unittest/test/testmock \
venv venv/scripts venv/scripts/common venv/scripts/posix \
- curses pydoc_data
+ curses pydoc_data \
+ zoneinfo
libinstall: build_all $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
diff --git a/Misc/NEWS.d/next/Build/2020-05-19-10-54-08.bpo-40683.W8JHrr.rst b/Misc/NEWS.d/next/Build/2020-05-19-10-54-08.bpo-40683.W8JHrr.rst
new file mode 100644
index 0000000..d57e064
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2020-05-19-10-54-08.bpo-40683.W8JHrr.rst
@@ -0,0 +1,2 @@
+Fixed an issue where the :mod:`zoneinfo` module and its tests were not
+included when Python is installed with ``make``.