From 7cd59afeee3ce0b6b904d22d7fddf7e99feb8562 Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Sat, 16 Nov 2024 16:37:13 -0700 Subject: [PATCH] docs: Remove 'pip install' options in recipes * Remove --no-deps, --no-build-isolation, and --ignore-installed 'pip install' options in recipes as rattler-build will enforce all required 'pip install' options itself at build time. --- README.md | 2 +- docs/index.md | 2 +- docs/reference/recipe_file.md | 2 +- examples/mamba/build_mamba.bat | 4 ++-- examples/mamba/build_mamba.sh | 4 ++-- examples/rich/recipe.yaml | 2 +- .../rattler_build__metadata__test__rich_recipe.yaml.snap | 2 +- test-data/recipes/flask/recipe.yaml | 2 +- test-data/recipes/package-content-tests/rich-recipe.yaml | 2 +- test-data/recipes/rich/recipe.yaml | 2 +- test-data/recipes/toml/recipe.yaml | 2 +- test-data/recipes/variants/boltons_recipe.yaml | 2 +- test-data/rendered_recipes/rich_recipe.yaml | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index ab0ee27c1..55774a084 100644 --- a/README.md +++ b/README.md @@ -210,7 +210,7 @@ build: # Thanks to `noarch: python` this package works on all platforms noarch: python script: - - python -m pip install . -vv --no-deps --no-build-isolation + - python -m pip install . -vv requirements: host: diff --git a/docs/index.md b/docs/index.md index 334fdcde7..daaf76eb7 100644 --- a/docs/index.md +++ b/docs/index.md @@ -232,7 +232,7 @@ build: # Thanks to `noarch: python` this package works on all platforms noarch: python script: - - python -m pip install . -vv --no-deps --no-build-isolation + - python -m pip install . -vv requirements: host: diff --git a/docs/reference/recipe_file.md b/docs/reference/recipe_file.md index b2abf8e36..ed4a1b8ab 100644 --- a/docs/reference/recipe_file.md +++ b/docs/reference/recipe_file.md @@ -112,7 +112,7 @@ source: # build number (should be incremented if a new build is made, but version is not incrementing) build: number: 1 - script: python -m pip install --no-deps --ignore-installed . + script: python -m pip install . # the requirements at build and runtime requirements: diff --git a/examples/mamba/build_mamba.bat b/examples/mamba/build_mamba.bat index abd39cc47..5bfba4eed 100644 --- a/examples/mamba/build_mamba.bat +++ b/examples/mamba/build_mamba.bat @@ -2,7 +2,7 @@ if /I "%PKG_NAME%" == "mamba" ( cd mamba - %PYTHON% -m pip install . --no-deps -vv + %PYTHON% -m pip install . -vv exit 0 ) @@ -43,6 +43,6 @@ if errorlevel 1 exit 1 if /I "%PKG_NAME%" == "libmambapy" ( cd ../libmambapy rmdir /Q /S build - %PYTHON% -m pip install . --no-deps -vv + %PYTHON% -m pip install . -vv del *.pyc /a /s ) diff --git a/examples/mamba/build_mamba.sh b/examples/mamba/build_mamba.sh index e1f22a3c6..1a3e1821c 100644 --- a/examples/mamba/build_mamba.sh +++ b/examples/mamba/build_mamba.sh @@ -1,6 +1,6 @@ if [[ $PKG_NAME == "mamba" ]]; then cd mamba - $PYTHON -m pip install . --no-deps -vv + $PYTHON -m pip install . -vv echo "Adding link to mamba into condabin"; mkdir -p $PREFIX/condabin @@ -40,6 +40,6 @@ ninja install if [[ $PKG_NAME == "libmambapy" ]]; then cd ../libmambapy rm -rf build - $PYTHON -m pip install . --no-deps -vv + $PYTHON -m pip install . -vv find libmambapy/bindings* -type f -print0 | xargs -0 rm -f -- fi diff --git a/examples/rich/recipe.yaml b/examples/rich/recipe.yaml index 8262d6d1a..925642091 100644 --- a/examples/rich/recipe.yaml +++ b/examples/rich/recipe.yaml @@ -17,7 +17,7 @@ build: # Thanks to `noarch: python` this package works on all platforms noarch: python script: - - python -m pip install . -vv --no-deps --no-build-isolation + - python -m pip install . -vv requirements: host: diff --git a/src/snapshots/rattler_build__metadata__test__rich_recipe.yaml.snap b/src/snapshots/rattler_build__metadata__test__rich_recipe.yaml.snap index 0d31b4fe4..556a4602a 100644 --- a/src/snapshots/rattler_build__metadata__test__rich_recipe.yaml.snap +++ b/src/snapshots/rattler_build__metadata__test__rich_recipe.yaml.snap @@ -15,7 +15,7 @@ recipe: number: 0 string: pyh4616a5c_0 script: - - python -m pip install . -vv --no-deps --no-build-isolation + - python -m pip install . -vv noarch: python requirements: host: diff --git a/test-data/recipes/flask/recipe.yaml b/test-data/recipes/flask/recipe.yaml index 951d069ad..387cd1f68 100644 --- a/test-data/recipes/flask/recipe.yaml +++ b/test-data/recipes/flask/recipe.yaml @@ -16,7 +16,7 @@ source: build: number: 0 script: - - python -m pip install . -vv --no-deps --no-build-isolation + - python -m pip install . -vv # make sure that PY_VER is set even for noarch packages - if: unix then: diff --git a/test-data/recipes/package-content-tests/rich-recipe.yaml b/test-data/recipes/package-content-tests/rich-recipe.yaml index e7641d60f..97f26af86 100644 --- a/test-data/recipes/package-content-tests/rich-recipe.yaml +++ b/test-data/recipes/package-content-tests/rich-recipe.yaml @@ -15,7 +15,7 @@ build: # Thanks to `noarch: python` this package works on all platforms noarch: python script: - - python -m pip install . -vv --no-deps --no-build-isolation + - python -m pip install . -vv requirements: host: diff --git a/test-data/recipes/rich/recipe.yaml b/test-data/recipes/rich/recipe.yaml index f7d43f0d8..406e4958b 100644 --- a/test-data/recipes/rich/recipe.yaml +++ b/test-data/recipes/rich/recipe.yaml @@ -15,7 +15,7 @@ build: # Thanks to `noarch: python` this package works on all platforms noarch: python script: - - python -m pip install . -vv --no-deps --no-build-isolation + - python -m pip install . -vv requirements: host: diff --git a/test-data/recipes/toml/recipe.yaml b/test-data/recipes/toml/recipe.yaml index a8c38c65b..a54cd4604 100644 --- a/test-data/recipes/toml/recipe.yaml +++ b/test-data/recipes/toml/recipe.yaml @@ -14,7 +14,7 @@ source: build: noarch: python - script: python -m pip install . --no-deps -vv + script: python -m pip install . -vv requirements: host: diff --git a/test-data/recipes/variants/boltons_recipe.yaml b/test-data/recipes/variants/boltons_recipe.yaml index 78761041c..c0d7dd5a3 100644 --- a/test-data/recipes/variants/boltons_recipe.yaml +++ b/test-data/recipes/variants/boltons_recipe.yaml @@ -14,7 +14,7 @@ source: build: noarch: python script: - - python -m pip install . --no-deps -vv + - python -m pip install . -vv requirements: host: diff --git a/test-data/rendered_recipes/rich_recipe.yaml b/test-data/rendered_recipes/rich_recipe.yaml index e9164cd62..13515136c 100644 --- a/test-data/rendered_recipes/rich_recipe.yaml +++ b/test-data/rendered_recipes/rich_recipe.yaml @@ -11,7 +11,7 @@ recipe: number: 0 string: pyh4616a5c_0 script: - - python -m pip install . -vv --no-deps --no-build-isolation + - python -m pip install . -vv noarch: python requirements: host: