Skip to content
Merged
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
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/amd64
build_type:
- debug
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/amd64
build_type:
- debug
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/amd64
build_type:
- release
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/amd64
build_type:
- release
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/aarch64
build_type:
- debug
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/aarch64
build_type:
- debug
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/aarch64
build_type:
- release
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/aarch64
build_type:
- release
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/amd64
build_type:
- debug
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/amd64
build_type:
- debug
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/amd64
build_type:
- release
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/amd64
build_type:
- release
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/amd64
build_type:
- debug
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/amd64
build_type:
- debug
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/amd64
build_type:
- release
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/amd64
build_type:
- release
bzip2:
Expand Down
25 changes: 0 additions & 25 deletions .circleci/config.yml

This file was deleted.

7 changes: 6 additions & 1 deletion .scripts/run_docker_build.sh

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.15.1" %}
{% set version = "3.15.2" %}
{% set dev = "" %}
{% set dev_ = "" %}
{% set ver2 = '.'.join(version.split('.')[0:2]) %}
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: 673ae7232d84c894729882c8257d300ef2d26523911bfd3917ec8ce7f526f99b
sha256: 8b5536d280142ecf6cdfe15d12a21ba1c65e300bbf7b28a8d0cdb849575797de
patches:
- patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
- patches/0002-Win32-Do-not-download-externals.patch
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ https://github.com/ContinuumIO/anaconda-issues/issues/1241
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index b9fb7762e3d..e6102e8c589 100644
index b9fb776..e6102e8 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -45,7 +45,7 @@
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Subject: [PATCH 02/28] Win32: Do not download externals
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PCbuild/build.bat b/PCbuild/build.bat
index 9d2f032f5a9..faad274fc9d 100644
index 4686c52..3ee574c 100644
--- a/PCbuild/build.bat
+++ b/PCbuild/build.bat
@@ -112,7 +112,7 @@ if "%~1"=="--no-ctypes" (set IncludeCTypes=false) & shift & goto CheckOpts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Subject: [PATCH 03/28] Fix find_library so that it looks in sys.prefix/lib
2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/Lib/ctypes/macholib/dyld.py b/Lib/ctypes/macholib/dyld.py
index 583c47daff3..ab9b01c87e2 100644
index 583c47d..ab9b01c 100644
--- a/Lib/ctypes/macholib/dyld.py
+++ b/Lib/ctypes/macholib/dyld.py
@@ -93,6 +93,10 @@ def dyld_executable_path_search(name, executable_path=None):
Expand All @@ -25,10 +25,10 @@ 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 015c62b31a1..e08c9520576 100644
index 015c62b..e08c952 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -136,7 +136,8 @@ def dllist():
@@ -136,7 +136,8 @@ if os.name == "nt":
elif os.name == "posix" and sys.platform in {"darwin", "ios", "tvos", "watchos"}:
from ctypes.macholib.dyld import dyld_find as _dyld_find
def find_library(name):
Expand All @@ -38,7 +38,7 @@ index 015c62b31a1..e08c9520576 100644
'%s.dylib' % name,
'%s.framework/%s' % (name, name)]
for name in possible:
@@ -436,10 +437,30 @@ def _findLib_ld(name):
@@ -436,10 +437,30 @@ elif os.name == "posix":
pass # result will be None
return result

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ Co-authored-by: Isuru Fernando<[email protected]>
2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Modules/getpath.c b/Modules/getpath.c
index ada8a27be4c..88252adf91d 100644
index 22fd425..ea08a53 100644
--- a/Modules/getpath.c
+++ b/Modules/getpath.c
@@ -939,6 +939,7 @@ _PyConfig_InitPathConfig(PyConfig *config, int compute_path_config)
@@ -943,6 +943,7 @@ _PyConfig_InitPathConfig(PyConfig *config, int compute_path_config)
!env_to_dict(dict, "ENV_PATH", 0) ||
!env_to_dict(dict, "ENV_PYTHONHOME", 0) ||
!env_to_dict(dict, "ENV_PYTHONEXECUTABLE", 0) ||
Expand All @@ -23,7 +23,7 @@ index ada8a27be4c..88252adf91d 100644
!progname_to_dict(dict, "real_executable") ||
!library_to_dict(dict, "library") ||
diff --git a/Modules/getpath.py b/Modules/getpath.py
index f5f928f1795..a809396a3a4 100644
index 2ffb1d9..a043970 100644
--- a/Modules/getpath.py
+++ b/Modules/getpath.py
@@ -52,6 +52,7 @@
Expand All @@ -34,7 +34,7 @@ index f5f928f1795..a809396a3a4 100644

# ** Values calculated at runtime **
# config -- [in/out] dict of the PyConfig structure
@@ -703,7 +704,7 @@ def search_up(prefix, *landmarks, test=isfile):
@@ -719,7 +720,7 @@ elif not pythonpath_was_set:
stdlib_zip = joinpath(base_prefix, ZIP_LANDMARK)
pythonpath.append(stdlib_zip)

Expand Down
10 changes: 5 additions & 5 deletions recipe/patches/0005-Unvendor-openssl.patch
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Co-authored-by: Isuru Fernando <[email protected]>
5 files changed, 9 insertions(+), 56 deletions(-)

diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
index 5fd708b211e..044cefd95ea 100644
index f071060..afb9a08 100644
--- a/PCbuild/openssl.props
+++ b/PCbuild/openssl.props
@@ -2,10 +2,10 @@
Expand Down Expand Up @@ -45,7 +45,7 @@ index 5fd708b211e..044cefd95ea 100644
- </Target>
</Project>
diff --git a/PCbuild/openssl.vcxproj b/PCbuild/openssl.vcxproj
index 7ca750dda8f..17eee400ebb 100644
index cf443ef..b7880fb 100644
--- a/PCbuild/openssl.vcxproj
+++ b/PCbuild/openssl.vcxproj
@@ -60,40 +60,8 @@
Expand Down Expand Up @@ -90,7 +90,7 @@ index 7ca750dda8f..17eee400ebb 100644
<Target Name="CleanAll">
<Delete Files="$(TargetPath);$(BuildPath)$(tclDLLName)" />
diff --git a/PCbuild/python.props b/PCbuild/python.props
index 4c49decd749..744ce0c540a 100644
index 31e7095..027ae78 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -91,6 +91,7 @@
Expand Down Expand Up @@ -123,7 +123,7 @@ index 4c49decd749..744ce0c540a 100644

<PropertyGroup>
diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
index 417ede34c54..75f2bd9984a 100644
index d3dd432..bb2b617 100644
--- a/PCbuild/python.vcxproj
+++ b/PCbuild/python.vcxproj
@@ -110,6 +110,9 @@
Expand All @@ -137,7 +137,7 @@ index 417ede34c54..75f2bd9984a 100644
<ItemGroup>
<ProjectReference Include="pythoncore.vcxproj">
diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj
index 244cdf622ad..03ba2a20dd2 100644
index b718756..668756a 100644
--- a/PCbuild/pythonw.vcxproj
+++ b/PCbuild/pythonw.vcxproj
@@ -105,6 +105,9 @@
Expand Down
6 changes: 3 additions & 3 deletions recipe/patches/0006-Unvendor-sqlite3.patch
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Subject: [PATCH 06/28] Unvendor sqlite3
3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj
index 9ae0a0fc3a0..9baaafed518 100644
index 5a8a850..755a3b7 100644
--- a/PCbuild/_sqlite3.vcxproj
+++ b/PCbuild/_sqlite3.vcxproj
@@ -93,9 +93,12 @@
Expand Down Expand Up @@ -39,7 +39,7 @@ index 9ae0a0fc3a0..9baaafed518 100644
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln
index 09a989d3864..74b961e877f 100644
index 3a973ea..fd8f165 100644
--- a/PCbuild/pcbuild.sln
+++ b/PCbuild/pcbuild.sln
@@ -73,8 +73,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_elementtree", "_elementtre
Expand All @@ -52,7 +52,7 @@ index 09a989d3864..74b961e877f 100644
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcxproj", "{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}"
diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj
index 0673e03a59f..97a4c46dea1 100644
index 257013c..a7ca8e0 100644
--- a/PCbuild/sqlite3.vcxproj
+++ b/PCbuild/sqlite3.vcxproj
@@ -88,12 +88,12 @@
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Co-authored-by: Isuru Fernando <[email protected]>
1 file changed, 95 insertions(+)

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 516d467141a..156524cc7ce 100644
index 516d467..156524c 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -88,6 +88,10 @@
Expand Down
Loading
Loading