From c1645ee86819f53492d474fa0d847693815e45ef Mon Sep 17 00:00:00 2001
From: Meagan Lang <langmm.astro@gmail.com>
Date: Mon, 5 Feb 2024 14:02:01 -0500
Subject: [PATCH] Change how manage_requirements is added to path in doctools
 Add location to ygginfo for not-installed languages that have the
 compiler/interpreter Add step to julia test workflow to check for PyCall
 after it is installed Updated julia interface manifest

---
 .github/workflows/julia-setup.yml             |  9 +++++++++
 yggdrasil/command_line.py                     |  6 ++++++
 yggdrasil/doctools.py                         |  4 ++--
 .../languages/Julia/Yggdrasil/Manifest.toml   | 20 +++++++++++++------
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/julia-setup.yml b/.github/workflows/julia-setup.yml
index 6fc73b093..b806468f4 100644
--- a/.github/workflows/julia-setup.yml
+++ b/.github/workflows/julia-setup.yml
@@ -69,3 +69,12 @@ jobs:
       if: matrix.install-method == 'mamba'
       shell: bash -l {0}
       run: julia -e "using Pkg; Pkg.add(\"PyCall\")"
+
+    # Check for PyCall
+    - name: Check for PyCall
+      if: matrix.install-method == 'pip'
+      run: julia -e "using PyCall"
+    - name: Check for PyCall
+      if: matrix.install-method == 'mamba'
+      shell: bash -l {0}
+      run: julia -e "using PyCall"
diff --git a/yggdrasil/command_line.py b/yggdrasil/command_line.py
index 55da59d62..8236c9e73 100755
--- a/yggdrasil/command_line.py
+++ b/yggdrasil/command_line.py
@@ -666,6 +666,12 @@ def func(cls, args, return_str=False):
                     vardict.append(
                         (curr_prefix + "Language Installed",
                          drv.is_language_installed()))
+                    if drv.is_language_installed():
+                        exec_name = drv.language_executable()
+                        if not os.path.isabs(exec_name):
+                            exec_name = shutil.which(exec_name)
+                        vardict.append((curr_prefix + 'Location',
+                                        exec_name))
                     if drv.executable_type == 'compiler':
                         curr_prefix += prefix
                         vardict += [
diff --git a/yggdrasil/doctools.py b/yggdrasil/doctools.py
index 30c528d92..42b4fad42 100644
--- a/yggdrasil/doctools.py
+++ b/yggdrasil/doctools.py
@@ -870,8 +870,8 @@ def write_package_extras_table(**kwargs):
 
     """
     from yggdrasil import tools
-    utils_dir = os.path.join(
-        os.path.dirname(os.path.dirname(__file__)), 'utils')
+    utils_dir = os.path.join(os.getcwd(), 'utils')
+    print(f"utils_dir = {utils_dir}")
     try:
         sys.path.insert(0, utils_dir)
         from manage_requirements import YggRequirements
diff --git a/yggdrasil/languages/Julia/Yggdrasil/Manifest.toml b/yggdrasil/languages/Julia/Yggdrasil/Manifest.toml
index 356dc68c9..00618a31b 100644
--- a/yggdrasil/languages/Julia/Yggdrasil/Manifest.toml
+++ b/yggdrasil/languages/Julia/Yggdrasil/Manifest.toml
@@ -1,6 +1,6 @@
 # This file is machine-generated - editing it directly is not advised
 
-julia_version = "1.8.5"
+julia_version = "1.9.4"
 manifest_format = "2.0"
 project_hash = "092833a9794cba853c9a02ba934e023a5e264aef"
 
@@ -13,7 +13,7 @@ uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 [[deps.CompilerSupportLibraries_jll]]
 deps = ["Artifacts", "Libdl"]
 uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
-version = "1.0.1+0"
+version = "1.0.5+0"
 
 [[deps.Conda]]
 deps = ["JSON", "VersionParsing"]
@@ -27,6 +27,14 @@ git-tree-sha1 = "89a9db8d28102b094992472d333674bd1a83ce2a"
 uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
 version = "1.5.1"
 
+    [deps.ConstructionBase.extensions]
+    IntervalSetsExt = "IntervalSets"
+    StaticArraysExt = "StaticArrays"
+
+    [deps.ConstructionBase.weakdeps]
+    IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953"
+    StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
+
 [[deps.Dates]]
 deps = ["Printf"]
 uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
@@ -41,7 +49,7 @@ version = "0.21.1"
 uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 
 [[deps.LinearAlgebra]]
-deps = ["Libdl", "libblastrampoline_jll"]
+deps = ["Libdl", "OpenBLAS_jll", "libblastrampoline_jll"]
 uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 
 [[deps.MacroTools]]
@@ -60,7 +68,7 @@ uuid = "a63ad114-7e13-5084-954f-fe012c677804"
 [[deps.OpenBLAS_jll]]
 deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
 uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
-version = "0.3.20+0"
+version = "0.3.21+4"
 
 [[deps.Parsers]]
 deps = ["Dates"]
@@ -104,6 +112,6 @@ uuid = "81def892-9a0e-5fdd-b105-ffc91e053289"
 version = "1.2.0"
 
 [[deps.libblastrampoline_jll]]
-deps = ["Artifacts", "Libdl", "OpenBLAS_jll"]
+deps = ["Artifacts", "Libdl"]
 uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
-version = "5.1.1+0"
+version = "5.8.0+0"