diff --git a/crates/pixi_cli/src/workspace/export/snapshots/pixi_cli__workspace__export__conda_environment__tests__test_export_conda_env_yaml.snap b/crates/pixi_cli/src/workspace/export/snapshots/pixi_cli__workspace__export__conda_environment__tests__test_export_conda_env_yaml.snap index 3ddc795646..673f593761 100644 --- a/crates/pixi_cli/src/workspace/export/snapshots/pixi_cli__workspace__export__conda_environment__tests__test_export_conda_env_yaml.snap +++ b/crates/pixi_cli/src/workspace/export/snapshots/pixi_cli__workspace__export__conda_environment__tests__test_export_conda_env_yaml.snap @@ -15,4 +15,4 @@ dependencies: - pip - pip: - rich>=13.8.0, <14 - - test-git-subdir-roundtrip @ git+git+ssh://must/replace@main#subdirectory=tests/data/mock-projects/test-project-export/test-git-subdir-roundtrip + - test-git-subdir-roundtrip @ git+https://github.com/prefix-dev/pixi@main#subdirectory=tests/data/mock-projects/test-project-export/test-git-subdir-roundtrip diff --git a/tests/data/mock-projects/test-project-export/pixi.toml b/tests/data/mock-projects/test-project-export/pixi.toml index 5db77707cf..f428d58896 100644 --- a/tests/data/mock-projects/test-project-export/pixi.toml +++ b/tests/data/mock-projects/test-project-export/pixi.toml @@ -15,9 +15,9 @@ ca-certificates = { version = "==2024.8.30", channel = "conda-forge" } [pypi-dependencies] rich = ">=13.8.0, <14" -# NOTE: this will be updated to current absolute path in test-exports.sh -# to test local modifications, use an absolute path and remove the override -test-git-subdir-roundtrip = { git = "git+ssh://must/replace", rev = "main", subdirectory = "tests/data/mock-projects/test-project-export/test-git-subdir-roundtrip" } +# NOTE: to pass integration tests, the git path here must be either a valid remote or a local abspath +# to test local modifications, use an absolute path temporarily. +test-git-subdir-roundtrip = { git = "https://github.com/prefix-dev/pixi", rev = "main", subdirectory = "tests/data/mock-projects/test-project-export/test-git-subdir-roundtrip" } [target.linux-64.dependencies] requests = ">=2.32.3,<3" diff --git a/tests/scripts/test-export.sh b/tests/scripts/test-export.sh index 11234309c2..e995733863 100644 --- a/tests/scripts/test-export.sh +++ b/tests/scripts/test-export.sh @@ -10,12 +10,7 @@ eval "$(pixi shell-hook)" unset PIXI_IN_SHELL echo "Exporting the export test environment" cd tests/data/mock-projects/test-project-export - -# For the git subdirectory round-trip test, we need to edit -# the pixi.toml.orig git subdirectory entry to use an absolute path -python -c 'import pathlib; pathlib.Path("tmp").mkdir(exist_ok=True); p = pathlib.Path("./tmp/pixi.toml"); p.write_text(pathlib.Path("pixi.toml").read_text().replace("git+ssh:\/\/must\/replace", str(p.absolute().parents[4])))' - -pixi project --manifest-path tmp/pixi.toml export conda-environment | tee test-env.yml +pixi project export conda-environment | tee test-env.yml echo "Creating the export test environment with micromamba" micromamba create -y -f test-env.yml -n export-test micromamba env list @@ -24,8 +19,7 @@ micromamba env remove -y -n export-test export _PIXITEST_TMP=$(mktemp -d) pixi init -i test-env.yml $_PIXITEST_TMP pixi install --manifest-path $_PIXITEST_TMP -rm test-env.yml tmp/pixi.toml -rmdir tmp +rm test-env.yml cd ../../../.. # Setuptools error with env_test_package