Merge branch 'eigen' of github.com:namurphy/PlasmaPy-NEI into eigen

docs/conf.py

@@ -60,7 +60,9 @@
     'numpy': ('https://docs.scipy.org/doc/numpy', None),
     'scipy': ('https://docs.scipy.org/doc/scipy/reference/', None),
     'pandas': ('http://pandas.pydata.org/pandas-docs/stable/', None),
-    'astropy': ('http://docs.astropy.org/en/stable/', None)}
+    'astropy': ('http://docs.astropy.org/en/stable/', None),
+    'plasmapy': ('http://docs.plasmapy.org/en/latest/', None),
+}
 
 # -- Options for HTML output -------------------------------------------------
 

plasmapy_nei/eigen/eigenclass.py

@@ -115,7 +115,7 @@ def _load_data(self):
 
         with h5py.File(filename, "r") as file:
             self._temperature_grid = file["te_gird"][:]  # TODO: fix typo in HDF5 file
-            self._ntemp = len(self.temperature_grid)
+            self._ntemp = self._temperature_grid.size
             c_ori = file["ioniz_rate"][:]
             r_ori = file["recomb_rate"][:]
 
@@ -304,9 +304,9 @@ def eigenvalues(self, T_e=None, T_e_index=None):
         Returns the eigenvalues for the ionization and recombination
         rates for the temperature specified in the class.
         """
-        if T_e_index:
+        if T_e_index is not None:
             return self._eigenvalues[T_e_index, :]
-        elif T_e:
+        elif T_e is not None:
             T_e_index = self._get_temperature_index(T_e)
             return self._eigenvalues[T_e_index, :]
         elif self.temperature:

setup.cfg

@@ -15,9 +15,10 @@ python_requires = >=3.7
 setup_requires =
     setuptools_scm
 install_requires = 
-    astropy
-    plasmapy
+    astropy>=3.2
     h5py
+    numpy>=1.16
+    plasmapy>=0.3.1
 
 
 [options.entry_points]
@@ -120,4 +121,3 @@ max-line-length = 88
 line_length=88
 multi_line_output=3
 include_trailing_comma: True
-

setup.py

@@ -20,6 +20,5 @@
         "write_to": os.path.join("plasmapy_nei", "version.py"),
         "write_to_template": VERSION_TEMPLATE,
     },
-    install_requires=["plasmapy>=0.3.1", "numpy>=1.16", "astropy>=3.2", "h5py"],
     include_package_data=True,
 )