Skip to content

[dev] Merge changes from main #883

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

Draft
mgorny wants to merge 51 commits into
base: dev
Choose a base branch
from
Draft

[dev] Merge changes from main #883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
7eefc57
Fix clash between folders in lib and usable libraries
hmaarrfk Jan 22, 2026
3030e10
Merge pull request #844 from hmaarrfk/rebuild_for_findLibrary_fix
isuruf Jan 26, 2026
bb209e6
updated v3.14.3
regro-cf-autotick-bot Feb 3, 2026
644f47d
MNT: Re-rendered with conda-smithy 3.54.2 and conda-forge-pinning 202…
regro-cf-autotick-bot Feb 3, 2026
3fcc177
enable PGO on Windows
jjhelmus Feb 3, 2026
34650f7
bump build number
jjhelmus Feb 3, 2026
d4f2a01
MNT: Re-rendered with conda-smithy 3.54.2 and conda-forge-pinning 202…
Feb 4, 2026
999eb81
switch to sha256, following upstream release pages
h-vetinari Feb 4, 2026
fb48113
Merge pull request #856 from jjhelmus/win_pgo
isuruf Feb 4, 2026
349b813
Merge branch 'main' into 3.14.3_h335f29
isuruf Feb 5, 2026
4c191ed
python v3.14.3 (#855)
conda-forge-admin Feb 5, 2026
2a160f8
migration: supportwindowsarm64platform
regro-cf-autotick-bot Jan 27, 2026
07003d1
MNT: Re-rendered with conda-smithy 3.54.1 and conda-forge-pinning 202…
regro-cf-autotick-bot Jan 27, 2026
b37715d
Remove Python requirements for cross-platform builds
isuruf Jan 27, 2026
4e80f1f
Fix platform and build_path
isuruf Jan 27, 2026
9898dd4
refactor variables
isuruf Jan 28, 2026
eaf0900
build interpreter for build platform
isuruf Feb 5, 2026
b3e8319
remove quick tests
isuruf Feb 5, 2026
b8f49d1
no pgo, externals
isuruf Feb 5, 2026
218ea26
no PGO for cross
isuruf Feb 5, 2026
9e2290c
Fix zlib patch and externals patch
isuruf Feb 5, 2026
8cd8cfb
exit on error
isuruf Feb 5, 2026
923b423
mpdecimal
isuruf Feb 5, 2026
1326937
Support Windows ARM64 platform (#849)
conda-forge-admin Feb 5, 2026
8480b42
Install `build-details.json` from shared library build
mgorny Feb 9, 2026
b3d75b2
Add missing `ripgrep` dependency for the test case
mgorny Feb 9, 2026
02184ce
[3.14] Install `build-details.json` from shared library build (#858)
conda-forge-admin Feb 9, 2026
5fc70a0
[ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration Enabl…
conda-forge-admin Mar 16, 2026
231cc6b
updated v3.14.4
regro-cf-autotick-bot Apr 7, 2026
83cd429
MNT: Re-rendered with conda-smithy 3.58.1 and conda-forge-pinning 202…
regro-cf-autotick-bot Apr 7, 2026
6fe770e
rebase patches
h-vetinari Apr 7, 2026
a7005d0
Merge pull request #868 from regro-cf-autotick-bot/3.14.4_h43c246
isuruf Apr 8, 2026
85d775a
[ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration Usern…
conda-forge-admin Apr 22, 2026
7a6b30c
updated v3.14.5
regro-cf-autotick-bot May 10, 2026
7a902a7
MNT: Re-rendered with conda-smithy 3.61.2 and conda-forge-pinning 202…
regro-cf-autotick-bot May 10, 2026
0e014f3
rebase patches
h-vetinari May 10, 2026
b31da0d
Merge pull request #871 from regro-cf-autotick-bot/3.14.5_h3571a9
h-vetinari May 20, 2026
028711f
updated v3.14.6
regro-cf-autotick-bot Jun 10, 2026
2b7d1e4
add test for certificate handling regression
h-vetinari Jun 11, 2026
e129e91
migrate to workflow_settings
h-vetinari Jun 11, 2026
babe1dd
go native for arm builds
h-vetinari Jun 11, 2026
57eec5e
rebase patches
h-vetinari Jun 11, 2026
6220cb0
MNT: Re-rendered with conda-smithy 2026.5.29 and conda-forge-pinning …
h-vetinari Jun 11, 2026
df31527
Merge pull request #874 from regro-cf-autotick-bot/3.14.6_h879259
xhochy Jun 12, 2026
306b13d
Merge changes from 'main'
mgorny Jul 23, 2026
889c839
Bump build number
mgorny Jul 23, 2026
401f914
MNT: Re-rendered with conda-smithy 2026.6.14 and conda-forge-pinning …
mgorny Jul 23, 2026
7f6199c
Readd lost `%TCLTK_MSBUILD_PROPS%`
mgorny Jul 23, 2026
11096e7
Fix accidental path revert
mgorny Jul 23, 2026
cc69128
Fix .pyc compile command on Windows
mgorny Jul 23, 2026
c4e7ec5
Restore cross-dependency on libxcrypt
mgorny Jul 23, 2026
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
8 changes: 4 additions & 4 deletions .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

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

20 changes: 20 additions & 0 deletions .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion ...ux_aarch64_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingno.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cxx_compiler:
cxx_compiler_version:
- '14'
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma10
- quay.io/condaforge/linux-anvil-aarch64:alma10
expat:
- '2'
freethreading:
Expand Down
2 changes: 1 addition & 1 deletion ...x_aarch64_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingyes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cxx_compiler:
cxx_compiler_version:
- '14'
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma10
- quay.io/condaforge/linux-anvil-aarch64:alma10
expat:
- '2'
freethreading:
Expand Down
2 changes: 1 addition & 1 deletion .../linux_aarch64_build_typereleasechannel_targetsconda-forge_python_devfreethreadingno.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cxx_compiler:
cxx_compiler_version:
- '14'
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma10
- quay.io/condaforge/linux-anvil-aarch64:alma10
expat:
- '2'
freethreading:
Expand Down
2 changes: 1 addition & 1 deletion ...linux_aarch64_build_typereleasechannel_targetsconda-forge_python_devfreethreadingyes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cxx_compiler:
cxx_compiler_version:
- '14'
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma10
- quay.io/condaforge/linux-anvil-aarch64:alma10
expat:
- '2'
freethreading:
Expand Down
43 changes: 43 additions & 0 deletions .ci_support/win_arm64_freethreadingno.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
build_type:
- release
bzip2:
- '1'
c_compiler:
- vs2022
c_stdlib:
- vs
channel_sources:
- conda-forge/label/python_rc,conda-forge
channel_targets:
- conda-forge python_dev
cxx_compiler:
- vs2022
expat:
- '2'
freethreading:
- 'no'
libffi:
- '3.5'
liblzma_devel:
- '5'
libsqlite:
- '3'
openssl:
- '3.5'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- '3.15'
target_platform:
- win-arm64
tk:
- '8.6'
zip_keys:
- - build_type
- channel_targets
zlib:
- '1'
zstd:
- '1.5'
43 changes: 43 additions & 0 deletions .ci_support/win_arm64_freethreadingyes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
build_type:
- release
bzip2:
- '1'
c_compiler:
- vs2022
c_stdlib:
- vs
channel_sources:
- conda-forge/label/python_rc,conda-forge
channel_targets:
- conda-forge python_dev
cxx_compiler:
- vs2022
expat:
- '2'
freethreading:
- 'yes'
libffi:
- '3.5'
liblzma_devel:
- '5'
libsqlite:
- '3'
openssl:
- '3.5'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- '3.15'
target_platform:
- win-arm64
tk:
- '8.6'
zip_keys:
- - build_type
- channel_targets
zlib:
- '1'
zstd:
- '1.5'
16 changes: 8 additions & 8 deletions .github/workflows/conda-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
tools_install_dir: ~/miniforge3
- CONFIG: linux_aarch64_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingno
CONFIG_SHORT: linux_aarch64_build_typedebugchannel_tar_h158ec98d
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma10
STORE_BUILD_ARTIFACTS: True
UPLOAD_PACKAGES: True
build_workspace_dir: build_artifacts
Expand All @@ -85,11 +85,11 @@ jobs:
os: ubuntu
pagefile_size: 0
resize_partitions: False
runs_on: ['ubuntu-latest']
runs_on: ['ubuntu-24.04-arm']
tools_install_dir: ~/miniforge3
- CONFIG: linux_aarch64_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingyes
CONFIG_SHORT: linux_aarch64_build_typedebugchannel_tar_h618840af
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma10
STORE_BUILD_ARTIFACTS: True
UPLOAD_PACKAGES: True
build_workspace_dir: build_artifacts
Expand All @@ -98,11 +98,11 @@ jobs:
os: ubuntu
pagefile_size: 0
resize_partitions: False
runs_on: ['ubuntu-latest']
runs_on: ['ubuntu-24.04-arm']
tools_install_dir: ~/miniforge3
- CONFIG: linux_aarch64_build_typereleasechannel_targetsconda-forge_python_devfreethreadingno
CONFIG_SHORT: linux_aarch64_build_typereleasechannel_t_hbbb47f33
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma10
STORE_BUILD_ARTIFACTS: True
UPLOAD_PACKAGES: True
build_workspace_dir: build_artifacts
Expand All @@ -111,11 +111,11 @@ jobs:
os: ubuntu
pagefile_size: 0
resize_partitions: False
runs_on: ['ubuntu-latest']
runs_on: ['ubuntu-24.04-arm']
tools_install_dir: ~/miniforge3
- CONFIG: linux_aarch64_build_typereleasechannel_targetsconda-forge_python_devfreethreadingyes
CONFIG_SHORT: linux_aarch64_build_typereleasechannel_t_ha31997ea
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma10
STORE_BUILD_ARTIFACTS: True
UPLOAD_PACKAGES: True
build_workspace_dir: build_artifacts
Expand All @@ -124,7 +124,7 @@ jobs:
os: ubuntu
pagefile_size: 0
resize_partitions: False
runs_on: ['ubuntu-latest']
runs_on: ['ubuntu-24.04-arm']
tools_install_dir: ~/miniforge3
- CONFIG: linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingno
CONFIG_SHORT: linux_ppc64le_build_typedebugchannel_tar_he3888cbf
Expand Down
12 changes: 12 additions & 0 deletions .recipe_maintainers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"chrisburr": 5220533,
"isuruf": 5234427,
"jakirkham": 3019665,
"katietz": 47363620,
"mbargull": 10598343,
"msarahan": 38393,
"ocefpaf": 950575,
"pelson": 810663,
"scopatz": 320553,
"xhochy": 70274
}
44 changes: 36 additions & 8 deletions README.md
View file
Open in desktop

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

10 changes: 5 additions & 5 deletions conda-forge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@ bot:
- '3.12'
- '3.13'
build_platform:
linux_aarch64: linux_64
linux_ppc64le: linux_64
osx_arm64: osx_64
workflow_settings:
store_build_artifacts: true
win_arm64: win_64
conda_build:
pkg_format: '2'
conda_forge_output_validation: true
Expand All @@ -19,5 +16,8 @@ github:
tooling_branch_name: main
provider:
linux_aarch64: default
linux_ppc64le: native
osx_arm64: default
test: native_and_emulated
workflow_settings:
store_build_artifacts:
- value: true
Loading
Loading