forked from conda/conda
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Disable 2.7 tests. Too much to bite off at this point...and since 2.7 is deprecated it may not matter - Update conda-build to version 3.17 and build local activate_deactivate_package - Retain line endings on bat files in the activate_deactivate_package - Simplify path adjustment logic in activate_deactivate_package batch files. (This may be unnecessary as controlling the line endings may have fixed the issue) - Update condarc tests to write files without duplicate keys.
- Loading branch information
Showing
6 changed files
with
19 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
*.sh text eol=lf | ||
*.psm1 text eol=lf | ||
dev/start text eol=lf | ||
*activate.bat text eol=crlf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
tests/test-recipes/activate_deactivate_package/src/etc/conda/activate.d/activate.bat
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,5 @@ | ||
@ECHO OFF | ||
set TEST=teststringfromactivate | ||
|
||
set PATH_PRE_ACTIVATE_DEACTIVATE=%PATH% | ||
set PATH=%TEST%/bin/test;%PATH% |
14 changes: 2 additions & 12 deletions
14
tests/test-recipes/activate_deactivate_package/src/etc/conda/deactivate.d/deactivate.bat
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,2 @@ | ||
@echo off&cls | ||
setlocal EnableDelayedExpansion | ||
|
||
set TEST=teststringfromactivate | ||
|
||
set $line=%PATH% | ||
set $line=%$line: =#% | ||
set $line=%$line:;= % | ||
|
||
for %%a in (%$line%) do echo %%a | find /i %TEST% || set $newpath=!$newpath!;%%a | ||
set $newpath=!$newpath:#= ! | ||
set PATH=!$newpath:~1! | ||
@ECHO OFF | ||
set PATH=%PATH_PRE_ACTIVATE_DEACTIVATE% |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters