Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{% set version = "3.14.7" %}
{% set version = "3.14.8" %}
{% 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 = 6 %}
{% set build_number = 0 %}

# this makes the linter happy
{% set channel_targets = channel_targets or 'conda-forge main' %}
Expand Down Expand Up @@ -64,7 +64,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: 3b48dac8fb59f62eaa67ac83c1eb12bda1b7a08406dd286e252c11a66be27f81
sha256: c2215904f02b175596dc49351585104f4bc20341e1c47378b26a2c274360ce73
patches:
- patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
- patches/0002-Win32-Do-not-download-externals.patch
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0005-Unvendor-openssl.patch
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ index ce4a7781fbd..253aa66f477 100644
- <libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir>
- <libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir>
<mpdecimalDir Condition="$(mpdecimalDir) == ''">$(ExternalsDir)\mpdecimal-4.0.0\</mpdecimalDir>
- <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.5.7\</opensslDir>
- <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.5.7\$(ArchName)\</opensslOutDir>
- <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.5.9\</opensslDir>
- <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.5.9\$(ArchName)\</opensslOutDir>
- <opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir>
<nasmDir Condition="$(nasmDir) == ''">$(ExternalsDir)\nasm-2.11.06\</nasmDir>
- <zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.3.1\</zlibDir>
Expand Down
26 changes: 17 additions & 9 deletions recipe/patches/0018-Unvendor-expat.patch
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/26] 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 fb1589557da..f47bcd8e4e6 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 fb1589557da..f47bcd8e4e6 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 833ab5e9f7e..ec5d4b64b3c 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 833ab5e9f7e..ec5d4b64b3c 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