Skip to content

Commit

Permalink
Merge branch 'main' into optimize-install-times-pixi
Browse files Browse the repository at this point in the history
  • Loading branch information
beckermr authored Nov 12, 2024
2 parents 03683cd + 3ecb930 commit bdd29bb
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/scripts/create_feedstocks.py
Original file line number Diff line number Diff line change
Expand Up @@ -427,9 +427,11 @@ def write_token(name, token):
if not feedstock_token_exists("conda-forge", name + "-feedstock"):
subprocess.check_call(
['conda', 'smithy', 'generate-feedstock-token',
'--unique-token-per-provider',
'--feedstock_directory', feedstock_dir] + owner_info)
subprocess.check_call(
['conda', 'smithy', 'register-feedstock-token',
'--unique-token-per-provider',
'--without-circle', '--without-drone',
'--feedstock_directory', feedstock_dir] + owner_info)

Expand Down
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
# macOS folder metadata
.DS_Store

# macOS specific files
MacOSX*.sdk.tar.xz
SDKs/

# User builds
build_artifacts
miniforge3/

# Compiled Python code
__pycache__
Expand All @@ -21,3 +26,6 @@ __pycache__
# pixi environments
.pixi
pixi.lock

# rattler-build outputs files
output/
2 changes: 1 addition & 1 deletion .scripts/run_docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ mkdir -p "$ARTIFACTS"
DONE_CANARY="$ARTIFACTS/conda-forge-build-done"
rm -f "$DONE_CANARY"

DOCKER_RUN_ARGS="-it"
DOCKER_RUN_ARGS="-it ${CONDA_FORGE_DOCKER_RUN_ARGS}"

if [ "${AZURE}" == "True" ]; then
DOCKER_RUN_ARGS=""
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

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.

[![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)

[![Join the chat at https://conda-forge.zulipchat.com](https://img.shields.io/badge/Zulip-join_chat-53bfad.svg)](https://conda-forge.zulipchat.com)

## Feedstock conversion status

Expand Down
4 changes: 4 additions & 0 deletions build-locally.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ def setup_environment(ns):
os.path.dirname(__file__), "SDKs"
)

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


def run_docker_build(ns):
script = ".scripts/run_docker_build.sh"
Expand Down
2 changes: 0 additions & 2 deletions setup.cfg

This file was deleted.

0 comments on commit bdd29bb

Please sign in to comment.