chris/galvani
1
0
Fork 0
mirror of https://github.com/echemdata/galvani.git synced 2025-12-13 17:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #119 from d-cogswell/master

Browse Source 
Fix deprecated numpy aliases which were removed in 2.0.0
This commit is contained in:
Matthew Evans
2024-07-31 15:54:27 +01:00
committed by GitHub
parent 7d264999db e18a21ffbc
commit 3c1446ff07
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
galvani/BioLogic.py
View File

@@ -56,7 +56,7 @@ def fieldname_to_dtype(fieldname):
"|Permittivity|",
"Tan(Delta)",
):
return (fieldname, np.float_)
return (fieldname, np.float64)
elif fieldname in (
"Q charge/discharge/mA.h",
"step time/s",
@@ -66,15 +66,15 @@ def fieldname_to_dtype(fieldname):
"Efficiency/%",
"Capacity/mA.h",
):
return (fieldname, np.float_)
return (fieldname, np.float64)
elif fieldname in ("cycle number", "I Range", "Ns", "half cycle", "z cycle"):
return (fieldname, np.int_)
elif fieldname in ("dq/mA.h", "dQ/mA.h"):
return ("dQ/mA.h", np.float_)
return ("dQ/mA.h", np.float64)
elif fieldname in ("I/mA", "<I>/mA"):
return ("I/mA", np.float_)
return ("I/mA", np.float64)
elif fieldname in ("Ewe/V", "<Ewe>/V", "Ecell/V", "<Ewe/V>"):
return ("Ewe/V", np.float_)
return ("Ewe/V", np.float64)
elif fieldname.endswith(
(
"/s",
@@ -103,7 +103,7 @@ def fieldname_to_dtype(fieldname):
"/%",
)
):
return (fieldname, np.float_)
return (fieldname, np.float64)
else:
raise ValueError("Invalid column header: %s" % fieldname)

2
setup.py
View File

@@ -36,6 +36,6 @@ setup(
],
},
python_requires=">=3.6",
install_requires=["numpy<2"],
install_requires=["numpy"],
tests_require=["pytest"],
)