More unixy layout for windows

conda-forge.yml

@@ -9,6 +9,8 @@ build_platform:
   linux_aarch64: linux_64
   linux_ppc64le: linux_64
   osx_arm64: osx_64
+workflow_settings:
+  store_build_artifacts: true
 conda_build:
   pkg_format: '2'
 conda_forge_output_validation: true

recipe/build_base.bat

@@ -85,40 +85,39 @@ for %%x in (python%THREAD%%_D%.pdb python%VERNODOTS%%THREAD%%_D%.pdb pythonw%THR
 
 @echo on
 
-copy %SRC_DIR%\LICENSE %PREFIX%\LICENSE_PYTHON.txt
+mkdir %PREFIX%\lib\python
+copy %SRC_DIR%\LICENSE %PREFIX%\lib\python\LICENSE_PYTHON.txt
 if errorlevel 1 exit 1
 
 :: Populate the DLLs directory
-mkdir %PREFIX%\DLLs
-xcopy /s /y %SRC_DIR%\PCBuild\%BUILD_PATH%\*.pyd %PREFIX%\DLLs\
+mkdir %PREFIX%\lib\python\lib-dynload
+xcopy /s /y %SRC_DIR%\PCBuild\%BUILD_PATH%\*.pyd %PREFIX%\lib\python\lib-dynload
 if errorlevel 1 exit 1
 
-copy /Y %SRC_DIR%\PC\icons\py.ico %PREFIX%\DLLs\
+copy /Y %SRC_DIR%\PC\icons\py.ico %PREFIX%\lib\python\lib-dynload
 if errorlevel 1 exit 1
-copy /Y %SRC_DIR%\PC\icons\pyc.ico %PREFIX%\DLLs\
+copy /Y %SRC_DIR%\PC\icons\pyc.ico %PREFIX%\lib\python\lib-dynload
 if errorlevel 1 exit 1
 
-:: Populate the Tools directory
-mkdir %PREFIX%\Tools
-xcopy /s /y /i %SRC_DIR%\Tools\i18n %PREFIX%\Tools\i18n
-if errorlevel 1 exit 1
-xcopy /s /y /i %SRC_DIR%\Tools\scripts %PREFIX%\Tools\scripts
+mkdir %PREFIX%\lib\python\Tools
+xcopy /s /y /i %SRC_DIR%\Tools\scripts %PREFIX%\lib\python\Tools\scripts
 if errorlevel 1 exit 1
 
-del %PREFIX%\Tools\scripts\README
+del %PREFIX%\lib\python\Tools\scripts\README
 if errorlevel 1 exit 1
-del %PREFIX%\Tools\scripts\idle3
+del %PREFIX%\lib\python\Tools\scripts\idle3
 if errorlevel 1 exit 1
 
-move /y %PREFIX%\Tools\scripts\pydoc3 %PREFIX%\Tools\scripts\pydoc3.py
+move /y %PREFIX%\lib\python\Tools\scripts\pydoc3 %PREFIX%\lib\python\Tools\scripts\pydoc3.py
 if errorlevel 1 exit 1
 
 :: Populate the include directory
-xcopy /s /y %SRC_DIR%\Include %PREFIX%\include\
+mkdir %PREFIX%\include\python
+xcopy /s /y %SRC_DIR%\Include %PREFIX%\include\python\
 if errorlevel 1 exit 1
 
 :: Copy generated pyconfig.h
-copy /Y %SRC_DIR%\PC\pyconfig.h %PREFIX%\include\
+copy /Y %SRC_DIR%\PC\pyconfig.h %PREFIX%\include\python\
 if errorlevel 1 exit 1
 
 :: Populate the Scripts directory
@@ -131,58 +130,58 @@ for %%x in (idle pydoc) do (
 )
 
 :: Populate the libs directory
-if not exist %PREFIX%\libs mkdir %PREFIX%\libs
+if not exist %PREFIX%\lib mkdir %PREFIX%\lib
 dir %SRC_DIR%\PCbuild\%BUILD_PATH%\
-if exist %SRC_DIR%\PCbuild\%BUILD_PATH%\python%VERNODOTS%%THREAD%%_D%.lib copy /Y %SRC_DIR%\PCbuild\%BUILD_PATH%\python%VERNODOTS%%THREAD%%_D%.lib %PREFIX%\libs\
+if exist %SRC_DIR%\PCbuild\%BUILD_PATH%\python%VERNODOTS%%THREAD%%_D%.lib copy /Y %SRC_DIR%\PCbuild\%BUILD_PATH%\python%VERNODOTS%%THREAD%%_D%.lib %PREFIX%\lib\
 if errorlevel 1 exit 1
-if exist %SRC_DIR%\PCbuild\%BUILD_PATH%\python3%THREAD%%_D%.lib copy /Y %SRC_DIR%\PCbuild\%BUILD_PATH%\python3%THREAD%%_D%.lib %PREFIX%\libs\
+if exist %SRC_DIR%\PCbuild\%BUILD_PATH%\python3%THREAD%%_D%.lib copy /Y %SRC_DIR%\PCbuild\%BUILD_PATH%\python3%THREAD%%_D%.lib %PREFIX%\lib\
 if errorlevel 1 exit 1
-if exist %SRC_DIR%\PCbuild\%BUILD_PATH%\_tkinter%THREAD%%_D%.lib copy /Y %SRC_DIR%\PCbuild\%BUILD_PATH%\_tkinter%THREAD%%_D%.lib %PREFIX%\libs\
+if exist %SRC_DIR%\PCbuild\%BUILD_PATH%\_tkinter%THREAD%%_D%.lib copy /Y %SRC_DIR%\PCbuild\%BUILD_PATH%\_tkinter%THREAD%%_D%.lib %PREFIX%\lib\
 if errorlevel 1 exit 1
 
 
-:: Populate the Lib directory
-del %PREFIX%\libs\libpython*.a
-xcopy /s /y %SRC_DIR%\Lib %PREFIX%\Lib\
+:: Populate the lib directory
+del %PREFIX%\lib\libpython*.a
+xcopy /s /y %SRC_DIR%\lib %PREFIX%\lib\python\
 if errorlevel 1 exit 1
 
 :: Copy venv[w]launcher scripts to venv\srcipts\nt
-:: See https://github.com/python/cpython/blob/b4a316087c32d83e375087fd35fc511bc430ee8b/Lib/venv/__init__.py#L334-L376
+:: See https://github.com/python/cpython/blob/b4a316087c32d83e375087fd35fc511bc430ee8b/lib/python/venv/__init__.py#L334-L376
 if exist %SRC_DIR%\PCbuild\%BUILD_PATH%\venvlauncher%THREAD%%_D%.exe (
   @rem We did copy pythonw.exe until 3.12 but starting with 3.13 we seem to need the latter. Should we omit the first?
-  copy /Y %SRC_DIR%\PCbuild\%BUILD_PATH%\venvlauncher%THREAD%%_D%.exe %PREFIX%\Lib\venv\scripts\nt\python.exe
-  copy /Y %SRC_DIR%\PCbuild\%BUILD_PATH%\venvlauncher%THREAD%%_D%.exe %PREFIX%\Lib\venv\scripts\nt\venvlauncher%THREAD%%_D%.exe
+  copy /Y %SRC_DIR%\PCbuild\%BUILD_PATH%\venvlauncher%THREAD%%_D%.exe %PREFIX%\lib\python\venv\scripts\nt\python.exe
+  copy /Y %SRC_DIR%\PCbuild\%BUILD_PATH%\venvlauncher%THREAD%%_D%.exe %PREFIX%\lib\python\venv\scripts\nt\venvlauncher%THREAD%%_D%.exe
 ) else (
   echo "WARNING :: %SRC_DIR%\PCbuild\%BUILD_PATH%\venvlauncher%THREAD%%_D%.exe does not exist"
 )
 
 if exist %SRC_DIR%\PCbuild\%BUILD_PATH%\venvwlauncher%THREAD%%_D%.exe (
   @rem We did copy pythonw.exe until 3.12 but starting with 3.13 we seem to need the latter. Should we omit the first?
-  copy /Y %SRC_DIR%\PCbuild\%BUILD_PATH%\venvwlauncher%THREAD%%_D%.exe %PREFIX%\Lib\venv\scripts\nt\pythonw.exe
-  copy /Y %SRC_DIR%\PCbuild\%BUILD_PATH%\venvwlauncher%THREAD%%_D%.exe %PREFIX%\Lib\venv\scripts\nt\venvwlauncher%THREAD%%_D%.exe
+  copy /Y %SRC_DIR%\PCbuild\%BUILD_PATH%\venvwlauncher%THREAD%%_D%.exe %PREFIX%\lib\python\venv\scripts\nt\pythonw.exe
+  copy /Y %SRC_DIR%\PCbuild\%BUILD_PATH%\venvwlauncher%THREAD%%_D%.exe %PREFIX%\lib\python\venv\scripts\nt\venvwlauncher%THREAD%%_D%.exe
 ) else (
   echo "WARNING :: %SRC_DIR%\PCbuild\%BUILD_PATH%\venvwlauncher%THREAD%%_D%.exe does not exist"
 )
 
 :: Remove test data to save space.
 :: Though keep `support` as some things use that.
-mkdir %PREFIX%\Lib\test_keep
+mkdir %PREFIX%\lib\python\test_keep
 if errorlevel 1 exit 1
-move %PREFIX%\Lib\test\__init__.py %PREFIX%\Lib\test_keep\
+move %PREFIX%\lib\python\test\__init__.py %PREFIX%\lib\python\test_keep\
 if errorlevel 1 exit 1
-move %PREFIX%\Lib\test\support %PREFIX%\Lib\test_keep\
+move %PREFIX%\lib\python\test\support %PREFIX%\lib\python\test_keep\
 if errorlevel 1 exit 1
-rd /s /q %PREFIX%\Lib\test
+rd /s /q %PREFIX%\lib\python\test
 if errorlevel 1 exit 1
-move %PREFIX%\Lib\test_keep %PREFIX%\Lib\test
+move %PREFIX%\lib\python\test_keep %PREFIX%\lib\python\test
 if errorlevel 1 exit 1
 
 :: We need our Python to be found!
 if "%_D%" neq "" copy %PREFIX%\python%_D%.exe %PREFIX%\python.exe
 if "%EXE_T%" neq "" copy %PREFIX%\python%EXE_T%.exe %PREFIX%\python.exe
 
 :: bytecode compile the standard library
-%PREFIX%\python.exe -Wi %PREFIX%\Lib\compileall.py -f -q -x "bad_coding|badsyntax|py2_" %PREFIX%\Lib
+%PREFIX%\python.exe -Wi %PREFIX%\lib\python\compileall.py -f -q -x "bad_coding|badsyntax|py2_" %PREFIX%\lib\python
 if errorlevel 1 exit 1
 
 :: Ensure that scripts are generated

recipe/meta.yaml

@@ -32,7 +32,7 @@
 {% endif %}
 
 {% if win %}
-  {% set site_packages_path = "Lib/site-packages" %}
+  {% set site_packages_path = "lib/python/site-packages" %}
 {% elif freethreading == "yes" %}
   {% set site_packages_path = "lib/python" + ver2 + "t/site-packages" %}
 {% else %}
@@ -80,6 +80,7 @@ source:
 {% if freethreading == "yes" %}
       - patches/0026-Set-Py_GIL_DISABLED-in-windows-to-match-unix.patch
 {% endif %}
+      - patches/0027-More-unixy-layout-for-windows.patch
 
 build:
   number: {{ build_number }}
@@ -252,11 +253,11 @@ outputs:
         - test ! -f ${PREFIX}/lib/libpython${PKG_VERSION%.*}.dylib        # [osx]
         - test ! -f ${PREFIX}/lib/libpython${PKG_VERSION%.*}.nolto.a      # [unix]
         {% if freethreading == "yes" %}
-        - if not exist %PREFIX%\\libs\\python3t.lib exit 1                # [win]
-        - if not exist %PREFIX%\\libs\\python{{ ver2nd }}t.lib exit 1     # [win]
+        - if not exist %PREFIX%\\lib\\python3t.lib exit 1                # [win]
+        - if not exist %PREFIX%\\lib\\python{{ ver2nd }}t.lib exit 1     # [win]
         {% else %}
-        - if not exist %PREFIX%\\libs\\python3.lib exit 1                 # [win]
-        - if not exist %PREFIX%\\libs\\python{{ ver2nd }}.lib exit 1      # [win]
+        - if not exist %PREFIX%\\lib\\python3.lib exit 1                 # [win]
+        - if not exist %PREFIX%\\lib\\python{{ ver2nd }}.lib exit 1      # [win]
         {% endif %}
         # https://github.com/conda-forge/python-feedstock/issues/384
         - if exist %PREFIX%\\Scripts\\pydoc exit 1  # [win]
@@ -265,7 +266,7 @@ outputs:
         - if not exist %PREFIX%\\Scripts\\idle-script.py exit 1  # [win]
         - if not exist %PREFIX%\\Scripts\\idle.exe exit 1  # [win]
         - if not exist %PREFIX%\\Scripts\\pydoc.exe exit 1  # [win]
-        - if not exist %PREFIX%\\include\\pyconfig.h exit 1  # [win]
+        - if not exist %PREFIX%\\include\\python\\pyconfig.h exit 1  # [win]
         - pushd tests
         - pushd cmake
         - cmake -GNinja -DPY_VER={{ version }} -DEXTRA_COMPONENTS="Development.Module" --debug-find --trace --debug-output --debug-trycompile .

recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch

@@ -1,18 +1,18 @@
-From ffb1951d87e6554c3e0ae00b6ab8a042e085779a Mon Sep 17 00:00:00 2001
+From b52e23434aaa7b36fdf4ea835fc4d84dff2a61fc Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 16 Aug 2017 11:53:55 +0100
-Subject: [PATCH 01/26] Win32: Change FD_SETSIZE from 512 to 2048
+Subject: [PATCH 01/27] Win32: Change FD_SETSIZE from 512 to 2048
 
 https://github.com/ContinuumIO/anaconda-issues/issues/1241
 ---
  Modules/selectmodule.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
-index 137bf2ca55b..70e2d178c54 100644
+index eb3148ef246..1d88b182364 100644
 --- a/Modules/selectmodule.c
 +++ b/Modules/selectmodule.c
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
     FD_SETSIZE higher before this; e.g., via compiler /D switch.
  */
  #if defined(MS_WINDOWS) && !defined(FD_SETSIZE)

recipe/patches/0002-Win32-Do-not-download-externals.patch

@@ -1,7 +1,7 @@
-From 25b73c426a756ffea6425130b7e22b5ee544c8ff Mon Sep 17 00:00:00 2001
+From 6d2d2075042e9ac0307271fc700ae7d7bb1d21e6 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Thu, 7 Sep 2017 11:35:47 +0100
-Subject: [PATCH 02/26] Win32: Do not download externals
+Subject: [PATCH 02/27] Win32: Do not download externals
 
 ---
  PCbuild/build.bat | 2 +-

recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch

@@ -1,7 +1,7 @@
-From bd6431cd6b69c8111e1b3c72a89d5ace434c6265 Mon Sep 17 00:00:00 2001
+From a4e219363bfe395745df9c2cf5e01b6c0004021a Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Tue, 5 Dec 2017 22:47:59 +0000
-Subject: [PATCH 03/26] Fix find_library so that it looks in sys.prefix/lib
+Subject: [PATCH 03/27] Fix find_library so that it looks in sys.prefix/lib
  first
 
 ---
@@ -25,7 +25,7 @@ index 583c47daff3..ab9b01c87e2 100644
          yield os.path.join(executable_path, name[len('@executable_path/'):])
 
 diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
-index 3b21658433b..ecd2c6cbd9c 100644
+index 3b21658433b..2c900c1e2cf 100644
 --- a/Lib/ctypes/util.py
 +++ b/Lib/ctypes/util.py
 @@ -135,7 +135,8 @@ def dllist():

recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch

@@ -1,7 +1,7 @@
-From e380a8cfc9757d26d85cfe1d0c965b7415fb73ac Mon Sep 17 00:00:00 2001
+From d24fd301838f726090fb66e1d4a548cf828062a0 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Sat, 27 Oct 2018 18:48:30 +0100
-Subject: [PATCH 04/26] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
+Subject: [PATCH 04/27] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
  is not 0
 
 Co-authored-by: Isuru Fernando<isuruf@gmail.com>

recipe/patches/0005-Unvendor-openssl.patch

@@ -1,7 +1,7 @@
-From d441985a62cf37f233a6093a187e06497740069d Mon Sep 17 00:00:00 2001
+From fa96beea750f3bb06218146fa543c75b5e33120c Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Sat, 24 Nov 2018 20:38:02 -0600
-Subject: [PATCH 05/26] Unvendor openssl
+Subject: [PATCH 05/27] Unvendor openssl
 
 Co-authored-by: Isuru Fernando <isuruf@gmail.com>
 ---

recipe/patches/0006-Unvendor-sqlite3.patch

@@ -1,7 +1,7 @@
-From b9106812add3d50b2f441cf7d463725f60b9978c Mon Sep 17 00:00:00 2001
+From 24c242dbf9cf16f624d2049188fd87b7476ff424 Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Tue, 5 Oct 2021 12:42:06 -0700
-Subject: [PATCH 06/26] Unvendor sqlite3
+Subject: [PATCH 06/27] Unvendor sqlite3
 
 ---
  PCbuild/_sqlite3.vcxproj | 11 +++++------

recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch

@@ -1,7 +1,7 @@
-From 32d83eacf1dc0cb8db86f22cd310e376d5493350 Mon Sep 17 00:00:00 2001
+From 4465a70a1aa51ee58fb92a3bc317784cc37f5d57 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Tue, 24 Dec 2019 18:37:17 +0100
-Subject: [PATCH 07/26] Add CondaEcosystemModifyDllSearchPath()
+Subject: [PATCH 07/27] Add CondaEcosystemModifyDllSearchPath()
 
   The python interpreter is modifed so that it works as if the python interpreter
   was called with the following conda directories.
@@ -33,10 +33,10 @@ Co-authored-by: Isuru Fernando <isuruf@gmail.com>
  1 file changed, 95 insertions(+)
 
 diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
-index 711e7bc89b7..89ad70f2105 100644
+index 5da0f3e5be3..d62ba38f3fb 100644
 --- a/Python/pylifecycle.c
 +++ b/Python/pylifecycle.c
-@@ -85,6 +85,10 @@
+@@ -90,6 +90,10 @@
 
  #ifdef MS_WINDOWS
  #  undef BYTE
@@ -47,7 +47,7 @@ index 711e7bc89b7..89ad70f2105 100644
  #endif
 
  #define PUTS(fd, str) (void)_Py_write_noraise(fd, str, (int)strlen(str))
-@@ -119,6 +123,93 @@ GENERATE_DEBUG_SECTION(PyRuntime, _PyRuntimeState _PyRuntime)
+@@ -124,6 +128,93 @@ GENERATE_DEBUG_SECTION(PyRuntime, _PyRuntimeState _PyRuntime)
  = _PyRuntimeState_INIT(_PyRuntime, _Py_Debug_Cookie);
  _Py_COMP_DIAG_POP
 
@@ -141,7 +141,7 @@ index 711e7bc89b7..89ad70f2105 100644
 
  static int runtime_initialized = 0;
 
-@@ -136,6 +227,10 @@ _PyRuntime_Initialize(void)
+@@ -141,6 +232,10 @@ _PyRuntime_Initialize(void)
      }
      runtime_initialized = 1;
 

recipe/patches/0008-Doing-d1trimfile.patch

@@ -1,7 +1,7 @@
-From 9a38ec4f30d8ec426af73ff082b696dd31d3dcbb Mon Sep 17 00:00:00 2001
+From b985873fd8df7c9160e604760fb3f56a727858e1 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Tue, 31 Dec 2019 21:47:47 +0100
-Subject: [PATCH 08/26] Doing d1trimfile
+Subject: [PATCH 08/27] Doing d1trimfile
 
 ---
  PCbuild/_asyncio.vcxproj            | 20 ++++++++++++++++++++

recipe/patches/0009-cross-compile-darwin.patch

@@ -1,7 +1,7 @@
-From 323229d393ca44056d519d8b926ac57d900f6fa9 Mon Sep 17 00:00:00 2001
+From e8271f4d9ee63e19ddc13f0eeda6e8f85d04e281 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Fri, 2 Oct 2020 00:03:12 +0200
-Subject: [PATCH 09/26] cross compile darwin
+Subject: [PATCH 09/27] cross compile darwin
 
 By Isuru Fernando.
 ---
@@ -29,10 +29,10 @@ index 9d7aa5c66a9..2401eff96df 100644
      try:
          import plistlib
 diff --git a/configure b/configure
-index eca5f03cdcf..0595b8dc8c2 100755
+index 4726b4fe310..3dd96b59b86 100755
 --- a/configure
 +++ b/configure
-@@ -4140,6 +4140,9 @@ then
+@@ -4142,6 +4142,9 @@ then
  	*-*-linux*)
  		ac_sys_system=Linux
  		;;
@@ -42,18 +42,18 @@ index eca5f03cdcf..0595b8dc8c2 100755
  	*-*-cygwin*)
  		ac_sys_system=Cygwin
  		;;
-@@ -4619,6 +4622,9 @@ if test "$cross_compiling" = yes; then
- 			_host_ident=$host_cpu
+@@ -4625,6 +4628,9 @@ if test "$cross_compiling" = yes; then
  		esac
  		;;
-+	*-*-darwin*)
+ 	*-gnu)
 +		_host_ident=$host_cpu
-+		;;
- 	*-*-cygwin*)
- 		_host_ident=
++                ;;
++	*-*-darwin*)
+ 		_host_ident=$host_cpu
  		;;
+ 	*-*-cygwin*)
 diff --git a/configure.ac b/configure.ac
-index c21024a1e77..9a63e9bbaef 100644
+index dd860292cc2..3d9f990e3d9 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -333,6 +333,9 @@ then
@@ -66,9 +66,9 @@ index c21024a1e77..9a63e9bbaef 100644
  	*-*-cygwin*)
  		ac_sys_system=Cygwin
  		;;
-@@ -780,6 +783,9 @@ if test "$cross_compiling" = yes; then
- 			_host_ident=$host_cpu
- 		esac
+@@ -786,6 +789,9 @@ if test "$cross_compiling" = yes; then
+ 	*-gnu)
+ 		_host_ident=$host_cpu
  		;;
 +	*-*-darwin*)
 +		_host_ident=$host_cpu

recipe/patches/0010-Fix-TZPATH-on-windows.patch

@@ -1,14 +1,14 @@
-From 1848c4134c71cda587ff04bea02e59cb2347669d Mon Sep 17 00:00:00 2001
+From c78be3cb671eaa661890d197931c868e227e6bbd Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Wed, 7 Oct 2020 10:08:30 -0500
-Subject: [PATCH 10/26] Fix TZPATH on windows
+Subject: [PATCH 10/27] Fix TZPATH on windows
 
 ---
  Lib/sysconfig/__init__.py | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py
-index 8ff9c99435b..2caf1862ba0 100644
+index 47415adce04..654a1ef225f 100644
 --- a/Lib/sysconfig/__init__.py
 +++ b/Lib/sysconfig/__init__.py
 @@ -175,6 +175,7 @@ def joinuser(*args):