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
12 changes: 12 additions & 0 deletions .azure-pipelines/azure-pipelines-linux.yml

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

6 changes: 6 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml

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

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

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

16 changes: 16 additions & 0 deletions .ci_support/linux_64_python3.13.____cp313.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
cdt_name:
- conda
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.13.* *_cp313
target_platform:
- linux-64
16 changes: 16 additions & 0 deletions .ci_support/linux_aarch64_python3.13.____cp313.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
cdt_name:
- conda
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.13.* *_cp313
target_platform:
- linux-aarch64
16 changes: 16 additions & 0 deletions .ci_support/linux_ppc64le_python3.13.____cp313.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
cdt_name:
- conda
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.13.* *_cp313
target_platform:
- linux-ppc64le
42 changes: 42 additions & 0 deletions .ci_support/migrations/python313.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
migrator_ts: 1724712607
__migrator:
commit_message: Rebuild for python 3.13
migration_number: 1
operation: key_add
primary_key: python
ordering:
python:
- 3.6.* *_cpython
- 3.7.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.12.* *_cpython
- 3.13.* *_cp313 # new entry
- 3.6.* *_73_pypy
- 3.7.* *_73_pypy
- 3.8.* *_73_pypy
- 3.9.* *_73_pypy
paused: false
longterm: true
pr_limit: 20
max_solver_attempts: 3 # this will make the bot retry "not solvable" stuff 12 times
exclude:
# this shouldn't attempt to modify the python feedstocks
- python
- pypy3.6
- pypy-meta
- cross-python
- python_abi
# see https://github.com/conda-forge/scipy-feedstock/pull/283
- scipy
exclude_pinned_pkgs: false

python:
- 3.13.* *_cp313
# additional entries to add for zip_keys
numpy:
- 2
python_impl:
- cpython
18 changes: 18 additions & 0 deletions .ci_support/osx_64_python3.13.____cp313.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.13.* *_cp313
target_platform:
- osx-64
18 changes: 18 additions & 0 deletions .ci_support/osx_arm64_python3.13.____cp313.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.13.* *_cp313
target_platform:
- osx-arm64
12 changes: 12 additions & 0 deletions .ci_support/win_64_python3.13.____cp313.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.13.* *_cp313
target_platform:
- win-64
6 changes: 3 additions & 3 deletions .scripts/build_steps.sh

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

9 changes: 4 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.

10 changes: 5 additions & 5 deletions .scripts/run_win_build.bat

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

42 changes: 42 additions & 0 deletions README.md

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

10 changes: 6 additions & 4 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% set on_win = SUBDIR in ('win-64', 'win-32') %}
{% set name = "conda" %}
{% set version = "25.1.1" %}
{% set sha256 = "12aeb248b3c1c598f3512425571de3a5aa8737fd8f1001a5ea32156ac4745f53" %}
# Running pytest requires the inclusion of test files which baloons
Expand All @@ -12,11 +10,15 @@ package:

source:
fn: conda-{{ version }}.tar.gz
url: https://github.com/conda/{{ name }}/releases/download/{{ version }}/{{ name }}-{{ version }}.tar.gz
url: https://github.com/conda/conda/releases/download/{{ version }}/conda-{{ version }}.tar.gz
sha256: {{ sha256 }}
patches:
# Backport https://github.com/conda/conda/pull/14117 for changes in the
# Python 3.13+ logging module internals
- patches/0001-GH-14117-logging-lock-internal-changes-py313.patch
Comment on lines +15 to +18
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have merged in Bradley's PR ( #258 ), which the patch from upstream PR ( conda/conda#14117 )

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

conda/conda#14584 may be a better patch to pull in as it was merged.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Jonathan! 🙏

Glad to see your fix landed 🙂

Yeah we can update the patch. Would you like to send a PR to update it?


build:
number: 0
number: 1
Comment thread
beckermr marked this conversation as resolved.
script: {{ PYTHON }} -m pip install . --no-deps --no-build-isolation -vv && {{ PYTHON }} -m conda init --install
# These are present when the new environment is created
# so we have to exempt them from the list of initial files
Expand Down
Loading