Commit Graph

27 Commits

Author SHA1 Message Date
6787a7ec03 Merge branch 'master' into test-and-fix-Arbin 2019-05-05 08:14:43 +02:00
61e2ac8f57 Added unit tests for the VMPdata_dtype_from_colIDs function 2019-05-03 19:46:45 +02:00
846a5b3149 Catch FileNotFoundError from Popen and re-raise a more helpful message 2019-04-03 08:14:05 +02:00
6a8fbe71a4 Add some tests for the res2sqlite command-line tool
Check that the --help option works even if mdbtools is not installed
2019-04-02 23:11:37 +02:00
a1b73867ea Add a test that a sensible error is raised when MDBTools is not found
This is the error that happens in issue #23
2019-04-02 23:07:12 +02:00
5530a7a8ff Add a simple test for loading Arbin .res files 2019-04-02 23:06:23 +02:00
d6d6bf1ac7 Use a pytest fixture to locate the testdata directory 2019-04-02 21:34:34 +02:00
2471148c21 Add new test data file with different date format
This tests for issue #20

Thanks @JBWarrington for providing this file
2019-03-30 15:38:58 +01:00
d1e8616f1e Use pytest.mark.parametrize to combine test cases 2019-03-16 13:35:13 +01:00
b110162763 Replace nose.raises with pytest.raises 2019-03-16 13:03:54 +01:00
de29b0863c Replace nose.eq_ with assert x == y 2019-03-16 12:59:23 +01:00
Chris Kerr
ae2b263989 FigShare changes all '-' to '_' in filenames 2014-11-08 11:26:43 +00:00
Chris Kerr
7da8b8b5e6 Changed to a standard setuptools package layout 2014-11-07 15:42:53 +00:00
Chris Kerr
ef6e7335e9 Added the test data files sent by Matthias Richter (see #1)
Had to make a few changes to ensure that they open correctly
2014-11-06 09:54:38 +00:00
Chris Kerr
cfffeee2e2 Made the individual components of the "flags" and "flags2" columns accessible
New function MPRfile.get_flag(flagname)
2014-05-01 23:02:23 +01:00
Chris Kerr
c302ec9117 Tweaks to make things work in both python 3 and python 2 2013-12-12 15:24:20 +00:00
Chris Kerr
34440068a7 Added support for parsing out the timestamp
The timestamp is in the LOG module, at an offset of either 465 or
469. There is no obvious marker for which files have it at 465 and
which at 469.
2013-12-11 22:21:50 +00:00
Chris Kerr
de84f9dd40 Added column IDs from step voltammetry 2013-12-11 13:14:19 +00:00
Chris Kerr
00e6670b4a Added I/mA column type = 8
Also there seems to be a duplicate of colID=23 is the same as 7 (dq/mAh)
2013-12-11 12:50:45 +00:00
Chris Kerr
ce554aab2c Column ID 19 is "control/V"
Added some new test data to support this
2013-12-11 11:58:41 +00:00
Chris Kerr
3483195228 "control/V" and "control/V/mA" are different
No longer forcing them both to "control/V/mA"
2013-12-11 11:54:07 +00:00
Chris Kerr
509b75a81f Deal with yet another format - with more flags data (I think) 2013-12-08 14:07:32 +00:00
Chris Kerr
0ce9b6fb16 There seem to be several different MPR formats - adding a test for a different one 2013-12-08 13:09:35 +00:00
Chris Kerr
7d0f1e0172 Added code to parse the date string in the module headers 2013-12-04 23:20:26 +00:00
Chris Kerr
1f9c9653c5 Added class to read in .mpr files
The class currently just reads the main data section and does not
process any of the headers or log information.
2013-11-30 20:08:08 +00:00
Chris Kerr
d909305b74 Added a class to read in .mpt files as numpy record arrays
Realised that comparing numpy arrays read in from the binary .mpr
files to a csv.DictReader would be more work than just writing a
new function to read in a record array.
2013-11-30 11:35:44 +00:00
Chris Kerr
9e66d589a4 Simple function for reading in .mpt text files
This will be helpful for checking the data read in by the .mpr
file reader
2013-11-29 22:19:01 +00:00