Skip to content

[3.12] Update Python to 3.12.15 #940

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.

Sign up for GitHub

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

Open
msarahan wants to merge 1 commit into
base: 3.12
Choose a base branch
from
Open

[3.12] Update Python to 3.12.15 #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{% set version = "3.12.14" %}
{% set version = "3.12.15" %}
{% set dev = "" %}
{% set dev_ = "" %}
{% set ver2 = '.'.join(version.split('.')[0:2]) %}
{% set ver2nd = ''.join(version.split('.')[0:2]) %}
{% set ver3nd = ''.join(version.split('.')[0:3]) %}
{% set build_number = 3 %}
{% set build_number = 0 %}

# this makes the linter happy
{% set channel_targets = channel_targets or 'conda-forge main' %}
Expand Down Expand Up @@ -45,7 +45,7 @@ package:
source:
- url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz
# sha256 from: https://www.python.org/downloads/release/python-{{ ver3nd }}{{ dev }}/
sha256: 5c8462af5790baf43a321a1559dbe0db06d1be4300fb85fb53c40060668e548a
sha256: c2c4321961fab0fb999d66e0cecf521c2ab3994c7992873ea99e306c1094fd5a
patches:
- patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
- patches/0002-Win32-Do-not-download-externals.patch
Expand Down
26 changes: 17 additions & 9 deletions recipe/patches/0018-Unvendor-expat.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ Date: Wed, 29 Mar 2023 23:07:10 -0500
Subject: [PATCH 18/23] Unvendor expat

---
PCbuild/_elementtree.vcxproj | 26 ++----------
PCbuild/_elementtree.vcxproj.filters | 59 ----------------------------
PCbuild/pyexpat.vcxproj | 14 ++-----
PCbuild/pyexpat.vcxproj.filters | 23 -----------
4 files changed, 8 insertions(+), 114 deletions(-)
PCbuild/_elementtree.vcxproj | 27 ++----------
PCbuild/_elementtree.vcxproj.filters | 62 ----------------------------
PCbuild/pyexpat.vcxproj | 15 ++-----
PCbuild/pyexpat.vcxproj.filters | 26 -----------
4 files changed, 8 insertions(+), 122 deletions(-)

diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj
index 964c95c9f7e..de476a6adde 100644
--- a/PCbuild/_elementtree.vcxproj
+++ b/PCbuild/_elementtree.vcxproj
@@ -93,37 +93,19 @@
@@ -93,38 +93,19 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
Expand All @@ -37,6 +37,7 @@ index 964c95c9f7e..de476a6adde 100644
- <ClInclude Include="..\Modules\expat\expat_config.h" />
- <ClInclude Include="..\Modules\expat\expat_external.h" />
- <ClInclude Include="..\Modules\expat\fallthrough.h" />
- <ClInclude Include="..\Modules\expat\hash_table.h" />
- <ClInclude Include="..\Modules\expat\iasciitab.h" />
- <ClInclude Include="..\Modules\expat\internal.h" />
- <ClInclude Include="..\Modules\expat\latin1tab.h" />
Expand All @@ -60,7 +61,7 @@ diff --git a/PCbuild/_elementtree.vcxproj.filters b/PCbuild/_elementtree.vcxproj
index f6b55d8ff82..88a13faa683 100644
--- a/PCbuild/_elementtree.vcxproj.filters
+++ b/PCbuild/_elementtree.vcxproj.filters
@@ -17,69 +17,10 @@
@@ -17,72 +17,10 @@
<UniqueIdentifier>{f99990ba-cd06-40cc-8f28-d2d424ec13be}</UniqueIdentifier>
</Filter>
</ItemGroup>
Expand All @@ -83,6 +84,9 @@ index f6b55d8ff82..88a13faa683 100644
- <ClInclude Include="..\Modules\expat\fallthrough.h">
- <Filter>Header Files\expat</Filter>
- </ClInclude>
- <ClInclude Include="..\Modules\expat\hash_table.h">
- <Filter>Header Files\expat</Filter>
- </ClInclude>
- <ClInclude Include="..\Modules\expat\iasciitab.h">
- <Filter>Header Files\expat</Filter>
- </ClInclude>
Expand Down Expand Up @@ -134,7 +138,7 @@ diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj
index d159933293a..e253b39c866 100644
--- a/PCbuild/pyexpat.vcxproj
+++ b/PCbuild/pyexpat.vcxproj
@@ -90,25 +90,19 @@
@@ -90,26 +90,19 @@
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup>
<ClCompile>
Expand All @@ -152,6 +156,7 @@ index d159933293a..e253b39c866 100644
</ItemDefinitionGroup>
- <ItemGroup>
- <ClInclude Include="..\Modules\expat\fallthrough.h" />
- <ClInclude Include="..\Modules\expat\hash_table.h" />
- <ClInclude Include="..\Modules\expat\memory_sanitizer.h" />
- <ClInclude Include="..\Modules\expat\xmlrole.h" />
- <ClInclude Include="..\Modules\expat\xmltok.h" />
Expand All @@ -168,14 +173,17 @@ diff --git a/PCbuild/pyexpat.vcxproj.filters b/PCbuild/pyexpat.vcxproj.filters
index 230531033fc..b8280b4049c 100644
--- a/PCbuild/pyexpat.vcxproj.filters
+++ b/PCbuild/pyexpat.vcxproj.filters
@@ -11,33 +11,10 @@
@@ -11,36 +11,10 @@
<UniqueIdentifier>{f1dbbdb5-41e5-4a88-bf8e-13da010c0ce4}</UniqueIdentifier>
</Filter>
</ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\Modules\expat\fallthrough.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\Modules\expat\hash_table.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\Modules\expat\memory_sanitizer.h">
- <Filter>Header Files</Filter>
- </ClInclude>
Expand Down
Loading