Merge branch 'dev'

gautam-404 · Dec 2, 2023 · e7c571d · e7c571d
2 parents 349279e + 8b721b8
commit e7c571d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/mesaport/Installer/installer.py b/mesaport/Installer/installer.py
@@ -79,7 +79,7 @@ def install(self, version, ostype, directory, cleanAfter):
 
             with subprocess.Popen(f"/bin/bash -c \"export MESASDK_ROOT={sdk_dir} && \
                         source {sdk_dir}/bin/mesasdk_init.sh && gfortran --version\"",
-                        shell=True, stdout=logfile, stderr=logfile) as proc:
+                        shell=True, stdout=logfile, stderr=logfile, env=os.environ.copy()) as proc:
                 proc.wait()
                 if proc.returncode != 0:
                     raise Exception("MESA SDK initialization failed. \
@@ -96,7 +96,7 @@ def install(self, version, ostype, directory, cleanAfter):
             && make -C {mesa_dir}/gyre/gyre \\
             && export GYRE_DIR={mesa_dir}/gyre/gyre \"
             '''
-            with subprocess.Popen(run_in_shell, shell=True, stdout=logfile, stderr=logfile) as proc:
+            with subprocess.Popen(run_in_shell, shell=True, stdout=logfile, stderr=logfile, env=os.environ.copy()) as proc:
                 proc.wait()
                 if proc.returncode != 0:
                     raise Exception("MESA installation failed. \

diff --git a/mesaport/Installer/mesaurls.py b/mesaport/Installer/mesaurls.py
@@ -10,8 +10,8 @@
             "r15140": "https://zenodo.org/record/4311514/files/mesa-r15140.zip",
             "r12778": "https://zenodo.org/record/7319739/files/mesa-r12778.zip"}
 
-linux_sdk_urls = {"latest": "http://user.astro.wisc.edu/~townsend/resource/download/mesasdk/mesasdk-x86_64-linux-22.6.1.tar.gz",
-            "r23.05.1": "http://user.astro.wisc.edu/~townsend/resource/download/mesasdk/mesasdk-x86_64-linux-22.6.1.tar.gz",
+linux_sdk_urls = {"latest": "http://user.astro.wisc.edu/~townsend/resource/download/mesasdk/mesasdk-x86_64-linux-23.7.3.tar.gz",
+            "r23.05.1": "http://user.astro.wisc.edu/~townsend/resource/download/mesasdk/mesasdk-x86_64-linux-23.7.3.tar.gz",
             "r22.11.1": "http://user.astro.wisc.edu/~townsend/resource/download/mesasdk/mesasdk-x86_64-linux-22.6.1.tar.gz",
             "r22.05.1": "http://user.astro.wisc.edu/~townsend/resource/download/mesasdk/mesasdk-x86_64-linux-22.6.1.tar.gz",
             "r21.12.1": "http://user.astro.wisc.edu/~townsend/resource/download/mesasdk/mesasdk-x86_64-linux-21.4.1.tar.gz",
@@ -26,8 +26,8 @@
             "r15140": "http://user.astro.wisc.edu/~townsend/resource/download/mesasdk/mesasdk-x86_64-macos-21.11.1.pkg",
             "r12778": "http://user.astro.wisc.edu/~townsend/resource/download/mesasdk/mesasdk-x86_64-macos-20.11.1.pkg"}
 
-mac_arm_sdk_urls = {"latest": "http://user.astro.wisc.edu/~townsend/resource/download/mesasdk/mesasdk-aarch64-macos-22.10.1.pkg",
-                    "r23.05.1": "http://user.astro.wisc.edu/~townsend/resource/download/mesasdk/mesasdk-aarch64-macos-22.10.1.pkg",
+mac_arm_sdk_urls = {"latest": "http://user.astro.wisc.edu/~townsend/resource/download/mesasdk/mesasdk-aarch64-macos-23.10.1.pkg",
+                    "r23.05.1": "http://user.astro.wisc.edu/~townsend/resource/download/mesasdk/mesasdk-aarch64-macos-23.10.1.pkg",
                     "r22.11.1": "http://user.astro.wisc.edu/~townsend/resource/download/mesasdk/mesasdk-aarch64-macos-22.10.1.pkg",
                     "r22.05.1": "http://user.astro.wisc.edu/~townsend/resource/download/mesasdk/mesasdk-aarch64-macos-22.10.1.pkg"}