chris/galvani
1
0
Fork 0
mirror of https://github.com/echemdata/galvani.git synced 2026-08-12 11:33:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
224 Commits 1 Branch 8 Tags
dbd01957db923b4d1824a4bf1b8a4f9f9d277b1c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
chris dbd01957db Use newer Ubuntu image for CI tests 
We no longer need to use an old Ubuntu image with old mdbtools version.
 2024-01-20 23:41:43 +02:00
chris 13957160f8 Update regular expression for mdbtools 1.0 output 
The output formatting has changed - it now puts multiple data rows in a
single INSERT statement, and also changes the quoting of text data.
 2024-01-20 23:39:41 +02:00
chris 0267b8b59f Bump version to 0.3.0 2024-01-20 22:57:45 +02:00
chrisandGitHub 5448af7e77 Merge pull request #98 from chatcannon/col-27-ewe-ece 
add support for column 27: E_we-E_ce/V
 2024-01-20 22:35:12 +02:00
chris 0b5b5b8ea5 Merge branch 'master' into col-27-ewe-ece 2024-01-20 22:31:12 +02:00
chrisandGitHub daf85d59cf Merge pull request #96 from chatcannon/black 
Format with black
 2024-01-20 22:20:41 +02:00
chris 16961b8169 Reformatted remaining files with black 23.12.1 2024-01-20 21:57:49 +02:00
chris 1cd5bd6239 Reformatted test scripts with black 23.12.1 2024-01-20 21:57:31 +02:00
chris 239db97c69 Reformatted res2sqlite.py with black 23.12.1 2024-01-20 21:57:14 +02:00
chris dee8af3a86 Reformatted BioLogic.py with black 23.12.1 2024-01-20 21:45:28 +02:00
chrisandGitHub 31416533d8 Merge pull request #88 from Paulemeister/master 
Add ID 505 and 509 from EC-Lab
 2023-10-26 09:46:23 +03:00
chrisandGitHub b580ee2d9f Merge pull request #90 from ml-evs/ml-evs/add_gh_actions 
Add tox-gh based CI
 2023-10-26 09:45:47 +03:00
chrisandGitHub 4bca2ac89c Merge pull request #86 from whs92/master 
Fixed syntax error typo
 2022-12-31 10:10:12 +02:00
chrisandGitHub 9f51925612 Merge pull request #75 from chatcannon/yuyu-step-time 
Add "step time/s" column data type
 2022-11-30 18:52:35 +02:00
chrisandGitHub 1025923aac Merge branch 'master' into yuyu-step-time 2022-11-30 18:51:25 +02:00
chrisandGitHub e5a1b847b4 Merge pull request #71 from GhostDeini/patch-1 
Add more column types to BioLogic.py
 2022-11-30 18:44:11 +02:00
chris e1ff99a559 Update test precision for the new data files 2022-09-10 22:33:55 +03:00
chris 0ffdd2665e Improve MPT parsing for the new test data file 2022-09-10 22:33:29 +03:00
chris 54e5765264 Add test data provided by yuyuchen0821 2022-09-10 22:05:46 +03:00
chrisandGitHub d6d2125d69 Merge pull request #68 from chatcannon/add-ewe-column 
Add Column 174 'Ewe/V'
 2022-01-18 18:49:29 +02:00
chris c1e5d92ed0 Add column 174 'Ewe/V' to parser 
Suggested by @Etruria89 to fix #67
 2022-01-15 08:22:06 +02:00
chris b63abc4516 Add a new MPR test file which contains column 174 'Ewe/V' 2022-01-15 08:20:38 +02:00
chrisandGitHub c02a871c35 Merge pull request #58 from chatcannon/testdata-lfs 
Store the test data with git-lfs
 2022-01-15 08:14:07 +02:00
chris 54c3813b32 Update version in setup.py to 0.2.1 2021-09-01 07:13:49 +03:00
chrisandGitHub 3b68a30975 Merge pull request #63 from chatcannon/time-format-dotted 
Add '%m.%d.%y' date format for .mpr file timestamps
 2021-09-01 07:06:58 +03:00
chris ad39747e5c Add .license files for the testdata files sent in by other people 2021-08-31 18:43:16 +03:00
chris f1fbcbec44 Set REUSE metadata for testdata files with dep5 file 2021-08-31 18:33:52 +03:00
chris 4aea136d50 Add SPDX metadata to .gitattributes 2021-08-31 18:25:12 +03:00
chris b9a8afa989 Add test data file for the Rapp/Ohm column ID 2021-08-31 18:21:35 +03:00
chris a3c742e53f Merge branch 'master' into testdata-lfs 2021-08-31 18:21:01 +03:00
chrisandGitHub 7ef5be147b Merge pull request #66 from chatcannon/add-column-R-Ohm 
Add column IDs for 'R/Ohm' and 'Rapp/Ohm'
 2021-08-31 18:19:09 +03:00
chris de182bd400 Add a test for the Rapp/Ohm column ID 2021-08-30 19:45:30 +03:00
chris 9bbff69b36 Add column IDs for 'R/Ohm' and 'Rapp/Ohm' 2021-08-30 19:42:26 +03:00
chris bcd7c5a9b8 Add a test for the parse_BioLogic_date function 2021-07-03 16:08:48 +03:00
chris 4ebdc663a9 Factor the date parsing code out to a separate function 2021-07-02 08:05:27 +03:00
chris cec14e6d50 Add '%m.%d.%y' date format for .mpr file timestamps 
Closes #60
 2021-05-23 21:04:29 +03:00
chris dcd4315421 Merge branch 'master' into testdata-lfs 2021-04-25 20:30:16 +03:00
chrisandGitHub dd605e8fd3 Merge pull request #61 from chatcannon/fsfe-reuse-metadata 
Add REUSE metadata
 2021-04-25 20:25:16 +03:00
chris 352fc436c0 Add REUSE check to the tox tests 2021-03-21 10:20:40 +02:00
chris def2bba587 Add MANIFEST.in to include licence files in the source tarball 
Exclude the MIT licence since the GitHub CodeQL file is not packaged.
 2021-03-20 16:30:08 +02:00
chris 741b17d54d Wheel package actually only needs GPLv3 licence file 
The files with other licences are not included in the wheel package
 2021-03-20 16:25:55 +02:00
chris 0560643ea2 Add setup.cfg to include licences in .whl package 2021-03-20 16:16:37 +02:00
chris d00319fcda Add GPLv3+ License-Identifier to remaining files 2021-03-20 16:13:08 +02:00
chris c57cd523ff Use CC0 Licence for non-copyrightable data 2021-03-20 16:09:15 +02:00
chris 4257a294fb Add SPDX-FileCopyrightText to BioLogic.py 
There are additional committers who have made changes to this
file, but only adding new colIDs etc., which is not copyrightable.

Here is the corresponding git-shortlog output:

Dennis (1):
      Improved compatibility with .mpr files

Peter Attia (1):
      Update BioLogic.py

Tim (3):
      improved parsing for PEIS files
      new column types
      new column types

dennissheberla (2):
      Improved compatibility with .mpt files
      Improved compatibility with new .mpr files

nhshetty-99 (3):
      Added colIDs 74 and 462 to VMPdata_colID_dtype_map
      Changed colID 74 and 462 order from original addition
      Added column 469 to BioLogic.py
 2021-03-20 16:03:26 +02:00
chris b8742bf1ee Add SPDX-FileCopyrightText for the README 2021-03-20 15:35:25 +02:00
chris a78b7113a7 Remove .flake8 file which is no longer used 
The flake8 configuration is in tox.ini instead.
 2021-03-20 15:32:19 +02:00
chris 635655e481 Add licence metadata for imported CodeQL file 2021-03-20 15:31:10 +02:00
chris 4b2042501d Add SPDX-FileCopyrightText for sole author files 2021-03-20 15:26:40 +02:00
chris dd9cf01396 Ran reuse init to create initial REUSE metadata 2021-03-20 15:07:47 +02:00
chrisandGitHub ce011f2f37 Merge pull request #57 from echemdata/add-codeql-analysis 
Enable CodeQL security analysis
 2021-03-20 14:58:40 +02:00
chris 8d317435f6 Remove get_testdata.sh 
This file is no longer needed, because the test data are saved
in the repo with git-lfs.
 2020-11-07 17:54:08 +02:00
chris 093cde0b62 Add all test data files to the repo 
Store the files with git-lfs to avoid making the git history
excessively large.
 2020-11-07 17:53:00 +02:00
chris 8d0e2a4400 Store data files with git-lfs 2020-11-07 17:52:41 +02:00
chris a60caa41c5 Do not ignore testdata files 2020-11-07 17:51:27 +02:00
chrisandGitHub e11419e851 Create codeql-analysis.yml 
As suggested by https://github.com/echemdata/galvani/security
 2020-11-07 17:25:47 +02:00
chrisandGitHub 74413c231e Merge pull request #56 from chatcannon/release-0.2.0 
Bump release version to 0.2.0
 2020-10-31 08:59:18 +02:00
chris ca8845bcc9 Bump release version to 0.2.0 
Update Python version requirement to >=3.6
 2020-10-31 08:52:45 +02:00
chrisandGitHub db9b0c0669 Merge pull request #54 from bayesfactor/master 
Many new column types
 2020-10-31 08:47:19 +02:00
chrisandGitHub 995bcf3d71 Merge pull request #55 from chatcannon/test-py39 
Test with Python 3.9, stop testing Python 3.5
 2020-10-31 08:45:35 +02:00
chris 63f674d897 Test with Python 3.9, stop testing Python 3.5 
Python 3.5 is now end-of-life, Python 3.9 was released 2020-10-05
 2020-10-31 08:31:54 +02:00
chrisandGitHub 21085454fd Merge pull request #53 from chatcannon/arbin-5-26 
Add support for Arbin .res files with version number up to 5.26
 2020-10-31 08:30:45 +02:00
chris 23761dd5bf Add the new data file to test_Arbin.py 2020-10-31 07:51:57 +02:00
chris 8cfc84922b Add example Arbin 5.26 data file to get_testdata.sh 2020-10-31 07:50:06 +02:00
chris 68e00a30ce Add PRIMARY KEY information 2020-10-17 18:34:06 +03:00
chris a1a056d304 Add two new tables that are in 5.26 but not 5.23 
Can_BMS_Info_Table and Can_BMS_Data_Table
 2020-10-17 18:10:58 +03:00
chris c90d604096 Use version number to build a list of tables to convert 2020-10-17 17:57:06 +03:00
chris c25e755296 Reformat lists of table names 2020-10-17 17:48:03 +03:00
chris 60639299b8 Parse out version number from Version_Table 
Previously the version was compared for strict equality so a
higher version did not match.
 2020-10-11 20:40:23 +03:00
chris a0700b0276 Add extra columns to Global and Battery Data tables for v5.26 
Arbin software v5.26 adds additional columns to these existing
tables; these need to be added to the output database so that
the conversion does not fail.
 2020-10-11 16:33:25 +03:00
chrisandGitHub f0c3c6f6c5 Merge pull request #52 from petermattia/patch-2 
Add usage example to README
 2020-10-11 16:08:46 +03:00
chrisandGitHub a2b3b26917 Merge pull request #50 from petermattia/patch-1 
Update BioLogic.py
 2020-09-26 12:56:27 +03:00
chrisandGitHub 90b113a0ab Merge pull request #38 from bcolsen/col_168 
Added RCMP column and column debug info
 2020-07-09 19:59:48 +03:00
chrisandGitHub a343d37b2a Merge pull request #40 from chatcannon/remove-python-2 
Remove Python 2 support
 2020-07-05 11:05:08 +03:00
chrisandGitHub 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
chris 81fbb3dde3 Test with all Python versions 3.5-3.8 2020-02-16 14:35:34 +02:00
chris b2fb092ea3 Remove compability code for Python 2 subprocess module 2020-02-16 14:28:57 +02:00
chris 599413c42f Remove remaining Python 2 compatibility from BioLogic code 2020-02-16 10:01:53 +02:00
chris 87825b7891 Remove str3 compatibility function 2020-02-16 09:59:46 +02:00
chris c2e7a1602f Remove maketrans compatibility code 2020-02-16 09:49:40 +02:00
chris 9ba43ecc2e Add python_requires to setup.py 2020-02-16 09:46:06 +02:00
chris bfdc9aae28 Remove Python 2 from tox and travis tests 2020-02-16 09:34:57 +02:00
chrisandGitHub 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
chrisandGitHub 0c0b48ddcc Release version 0.1.0 (#33) 
Update package URL to the new echemdata repo
 2019-06-02 13:34:39 +02:00
chrisandGitHub e71076bda3 Merge pull request #30 from chatcannon/test-and-fix-Arbin 
Fix Arbin reading code
 2019-06-02 13:18:32 +02:00
chris 0ea049e279 Merge branch 'master' into test-and-fix-Arbin 2019-05-16 17:29:38 +02:00
chrisandGitHub a4cf8c1420 Merge pull request #32 from chatcannon/flake8 
Add code style checking with flake8
 2019-05-16 17:25:36 +02:00
chris aab135391a Change max-line-length to 100 and refactor all longer lines 2019-05-15 07:09:11 +02:00
chris 8abab57c06 Fixed some more flake8 warnings 2019-05-12 09:20:33 +02:00
chris 3440047dc2 Fixed flake8 warning about lambda assignment 2019-05-12 09:15:20 +02:00
chris d137bfccef Add flake8 to tox.ini 2019-05-12 09:14:57 +02:00
chris ed43de1326 Fix flake8 warnings on comments style 2019-05-12 09:13:01 +02:00
chris 1c8335289a Add flake8 configuration 2019-05-12 09:12:40 +02:00
chris 6787a7ec03 Merge branch 'master' into test-and-fix-Arbin 2019-05-05 08:14:43 +02:00
chris e5aada3a85 Merge branch 'master' into flake8 2019-05-05 08:12:52 +02:00
chrisandGitHub a41b40c7a4 Merge pull request #26 from bcolsen/dupli_cols 
[PR] Biologic file with duplicate columns
 2019-05-04 08:38:36 +02:00
chris 2a36713b06 Fixed some flake8 warnings in res2sqlite.py 2019-05-03 20:37:27 +02:00
chris f2b62265b9 Fixed some flake8 warnings in BioLogic.py 2019-05-03 20:30:12 +02:00
chris 61e2ac8f57 Added unit tests for the VMPdata_dtype_from_colIDs function 2019-05-03 19:46:45 +02:00
chris c401aca741 Get rid of flags2_dict as flags2 doesn't actually exist 2019-05-03 19:15:34 +02:00