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
236 Commits 1 Branch 8 Tags
cd3eaae2c19240d143b75e39184f4485bc6a2787
Commit Graph

236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Kerr
90b113a0ab Merge pull request #38 from bcolsen/col_168 
Added RCMP column and column debug info
 2020-07-09 19:59:48 +03:00
bcolsen
18a1ce6848 fix pep 2020-07-07 18:13:53 -06:00
bcolsen
18e8a450fa pep8 fix 2020-07-07 18:07:30 -06:00
bcolsen
4098890c05 changed error to report previous column name 2020-07-07 17:57:59 -06:00
bcolsen
68bac0a5aa Added RCMP column and column debug info 2020-07-07 17:57:59 -06:00
Chris Kerr
a343d37b2a Merge pull request #40 from chatcannon/remove-python-2 
Remove Python 2 support
 2020-07-05 11:05:08 +03:00
Chris Kerr
e67edf9e17 Merge pull request #43 from nhshetty-99/master 
Added colIDs 74 and 462 to VMPdata_colID_dtype_map
 2020-07-03 21:30:30 +03:00
nhshetty-99
37487da5d3 Added column 469 to BioLogic.py 2020-07-03 14:15:37 -04:00
nhshetty-99
8370a58109 Changed colID 74 and 462 order from original addition 2020-06-28 13:06:11 -04:00
nhshetty-99
c703f31da2 Added colIDs 74 and 462 to VMPdata_colID_dtype_map 2020-06-27 22:40:31 -04:00
Chris Kerr
81fbb3dde3 Test with all Python versions 3.5-3.8 2020-02-16 14:35:34 +02:00
Chris Kerr
b2fb092ea3 Remove compability code for Python 2 subprocess module 2020-02-16 14:28:57 +02:00
Chris Kerr
599413c42f Remove remaining Python 2 compatibility from BioLogic code 2020-02-16 10:01:53 +02:00
Chris Kerr
87825b7891 Remove str3 compatibility function 2020-02-16 09:59:46 +02:00
Chris Kerr
c2e7a1602f Remove maketrans compatibility code 2020-02-16 09:49:40 +02:00
Chris Kerr
9ba43ecc2e Add python_requires to setup.py 2020-02-16 09:46:06 +02:00
Chris Kerr
bfdc9aae28 Remove Python 2 from tox and travis tests 2020-02-16 09:34:57 +02:00
Chris Kerr
a74a0267c2 Merge pull request #36 from bcolsen/version3 
Added initial support for VMP data module version 3
 2019-10-08 22:22:37 +02:00
bcolsen
72d79146e6 Added initial support for VMP data module version 3 2019-10-08 13:23:18 -06:00
Chris Kerr
0c0b48ddcc Release version 0.1.0 (#33) 
Update package URL to the new echemdata repo
 2019-06-02 13:34:39 +02:00
Chris Kerr
e71076bda3 Merge pull request #30 from chatcannon/test-and-fix-Arbin 
Fix Arbin reading code
 2019-06-02 13:18:32 +02:00
Chris Kerr
0ea049e279 Merge branch 'master' into test-and-fix-Arbin 2019-05-16 17:29:38 +02:00
Chris Kerr
a4cf8c1420 Merge pull request #32 from chatcannon/flake8 
Add code style checking with flake8
 2019-05-16 17:25:36 +02:00
Chris Kerr
aab135391a Change max-line-length to 100 and refactor all longer lines 2019-05-15 07:09:11 +02:00
Chris Kerr
8abab57c06 Fixed some more flake8 warnings 2019-05-12 09:20:33 +02:00
Chris Kerr
3440047dc2 Fixed flake8 warning about lambda assignment 2019-05-12 09:15:20 +02:00
Chris Kerr
d137bfccef Add flake8 to tox.ini 2019-05-12 09:14:57 +02:00
Chris Kerr
ed43de1326 Fix flake8 warnings on comments style 2019-05-12 09:13:01 +02:00
Chris Kerr
1c8335289a Add flake8 configuration 2019-05-12 09:12:40 +02:00
Chris Kerr
6787a7ec03 Merge branch 'master' into test-and-fix-Arbin 2019-05-05 08:14:43 +02:00
Chris Kerr
e5aada3a85 Merge branch 'master' into flake8 2019-05-05 08:12:52 +02:00
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