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
169 Commits 1 Branch 8 Tags
def2bba5872825bb15dbc8ece7d6a7ca4023d7f4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
chris 1f57e48602 Refactor the VMPdata_dtype_from_colIDs function 2019-05-03 19:12:18 +02:00
chris 6b0f8b6d37 Add a VMPdata_colID_flags_map dict 2019-05-03 18:47:02 +02:00
chris 56a321f8e3 Formatting 2019-05-03 18:39:42 +02:00
chris d991cd496e Merge branch 'master' into dupli_cols 2019-05-03 18:28:38 +02:00
chrisandGitHub 531cfc6a42 Merge pull request #24 from bcolsen/loop_module 
[PR] Add parsing of loop index modules
 2019-04-12 07:51:15 +02:00
chris 4381b02242 Add .pytest_cache to Travis cache 2019-04-03 08:16:55 +02:00
chris 846a5b3149 Catch FileNotFoundError from Popen and re-raise a more helpful message 2019-04-03 08:14:05 +02:00
chris 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 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 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 5530a7a8ff Add a simple test for loading Arbin .res files 2019-04-02 23:06:23 +02:00
chris d6d6bf1ac7 Use a pytest fixture to locate the testdata directory 2019-04-02 21:34:34 +02:00
chris 85cc3f523e Release version 0.0.2 2019-03-30 15:52:44 +01:00
chris b977115d6e Also try parsing dates as '%m-%d-%y' - fixes #20 2019-03-30 15:39:40 +01:00
chris 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 7a5887fb38 Update existing get_testdata links to HTTPS version 2019-03-30 15:31:18 +01:00
chris 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 dcc8ec7fcc Fix 'invalid escape sequence' warnings 2019-03-16 13:50:50 +01:00
chris b08c2f4435 Use array.item() instead of np.asscalar() 2019-03-16 13:43:26 +01:00
chris 1bcbc16bab Use np.frombuffer instead of np.fromstring 
Fixes #22
 2019-03-16 13:41:49 +01:00
chris 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 d1e8616f1e Use pytest.mark.parametrize to combine test cases 2019-03-16 13:35:13 +01:00
chris a618f75bb6 Change testing config to use pytest instead of nosetests 
Closes #5
 2019-03-16 13:10:08 +01:00
chris b110162763 Replace nose.raises with pytest.raises 2019-03-16 13:03:54 +01:00
chris de29b0863c Replace nose.eq_ with assert x == y 2019-03-16 12:59:23 +01:00
chrisandGitHub 4365c08e8b Merge pull request #19 from bayesfactor/patch-2 
new column types
 2019-03-16 11:53:17 +01:00
chris da67a36308 Merge branch 'pypi-release' 
Closes #7
 2019-03-10 10:44:49 +01:00
chris 757f56826b Release version 0.0.1 2019-03-10 10:41:56 +01:00
chris d4d56efc47 Merge branch 'master' into pypi-release 2019-03-10 10:39:13 +01:00
chris 803c4f3dc2 Disable Python 3.7 Travis testing 2019-03-10 10:38:26 +01:00
chris 95ae6caa29 Merge branch 'py37777777' 2019-03-10 10:35:38 +01:00
chris 85eb7249ad Use break instead of StopIteration - fixes #17 2019-03-10 10:34:02 +01:00
chris d5f7cfd301 Add python 3.7 to tox.ini and travis.yml 2019-03-10 10:30:46 +01:00
chris bf24fbfa00 Minor formatting tweaks 2019-03-10 09:56:00 +01:00
chris ef95863735 Use README.md for long_description 2019-03-10 09:51:34 +01:00
chris e5e75ff2f0 Make res2sqlite.py an entry_point rather than a script 2019-03-10 09:28:09 +01:00
chris e3d9073d02 Changed res2sqlite to have a main() function 2019-03-10 09:21:57 +01:00
chrisandGitHub c9320dacd7 Merge pull request #13 from bcolsen/add_columns 
Add some more columns
 2019-03-10 09:03:54 +01:00
chrisandGitHub 809f1df914 Merge pull request #12 from bayesfactor/patch-1 
improved parsing for PEIS files
 2018-09-29 18:40:12 +02:00
chris c77b0a2444 Merge branch 'cherry-pick-pr-3-dennissheberla' 
Since @dennissheberla did not make the changes requested in the review
of pull request #3, I have cherry-picked the changes I want to keep and
am now merging them to master manually.

Closes #3
 2017-04-22 13:56:54 +02:00
chris 791cb8987e In get_testdata.sh, don't download files that have already been downloaded 2017-04-22 13:27:55 +02:00
chris 760bf30b1a Add caching to the .travis.yml file 2017-04-22 13:17:06 +02:00
chris 49bfcb75eb Proper syntax for two install commands 2017-04-22 13:08:06 +02:00