-
-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* set JULIA_DEPOT_PATH when conda env activated * simplify recipe and add back up variables * don't run juliarc.jl * improve activate.d/deactivate.d file editing * Apply suggestions from code review by @mkitti * This uses the activate.sh and deactivate.sh scripts that backup the environment variable. * Create a new shared environment located in the site depot for the environment rather than continuing to use the default one in ~/.julia/environments/v#.#. * reorganize * increase bld no * try building osx with system mbedtls * only apply three new patches to linux for now * reorganize order of patches * Revert "try building osx with system mbedtls" This reverts commit 1b1d170. * comment out juliarc.jl * Update build.sh * try runtests math for osx * test "opaque_closure", "filesystem" * go all in on testing * revert previous; parallelize + add "math" to list - use all processors: ncores=ceil(Int, Sys.CPU_THREADS - move math up to regular tests (no longer necessary to stop it from running on osx) * Update build.sh * Update activate.sh * Revert "Update activate.sh" This reverts commit fe2b9c9. * new patches * correct patches in meta * change of patches * Update meta.yaml * Modify patch to match upstream JuliaLang/julia#42358. Use addenv. * Re-add JULIA_PROJECT to be "@$CONDA_DEFAULT_ENV" * Revert "Re-add JULIA_PROJECT to be "@$CONDA_DEFAULT_ENV"" This reverts commit 1e312a1. * Set JULIA_PROJECT and JULIA_LOAD_PATH according to conda environment * Test loading and cmdlineargs with default JULIA_PROJECT * Extract env name as last directory of CONDA_PREFIX * Remove JULIA_LOAD_PATH while testing loading * Update build.sh * Delete recipe/old_unused directory * reorganize patches and delete unnecessary files * remove DS_STORE * oops place back patches * Apply suggestions from code review, remove "unique" Co-authored-by: ngam <67342040+ngam@users.noreply.github.com> Co-authored-by: Matt Johnson <mjohnson541@gmail.com> Co-authored-by: Mark Kittisopikul <mkitti@users.noreply.github.com> Co-authored-by: Mark Kittisopikul <markkitt@gmail.com>
- Loading branch information
1 parent
1c6f843
commit bd5133e
Showing
11 changed files
with
86 additions
and
30 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
This file was deleted.
Oops, something went wrong.
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
8 changes: 4 additions & 4 deletions
8
recipe/0001-fixing-core.jl-tests.patch → ...-disable-testing-Vararg-Int-N-where.patch
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
25 changes: 25 additions & 0 deletions
25
recipe/patches/0003-correct-test-for-julia-depot-path.patch
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 |
---|---|---|
@@ -0,0 +1,25 @@ | ||
From e4f0e7c7f750dc0f27fd59c1fe7cd8d70dbd2fc9 Mon Sep 17 00:00:00 2001 | ||
From: ngam <67342040+ngam@users.noreply.github.com> | ||
Date: Sun, 26 Dec 2021 21:45:50 -0500 | ||
Subject: [PATCH 3/3] Correct test for JULIA_DEPOT_PATH, See JuliaLang/julia#42358 | ||
|
||
--- | ||
test/cmdlineargs.jl | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/test/cmdlineargs.jl b/test/cmdlineargs.jl | ||
index 3d1efdd0d2..7fb7e5ad9e 100644 | ||
--- a/test/cmdlineargs.jl | ||
+++ b/test/cmdlineargs.jl | ||
@@ -119,7 +119,7 @@ let exename = `$(Base.julia_cmd()) --startup-file=no --color=no` | ||
# handling of @projectname in --project and JULIA_PROJECT | ||
let expanded = abspath(Base.load_path_expand("@foo")) | ||
@test expanded == readchomp(`$exename --project='@foo' -e 'println(Base.active_project())'`) | ||
- @test expanded == readchomp(setenv(`$exename -e 'println(Base.active_project())'`, "JULIA_PROJECT" => "@foo", "HOME" => homedir())) | ||
+ @test expanded == readchomp(addenv(`$exename -e 'println(Base.active_project())'`, "JULIA_PROJECT" => "@foo", "HOME" => homedir())) | ||
end | ||
|
||
# --quiet, --banner | ||
-- | ||
2.34.1 | ||
|
File renamed without changes.
File renamed without changes.
This file was deleted.
Oops, something went wrong.
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 |
---|---|---|
@@ -0,0 +1,14 @@ | ||
export JULIA_DEPOT_PATH_BACKUP=${JULIA_DEPOT_PATH:-} | ||
export JULIA_PROJECT_BACKUP=${JULIA_PROJECT:-} | ||
export JULIA_LOAD_PATH_BACKUP=${JULIA_LOAD_PATH:-} | ||
|
||
# Move ~/.julia to a conda environment specific location | ||
export JULIA_DEPOT_PATH="$CONDA_PREFIX/share/julia:$JULIA_DEPOT_PATH" | ||
|
||
# Create a named environment for each conda environment | ||
# Use of @ to specify a shared named environment is new as of Julia 1.7 | ||
# https://github.com/JuliaLang/julia/pull/40025 | ||
# The name of the environment is the last directory of the CONDA_PREFIX | ||
export JULIA_PROJECT="@${CONDA_PREFIX##*/}" | ||
# Modify load path so that projects stack on the conda-named environment | ||
export JULIA_LOAD_PATH="@:$JULIA_PROJECT:@stdlib" |
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 |
---|---|---|
@@ -0,0 +1,17 @@ | ||
export JULIA_DEPOT_PATH=$JULIA_DEPOT_PATH_BACKUP | ||
export JULIA_PROJECT=$JULIA_PROJECT_BACKUP | ||
export JULIA_LOAD_PATH=$JULIA_LOAD_PATH_BACKUP | ||
|
||
unset JULIA_DEPOT_PATH_BACKUP | ||
unset JULIA_PROJECT_BACKUP | ||
unset JULIA_LOAD_PATH_BACKUP | ||
|
||
if [ -z $JULIA_DEPOT_PATH ]; then | ||
unset JULIA_DEPOT_PATH | ||
fi | ||
if [ -z $JULIA_PROJECT ]; then | ||
unset JULIA_PROJECT | ||
fi | ||
if [ -z $JULIA_LOAD_PATH ]; then | ||
unset JULIA_LOAD_PATH | ||
fi |