chris/galvani
1
0
Fork 0
mirror of https://github.com/echemdata/galvani.git synced 2026-02-04 05:52:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
155 Commits 1 Branch 8 Tags
ca8845bcc995d8e76f33c38a3c3e3bd024c64229
Commit Graph

155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Kerr
a41b40c7a4 Merge pull request #26 from bcolsen/dupli_cols 
[PR] Biologic file with duplicate columns
 2019-05-04 08:38:36 +02:00
Chris Kerr
2a36713b06 Fixed some flake8 warnings in res2sqlite.py 2019-05-03 20:37:27 +02:00
Chris Kerr
f2b62265b9 Fixed some flake8 warnings in BioLogic.py 2019-05-03 20:30:12 +02:00
Chris Kerr
61e2ac8f57 Added unit tests for the VMPdata_dtype_from_colIDs function 2019-05-03 19:46:45 +02:00
Chris Kerr
c401aca741 Get rid of flags2_dict as flags2 doesn't actually exist 2019-05-03 19:15:34 +02:00
Chris Kerr
1f57e48602 Refactor the VMPdata_dtype_from_colIDs function 2019-05-03 19:12:18 +02:00
Chris Kerr
6b0f8b6d37 Add a VMPdata_colID_flags_map dict 2019-05-03 18:47:02 +02:00
Chris Kerr
56a321f8e3 Formatting 2019-05-03 18:39:42 +02:00
Chris Kerr
d991cd496e Merge branch 'master' into dupli_cols 2019-05-03 18:28:38 +02:00
Chris Kerr
531cfc6a42 Merge pull request #24 from bcolsen/loop_module 
[PR] Add parsing of loop index modules
 2019-04-12 07:51:15 +02:00
bcolsen
ef1ea9a2f4 Default loop to none and trim the trailing zeros 2019-04-11 17:30:05 -06:00
bcolsen
b3c5f36e11 flag fix 2019-04-11 11:59:18 -06:00
bcolsen
d1d53e97fa biologic file with duplicate columns 2019-04-09 17:48:38 -06:00
bcolsen
4ba61aa5d8 added parsing of loop_modules 2019-04-09 17:23:16 -06:00
Chris Kerr
4381b02242 Add .pytest_cache to Travis cache 2019-04-03 08:16:55 +02:00
Chris Kerr
846a5b3149 Catch FileNotFoundError from Popen and re-raise a more helpful message 2019-04-03 08:14:05 +02:00
Chris Kerr
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
Chris Kerr
557e755f03 Move Popen call outside the try/finally block 
Ensure that all variables used in the except and finally blocks
are always defined - fixes #23

In Python 3, Popen objects can be used as contextmanagers, but not
in Python 2.7
 2019-04-02 23:09:53 +02:00
Chris Kerr
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
Chris Kerr
5530a7a8ff Add a simple test for loading Arbin .res files 2019-04-02 23:06:23 +02:00
Chris Kerr
d6d6bf1ac7 Use a pytest fixture to locate the testdata directory 2019-04-02 21:34:34 +02:00
Chris Kerr
85cc3f523e Release version 0.0.2 0.0.2 2019-03-30 15:52:44 +01:00
Chris Kerr
b977115d6e Also try parsing dates as '%m-%d-%y' - fixes #20 2019-03-30 15:39:40 +01:00
Chris Kerr
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
Chris Kerr
7a5887fb38 Update existing get_testdata links to HTTPS version 2019-03-30 15:31:18 +01:00
Chris Kerr
2738396c9e Merge branch 'numpy-deprecations' 
Fixes some deprecation warnings with recent versions of Numpy and Python

Closes #22
 2019-03-16 13:51:39 +01:00
Chris Kerr
dcc8ec7fcc Fix 'invalid escape sequence' warnings 2019-03-16 13:50:50 +01:00
Chris Kerr
b08c2f4435 Use array.item() instead of np.asscalar() 2019-03-16 13:43:26 +01:00
Chris Kerr
1bcbc16bab Use np.frombuffer instead of np.fromstring 
Fixes #22
 2019-03-16 13:41:49 +01:00
Chris Kerr
e52efeb9bd Merge branch 'pytest' 
Changes from `nosetests` to `pytest` for running the tests - fixes #5
Pytest is considerably more flexible, and Nose is no longer maintained.
 2019-03-16 13:35:53 +01:00
Chris Kerr
d1e8616f1e Use pytest.mark.parametrize to combine test cases 2019-03-16 13:35:13 +01:00
Chris Kerr
a618f75bb6 Change testing config to use pytest instead of nosetests 
Closes #5
 2019-03-16 13:10:08 +01:00
Chris Kerr
b110162763 Replace nose.raises with pytest.raises 2019-03-16 13:03:54 +01:00
Chris Kerr
de29b0863c Replace nose.eq_ with assert x == y 2019-03-16 12:59:23 +01:00
Chris Kerr
4365c08e8b Merge pull request #19 from bayesfactor/patch-2 
new column types
 2019-03-16 11:53:17 +01:00
Tim
880b4a0a2d new column types 
Introduced new column types that show up in GEIS files
 2019-03-11 10:23:26 -07:00
Chris Kerr
da67a36308 Merge branch 'pypi-release' 
Closes #7
 2019-03-10 10:44:49 +01:00
Chris Kerr
757f56826b Release version 0.0.1 0.0.1 2019-03-10 10:41:56 +01:00
Chris Kerr
d4d56efc47 Merge branch 'master' into pypi-release 2019-03-10 10:39:13 +01:00
Chris Kerr
803c4f3dc2 Disable Python 3.7 Travis testing 2019-03-10 10:38:26 +01:00
Chris Kerr
95ae6caa29 Merge branch 'py37777777' 2019-03-10 10:35:38 +01:00
Chris Kerr
85eb7249ad Use break instead of StopIteration - fixes #17 2019-03-10 10:34:02 +01:00
Chris Kerr
d5f7cfd301 Add python 3.7 to tox.ini and travis.yml 2019-03-10 10:30:46 +01:00
Chris Kerr
bf24fbfa00 Minor formatting tweaks 2019-03-10 09:56:00 +01:00
Chris Kerr
ef95863735 Use README.md for long_description 2019-03-10 09:51:34 +01:00
Chris Kerr
e5e75ff2f0 Make res2sqlite.py an entry_point rather than a script 2019-03-10 09:28:09 +01:00
Chris Kerr
e3d9073d02 Changed res2sqlite to have a main() function 2019-03-10 09:21:57 +01:00
Chris Kerr
c9320dacd7 Merge pull request #13 from bcolsen/add_columns 
Add some more columns
 2019-03-10 09:03:54 +01:00
bcolsen
1904eb124d energy indexes 2018-10-04 16:59:57 -06:00
bcolsen
42ff0d010e added more column types 2018-10-04 15:17:40 -06:00