Merge pull request #15 from VirtualPlanetaryLaboratory/PipInstall

Pip install

.github/workflows/wheels.yml → .github/workflows/pip-install.yml

@@ -1,4 +1,4 @@
-name: wheels
+name: pip-install
 
 on:
   release:
@@ -8,17 +8,22 @@ on:
 jobs:
 
   build:
-    name: Build source distribution
-    runs-on: ubuntu-latest
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        python: ['3.7', '3.8', '3.9']
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
+          submodules: true
           fetch-depth: 0
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         name: Install Python
         with:
-          python-version: "3.8"
+          python-version: ${{ matrix.python }}
 
       - name: Build
         run: |
@@ -37,7 +42,7 @@ jobs:
           venv-wheel/bin/python -m pip install dist/multiplanet*.whl
           venv-wheel/bin/python -c "import multiplanet; print(multiplanet.__version__)"
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           path: dist/*
 
@@ -46,7 +51,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'release' && github.event.action == 'published'
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: artifact
           path: dist

tests/Bigplanet/test_bigplanet.py

@@ -4,34 +4,39 @@
 import subprocess
 import sys
 import warnings
-
+import shutil
 import numpy as np
 
 
-def test_mp_bigplanet():
-    # gets current path
+def test_bigplanet():
+    # Get current path
     path = pathlib.Path(__file__).parents[0].absolute()
     sys.path.insert(1, str(path.parents[0]))
 
-    # gets the number of cores on the machine
+    dir = (path / "MP_Bigplanet")
+    checkpoint = (path / ".MP_Bigplanet")
+
+    # Get the number of cores on the machine
     cores = mp.cpu_count()
     if cores == 1:
         warnings.warn("There is only 1 core on the machine", stacklevel=3)
     else:
+        # Remove anything from previous tests
+        if (dir).exists():
+            shutil.rmtree(dir)
+        if (checkpoint).exists():
+            os.remove(checkpoint)
+
         # Run vspace
-        if not (path / "MP_Bigplanet").exists():
-            subprocess.check_output(["vspace", "vspace.in"], cwd=path)
+        subprocess.check_output(["vspace", "vspace.in"], cwd=path)
 
         # Run multi-planet
-        if not (path / ".MP_Bigplanet").exists():
-            subprocess.check_output(
-                ["multiplanet", "vspace.in", "-bp"], cwd=path
-            )
+        subprocess.check_output(["multiplanet", "vspace.in", "-bp"], cwd=path)
 
         file = path / "MP_Bigplanet.bpa"
 
         assert os.path.isfile(file) == True
 
 
 if __name__ == "__main__":
-    test_mp_bigplanet()
+    test_bigplanet()

tests/Checkpoint/test_checkpoint.py

@@ -0,0 +1,44 @@
+import subprocess
+import numpy as np
+import os
+import multiprocessing as mp
+import warnings
+import pathlib
+import sys
+import shutil
+
+def test_checkpoint():
+    # Get current path
+    path = pathlib.Path(__file__).parents[0].absolute()
+    sys.path.insert(1, str(path.parents[0]))
+
+    dir = (path / "MP_Checkpoint")
+    checkpoint = (path / ".MP_Checkpoint")
+
+    # Get the number of cores on the machine
+    cores = mp.cpu_count()
+    if cores == 1:
+        warnings.warn("There is only 1 core on the machine",stacklevel=3)
+    else:
+        # Remove anything from previous tests
+        if (dir).exists():
+            shutil.rmtree(dir)
+        if (checkpoint).exists():
+            os.remove(checkpoint)
+
+        # Run vspace
+        subprocess.check_output(["vspace", "vspace.in"], cwd=path)
+
+        # Run multi-planet
+        subprocess.check_output(["multiplanet", "vspace.in"], cwd=path)
+
+        # Gets list of folders
+        folders = sorted([f.path for f in os.scandir(dir) if f.is_dir()])
+
+        for i in range(len(folders)):
+            os.chdir(folders[i])
+            assert os.path.isfile('earth.earth.forward') == True
+            os.chdir('../')
+
+if __name__ == "__main__":
+    test_checkpoint()

tests/MpStatus/test_mpstatus.py

@@ -4,33 +4,37 @@
 import subprocess
 import sys
 import warnings
-
-import numpy as np
-
+import pathlib
+import shutil
 
 def test_mpstatus():
-    # gets current path
+    # Get current path
     path = pathlib.Path(__file__).parents[0].absolute()
     sys.path.insert(1, str(path.parents[0]))
 
-    # gets the number of cores on the machine
+    dir = (path / "MP_Status")
+    checkpoint = (path / ".MP_Status")
+
+    # Get the number of cores on the machine
     cores = mp.cpu_count()
     if cores == 1:
         warnings.warn("There is only 1 core on the machine", stacklevel=3)
     else:
+        # Remove anything from previous tests
+        if (dir).exists():
+            shutil.rmtree(dir)
+        if (checkpoint).exists():
+            os.remove(checkpoint)
+
         # Run vspace
-        if not (path / "MP_Status").exists():
-            subprocess.check_output(["vspace", "vspace.in"], cwd=path)
-
-        # Run multi-planet
-        if not (path / ".MP_Status").exists():
-            subprocess.check_output(["multiplanet", "vspace.in"], cwd=path)
-            subprocess.check_output(["mpstatus", "vspace.in"], cwd=path)
-
-        # gets list of folders
-        folders = sorted(
-            [f.path for f in os.scandir(path / "MP_Status") if f.is_dir()]
-        )
+        subprocess.check_output(["vspace", "vspace.in"], cwd=path)
+
+        # Run multi-planet and mpstatus
+        subprocess.check_output(["multiplanet", "vspace.in"], cwd=path)
+        subprocess.check_output(["mpstatus", "vspace.in"], cwd=path)
+
+        # Get list of folders
+        folders = sorted([f.path for f in os.scandir(dir) if f.is_dir()])
 
         for i in range(len(folders)):
             os.chdir(folders[i])

tests/Parallel/test_parallel.py

@@ -0,0 +1,43 @@
+import subprocess
+import numpy as np
+import os
+import pathlib
+import multiprocessing as mp
+import warnings
+import sys
+import shutil
+
+def test_parallel():
+    # Get current path
+    path = pathlib.Path(__file__).parents[0].absolute()
+    sys.path.insert(1, str(path.parents[0]))
+
+    dir = (path / "MP_Parallel")
+    checkpoint = (path / ".MP_Parallel")
+
+    # Get the number of cores on the machine
+    cores = mp.cpu_count()
+    if cores == 1:
+        warnings.warn("There is only 1 core on the machine",stacklevel=3)
+    else:
+        # Remove anything from previous tests
+        if (dir).exists():
+            shutil.rmtree(dir)
+        if (checkpoint).exists():
+            os.remove(checkpoint)
+
+        # Run vspace
+        subprocess.check_output(["vspace", "vspace.in"], cwd=path)
+
+        # Run multi-planet
+        subprocess.check_output(["multiplanet", "vspace.in"], cwd=path)
+
+        folders = sorted([f.path for f in os.scandir(dir) if f.is_dir()])
+
+        for i in range(len(folders)):
+            os.chdir(folders[i])
+            assert os.path.isfile('earth.earth.forward') == True
+            os.chdir('../')
+
+if __name__ == "__main__":
+    test_parallel()