diff --git a/.github/workflows/scripts/create_feedstocks.py b/.github/workflows/scripts/create_feedstocks.py index f02696946f5b0..5390fa9b34488 100755 --- a/.github/workflows/scripts/create_feedstocks.py +++ b/.github/workflows/scripts/create_feedstocks.py @@ -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) diff --git a/.gitignore b/.gitignore index 316ec9a48f837..da9b4f6885679 100644 --- a/.gitignore +++ b/.gitignore @@ -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__ @@ -21,3 +26,6 @@ __pycache__ # pixi environments .pixi pixi.lock + +# rattler-build outputs files +output/ diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 57a568798e1c9..08a935f03ba03 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -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="" diff --git a/README.md b/README.md index e82320b6d7c53..2b188abb21ac8 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/build-locally.py b/build-locally.py index 8b7434893256b..d1c0cdea235ab 100644 --- a/build-locally.py +++ b/build-locally.py @@ -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" diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index e14b7619292fb..0000000000000 --- a/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[flake8] -max-line-length=88