Skip to content

Commit bdd29bb

Browse files
authored
Merge branch 'main' into optimize-install-times-pixi
2 parents 03683cd + 3ecb930 commit bdd29bb

File tree

6 files changed

+16
-5
lines changed

6 files changed

+16
-5
lines changed

.github/workflows/scripts/create_feedstocks.py

+2
Original file line numberDiff line numberDiff line change
@@ -427,9 +427,11 @@ def write_token(name, token):
427427
if not feedstock_token_exists("conda-forge", name + "-feedstock"):
428428
subprocess.check_call(
429429
['conda', 'smithy', 'generate-feedstock-token',
430+
'--unique-token-per-provider',
430431
'--feedstock_directory', feedstock_dir] + owner_info)
431432
subprocess.check_call(
432433
['conda', 'smithy', 'register-feedstock-token',
434+
'--unique-token-per-provider',
433435
'--without-circle', '--without-drone',
434436
'--feedstock_directory', feedstock_dir] + owner_info)
435437

.gitignore

+8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
# macOS folder metadata
22
.DS_Store
33

4+
# macOS specific files
5+
MacOSX*.sdk.tar.xz
6+
SDKs/
7+
48
# User builds
59
build_artifacts
10+
miniforge3/
611

712
# Compiled Python code
813
__pycache__
@@ -21,3 +26,6 @@ __pycache__
2126
# pixi environments
2227
.pixi
2328
pixi.lock
29+
30+
# rattler-build outputs files
31+
output/

.scripts/run_docker_build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ mkdir -p "$ARTIFACTS"
4444
DONE_CANARY="$ARTIFACTS/conda-forge-build-done"
4545
rm -f "$DONE_CANARY"
4646

47-
DOCKER_RUN_ARGS="-it"
47+
DOCKER_RUN_ARGS="-it ${CONDA_FORGE_DOCKER_RUN_ARGS}"
4848

4949
if [ "${AZURE}" == "True" ]; then
5050
DOCKER_RUN_ARGS=""

README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
This repo is a holding area for recipes destined for a conda-forge feedstock repo. To find out more about conda-forge, see https://github.com/conda-forge/conda-smithy.
44

5-
[![Join the chat at https://gitter.im/conda-forge/conda-forge.github.io](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/conda-forge/conda-forge.github.io)
6-
5+
[![Join the chat at https://conda-forge.zulipchat.com](https://img.shields.io/badge/Zulip-join_chat-53bfad.svg)](https://conda-forge.zulipchat.com)
76

87
## Feedstock conversion status
98

build-locally.py

+4
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ def setup_environment(ns):
2727
os.path.dirname(__file__), "SDKs"
2828
)
2929

30+
# The default cache location might not be writable using docker on macOS.
31+
if ns.config.startswith("linux") and platform.system() == "Darwin":
32+
os.environ["CONDA_FORGE_DOCKER_RUN_ARGS"] = "-e XDG_CACHE_HOME=/tmp/rattler_cache"
33+
3034

3135
def run_docker_build(ns):
3236
script = ".scripts/run_docker_build.sh"

setup.cfg

-2
This file was deleted.

0 commit comments

Comments
 (0)