Merge pull request #100 from Jashcraf/use_pathlib

Use pathlib, added test to make sure materials work and modified setup.cfg to install material data too

.github/workflows/python-app.yml

@@ -14,7 +14,7 @@ permissions:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
 
     steps:
     - uses: actions/checkout@v3
@@ -35,7 +35,7 @@ jobs:
       run: |
         # Replace `linux` below with the appropriate OS
         # Options are `alpine`, `linux`, `macos`, `windows`
-        curl -Os https://uploader.codecov.io/latest/linux/codecov
+        curl -Os https://uploader.codecov.io/latest/macos/codecov
         chmod +x codecov
         ./codecov -t ${CODECOV_TOKEN}
 

poke/materials.py

@@ -1,10 +1,6 @@
 import numpy as np
 from scipy.interpolate import interp1d
-import os
-import poke.materials as matdata
-
-# TODO: Add an _actual_ pathfinder
-matfilepath = os.path.abspath(__file__)[:-12]
+from pathlib import Path
 
 # Silica == Fused Silica
 avail_materials = ['Al','Ag',    # metals
@@ -15,9 +11,10 @@
                    ]
 
 def get_abs_path(file):
-    fullpth =  matfilepath+'material_data/'+file
+    fullpth =  Path(__file__).parent/'material_data'/file
     return fullpth
 
+
 def create_index_model(material,verbose=False):
     """creates an interpolated material based on data available from refractiveindex.info
 
@@ -106,9 +103,4 @@ def create_index_model(material,verbose=False):
     else:
         index_model = n_model
 
-    return index_model
-
-
-
-
-
+    return index_model

setup.cfg

@@ -26,3 +26,6 @@ install_requires =
 python_requires = >= 3.8
 setup_requires = setuptools_scm
 
+[options.package_data]
+poke = material_data/*.csv
+

tests/test_materials.py

@@ -1,28 +1,25 @@
 import numpy as np
 import poke.materials as mat
-import pytest
-import os
 
-# def test_create_index_model():
+def test_create_index_model():
 
-#     # TODO: The file import system doesn't work on the GH Actions test 
+    # TODO: The file import system doesn't work on the GH Actions test 
 
-#     # prealloc lists
-#     reference = []
-#     test = []
+    # prealloc lists
+    reference = []
+    test = []
 
-#     # pick a complex material and a dielectric
-#     materials = ['Al','HfO2']
+    # pick a complex material and a dielectric
+    materials = ['Al','HfO2']
 
-#     # load refractive indices from a certain wavelength
-#     wvl = [0.51660,0.5060]
-#     ns = [0.51427,1.9083754098692]
-#     ks = [4.95111,0]
-#     for material,wave,n,k in zip(materials,wvl,ns,ks):
-#         n_callable = mat.create_index_model(material)
+    # load refractive indices from a certain wavelength
+    wvl = [0.51660,0.5060]
+    ns = [0.51427,1.9083754098692]
+    ks = [4.95111,0]
+    for material,wave,n,k in zip(materials,wvl,ns,ks):
+        n_callable = mat.create_index_model(material)
 
-#         reference.append(n + 1j*k)
-#         test.append(n_callable(wave))
+        reference.append(n + 1j*k)
+        test.append(n_callable(wave))
 
-#     # np.testing.assert_allclose(reference,test)
-#     pass
+    return np.testing.assert_allclose(reference,test)