Skip to content

Commit

Permalink
Update to 3.9.17 (#633)
Browse files Browse the repository at this point in the history
automerged PR by conda-forge/automerge-action
  • Loading branch information
github-actions[bot] authored Aug 10, 2023
2 parents 200601e + cc85acf commit 09539c3
Show file tree
Hide file tree
Showing 36 changed files with 65 additions and 67 deletions.
5 changes: 0 additions & 5 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ bzip2:
c_compiler:
- gcc
c_compiler_version:
- '11'
- '12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -13,7 +13,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '11'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libffi:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ bzip2:
c_compiler:
- gcc
c_compiler_version:
- '11'
- '12'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -17,7 +17,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '11'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
libffi:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ bzip2:
c_compiler:
- gcc
c_compiler_version:
- '11'
- '12'
cdt_name:
- cos7
channel_sources:
Expand All @@ -13,7 +13,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '11'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
libffi:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '14'
- '15'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
- '15'
libffi:
- '3.4'
macos_machine:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '14'
- '15'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
- '15'
libffi:
- '3.4'
macos_machine:
Expand Down
10 changes: 5 additions & 5 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "3.9.16" %}
{% set version = "3.9.17" %}
{% set dev = "" %}
{% set dev_ = "" %}
{% set ver2 = '.'.join(version.split('.')[0:2]) %}
Expand Down Expand Up @@ -47,7 +47,7 @@ source:
{% else %}
- url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz
# md5 from: https://www.python.org/downloads/release/python-{{ ver3nd }}/
md5: 5738c204eecc375e29751cb2176fc9cc
md5: 601fc470594f378b4339b454901f8e41
{% endif %}
patches:
- patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 93aa3a8d9975a216b942e3653b6bddf77eaf7507 Mon Sep 17 00:00:00 2001
From aab83eae5106d4bb216695bff3eeca9c9a244c68 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 1de694b53bbf8c7a5f001c02a207e23dcd85413c Mon Sep 17 00:00:00 2001
From ae833c49df9df6ed8ae30351100523e46e44b80b Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Wed, 16 Aug 2017 11:59:00 +0100
Subject: [PATCH 02/26] Win32: distutils: Add support to cygwinccompiler for
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From d90f54d2f07fa7e2c407ace36db3f244acd3322e Mon Sep 17 00:00:00 2001
From b06ec1cbb2e4549a79bd8b65013727f50904f9e7 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Wed, 16 Aug 2017 12:17:33 +0100
Subject: [PATCH 03/26] Support cross-compiling byte-code
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From e4a56df8c94c33393ad100f85073d32cbdae1f60 Mon Sep 17 00:00:00 2001
From 9d18f846399b0b0c3f4e3d68cfd4a907a987704e Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Tue, 21 Sep 2021 13:05:20 -0500
Subject: [PATCH 04/26] bpo-45258: search for -isysroot in addition to
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0963b9a6a73618fc56f882518cc8fcbc0eea9e3c Mon Sep 17 00:00:00 2001
From f0196804b6dc250ad77d63a28ff0d052311427a8 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Thu, 5 Oct 2017 02:00:41 +0100
Subject: [PATCH 05/26] runtime_library_dir_option: Use 1st word of CC as
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0006-Win32-Do-not-download-externals.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ce7d76c31a2ea5f170eae9bd99b7f7212db028f5 Mon Sep 17 00:00:00 2001
From 66c8aa39232181e7d98d263d7a4bd830cdb773bc 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 06/26] Win32: Do not download externals
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 150348f05cbbac9c756cc1ba352f45fb6c9e3b05 Mon Sep 17 00:00:00 2001
From f6883c8a7e200573f5c8f99615ba4805dc736722 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 07/26] Fix find_library so that it looks in sys.prefix/lib
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ff186e604da9f2548914b7c4bbc5bf389ace18fa Mon Sep 17 00:00:00 2001
From 0b05b5d5b54ebb6579cb9fa283d4d565e9f35eca Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Thu, 16 Sep 2021 15:46:09 -0500
Subject: [PATCH 08/26] bpo-22699: Allow compiling on debian/ubuntu with a
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 1acc68b206deb46b5e9bdcbb130e543579a2aca2 Mon Sep 17 00:00:00 2001
From dd2a03af9591b690f93e7a108e898b2c5e8f5dc3 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 09/26] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
Expand Down
6 changes: 3 additions & 3 deletions recipe/patches/0010-Unvendor-openssl.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6c114f57ac88196b59c7d1828cc9ede869726d7f Mon Sep 17 00:00:00 2001
From b517e740c088b2941f7cb00445385d6b50da26ad 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 10/26] Unvendor openssl
Expand Down Expand Up @@ -141,7 +141,7 @@ index 0da6f67495..17eee400eb 100644
<Target Name="CleanAll">
<Delete Files="$(TargetPath);$(BuildPath)$(tclDLLName)" />
diff --git a/PCbuild/python.props b/PCbuild/python.props
index c451429da2..6bb03008bf 100644
index 1b88a2ff21..c5d2952042 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -55,6 +55,7 @@
Expand All @@ -151,7 +151,7 @@ index c451429da2..6bb03008bf 100644
+ <condaDir>$(LIBRARY_PREFIX)\</condaDir>
<ExternalsDir Condition="$(ExternalsDir) == ''">$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`))</ExternalsDir>
<ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir>
<sqlite3Dir>$(ExternalsDir)sqlite-3.37.2.0\</sqlite3Dir>
</PropertyGroup>
diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
index 42b27084e0..28581d4dc4 100644
--- a/PCbuild/python.vcxproj
Expand Down
22 changes: 11 additions & 11 deletions recipe/patches/0011-Unvendor-sqlite3.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 13e5ad2054c83204a327241cae50cfc706c9a0ab Mon Sep 17 00:00:00 2001
From e891386edddc9a56903a24baacf9b5f45f311764 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 11/26] Unvendor sqlite3
Expand Down Expand Up @@ -57,18 +57,18 @@ index 4b6dc1e677..19d75c75b8 100644
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", "python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}"
diff --git a/PCbuild/python.props b/PCbuild/python.props
index 6bb03008bf..0abbd875a1 100644
index c5d2952042..f329a90a40 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -58,7 +58,7 @@
<condaDir>$(LIBRARY_PREFIX)\</condaDir>
<ExternalsDir Condition="$(ExternalsDir) == ''">$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`))</ExternalsDir>
<ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir>
- <sqlite3Dir>$(ExternalsDir)sqlite-3.37.2.0\</sqlite3Dir>
+ <sqlite3Dir>$(SQLITE3_DIR)\</sqlite3Dir>
<bz2Dir>$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
<lzmaDir>$(ExternalsDir)xz-5.2.5\</lzmaDir>
<libffiDir>$(ExternalsDir)libffi-3.3.0\</libffiDir>
@@ -63,7 +63,7 @@
<Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" />

<PropertyGroup>
- <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.37.2.0\</sqlite3Dir>
+ <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(SQLITE3_DIR)\</sqlite3Dir>
<bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
<lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir>
<libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.3.0\</libffiDir>
diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj
index 7351a6dda2..56d18cfa94 100644
--- a/PCbuild/sqlite3.vcxproj
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 17ebb2c04a96bbdd3bf4d43c29f0cd823368cf48 Mon Sep 17 00:00:00 2001
From d057489458147249b819b6151354055c6a63494c Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Sun, 3 Nov 2019 15:09:45 -0600
Subject: [PATCH 12/26] Use ranlib from env if env variable is set
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0dab4011b207b79ff9fa6b483a8e7eadd30d0faf Mon Sep 17 00:00:00 2001
From b70b2833ca904eddeaef026e7dcf571e9758079f 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 13/26] Add CondaEcosystemModifyDllSearchPath()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 254b5645a835489334672ad58396225576dcdbd4 Mon Sep 17 00:00:00 2001
From 6ebd60d35033b83847882408d2690fb21246190f Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Tue, 31 Dec 2019 20:46:36 +0100
Subject: [PATCH 14/26] Add /d1trimfile:%SRC_DIR% to make pdbs more relocatable
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0015-Doing-d1trimfile.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From e5db109b5eb36d4f8d8e6e3b1eef2a3856893788 Mon Sep 17 00:00:00 2001
From e16b350260a14d85c10ef4eef02822c8598af815 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 15/26] Doing d1trimfile
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0016-cross-compile-darwin.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 5be994ebf67dcd09f7fa3828ddf2a4f78ac30194 Mon Sep 17 00:00:00 2001
From 326480dfa5811a8a2a4c7f4ad6a4bce0089c50cf 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 16/26] cross compile darwin
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0017-Fix-TZPATH-on-windows.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 2418b056ba84e352c2a8514b97c5cce9e7def159 Mon Sep 17 00:00:00 2001
From 3c9fbda0914c6cc0a3985bcab43cc41b76ffc54b Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 7 Oct 2020 10:08:30 -0500
Subject: [PATCH 17/26] Fix TZPATH on windows
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 8d58dbe9ea64c50d5d412bd913a16e7fff9c0447 Mon Sep 17 00:00:00 2001
From a25b7e3e4cc6560baf1e2f2a5e3e946a56bb1400 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Mon, 25 Jan 2021 03:28:08 -0600
Subject: [PATCH 18/26] Make dyld search work with SYSTEM_VERSION_COMPAT=1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 8d5a385796cdc0f8a6d7cc2a0479dbd55d0a0633 Mon Sep 17 00:00:00 2001
From d93e72ae50b4671f909f6cceb8c2545d683e8856 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Mon, 16 Aug 2021 02:18:50 -0700
Subject: [PATCH 19/26] Fix LDSHARED when CC is overriden on Linux too
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0020-Unvendor-bzip2.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From e663a4247d5ed61c577c5aa49d7a99fe82e872c8 Mon Sep 17 00:00:00 2001
From a0e983795a0767d1d6750ae24bbfc8c01135a8b1 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Mon, 16 Aug 2021 02:56:27 -0700
Subject: [PATCH 20/26] Unvendor bzip2
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0021-Unvendor-libffi.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From e36db61bcb82e7bc638f1c3537d7dbddd0a07d49 Mon Sep 17 00:00:00 2001
From 2de809b883c95d8c4b5075b0d077d270806e32e1 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Mon, 16 Aug 2021 03:07:40 -0700
Subject: [PATCH 21/26] Unvendor libffi
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0022-Unvendor-tcltk.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 885a4b58879842645c457c0cb4cda159913ffcd8 Mon Sep 17 00:00:00 2001
From 26fc2896491c5914a6e6e6fce1b02260efc6c78b Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Fri, 20 Aug 2021 10:23:51 -0700
Subject: [PATCH 22/26] Unvendor tcltk
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0023-unvendor-xz.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From fb3ccb5f2323099a179046d711dbed7d969e45d9 Mon Sep 17 00:00:00 2001
From 59044667127c3d02fa6ec3f9512977c4399a8be4 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Sat, 25 Sep 2021 10:07:05 -0700
Subject: [PATCH 23/26] unvendor xz
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0024-unvendor-zlib.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 895cedf3900c01fd253d9edf2715b136fe93cac5 Mon Sep 17 00:00:00 2001
From 06b1ee78ae2009ae61451674c07baf52eafa5386 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 29 Sep 2021 15:21:55 -0700
Subject: [PATCH 24/26] unvendor zlib
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0025-Set-ssltag-to-3.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 2be568fdfaca8337eb39323202abf0b1f45386df Mon Sep 17 00:00:00 2001
From d142bd6c6abe88e8812498c3857ca1f6c32b2821 Mon Sep 17 00:00:00 2001
From: Chris Burr <chrisburr@users.noreply.github.com>
Date: Tue, 28 Sep 2021 12:40:44 +0200
Subject: [PATCH 25/26] Set ssltag to 3
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 1cc285aca52131ab5a8c84aa86089693d174802d Mon Sep 17 00:00:00 2001
From 5412e871de745fd6e514b2fefffe2b05708efb37 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Wed, 16 Aug 2017 11:45:28 +0100
Subject: [PATCH 26/26] Do not pass -g to GCC when not Py_DEBUG
Expand Down

0 comments on commit 09539c3

Please sign in to comment.