Commit Graph

  • b110162763 Replace nose.raises with pytest.raises Chris Kerr 2019-03-16 13:03:54 +01:00
  • de29b0863c Replace nose.eq_ with assert x == y Chris Kerr 2019-03-16 12:59:23 +01:00
  • 4365c08e8b Merge pull request #19 from bayesfactor/patch-2 Chris Kerr 2019-03-16 11:53:17 +01:00
  • 880b4a0a2d new column types Tim 2019-03-11 10:23:26 -07:00
  • da67a36308 Merge branch 'pypi-release' Chris Kerr 2019-03-10 10:44:49 +01:00
  • 757f56826b Release version 0.0.1 0.0.1 Chris Kerr 2019-03-10 10:41:56 +01:00
  • d4d56efc47 Merge branch 'master' into pypi-release Chris Kerr 2019-03-10 10:39:13 +01:00
  • 803c4f3dc2 Disable Python 3.7 Travis testing Chris Kerr 2019-03-10 10:38:26 +01:00
  • 95ae6caa29 Merge branch 'py37777777' Chris Kerr 2019-03-10 10:35:38 +01:00
  • 85eb7249ad Use break instead of StopIteration - fixes #17 Chris Kerr 2019-03-10 10:34:02 +01:00
  • d5f7cfd301 Add python 3.7 to tox.ini and travis.yml Chris Kerr 2019-03-10 10:30:14 +01:00
  • bf24fbfa00 Minor formatting tweaks Chris Kerr 2019-03-10 09:56:00 +01:00
  • ef95863735 Use README.md for long_description Chris Kerr 2019-03-10 09:51:34 +01:00
  • e5e75ff2f0 Make res2sqlite.py an entry_point rather than a script Chris Kerr 2019-03-10 09:28:09 +01:00
  • e3d9073d02 Changed res2sqlite to have a main() function Chris Kerr 2019-03-10 09:21:57 +01:00
  • c9320dacd7 Merge pull request #13 from bcolsen/add_columns Chris Kerr 2019-03-10 09:03:54 +01:00
  • 1904eb124d energy indexes bcolsen 2018-10-04 16:59:57 -06:00
  • 42ff0d010e added more column types bcolsen 2018-10-04 15:17:40 -06:00
  • 809f1df914 Merge pull request #12 from bayesfactor/patch-1 Chris Kerr 2018-09-29 18:40:12 +02:00
  • 3cf6bca027 improved parsing for PEIS files Tim 2018-07-10 22:42:23 -07:00
  • c77b0a2444 Merge branch 'cherry-pick-pr-3-dennissheberla' Chris Kerr 2017-04-22 13:56:54 +02:00
  • ebdb030f6a Improved compatibility with .mpr files Dennis 2015-12-13 13:06:34 -05:00
  • 9109285b58 Improved compatibility with new .mpr files dennissheberla 2015-08-06 12:57:47 -04:00
  • b96fedac05 Improved compatibility with .mpt files dennissheberla 2015-08-04 12:32:48 -04:00
  • 3423fe7dc9 Merge pull request #11 from chatcannon/tox Chris Kerr 2017-04-22 13:31:04 +02:00
  • 791cb8987e In get_testdata.sh, don't download files that have already been downloaded Chris Kerr 2017-04-22 13:27:55 +02:00
  • f58b3f6ffd Merge pull request #10 from chatcannon/fix-numpy-1.12 Chris Kerr 2017-04-22 13:18:09 +02:00
  • 760bf30b1a Add caching to the .travis.yml file Chris Kerr 2017-04-22 13:17:06 +02:00
  • 49bfcb75eb Proper syntax for two install commands Chris Kerr 2017-04-22 13:08:06 +02:00
  • 3d21eade48 Tox testing on Travis with tox-travis Chris Kerr 2017-04-22 13:05:19 +02:00
  • 169f2a6b88 Added tox.ini for testing with tox Chris Kerr 2017-04-22 13:02:53 +02:00
  • dfd0d14eae Merge branch 'master' into fix-numpy-1.12 Chris Kerr 2017-04-22 12:56:09 +02:00
  • f1b618f121 Merge pull request #9 from chatcannon/setup-travis-ci Chris Kerr 2017-04-22 12:55:39 +02:00
  • 5df258f125 Don't test on Python 2.6 as it does not have OrderedDict Chris Kerr 2017-04-22 12:54:07 +02:00
  • fa264ff08e Download the test data when running the tests Chris Kerr 2017-04-22 12:51:01 +02:00
  • a7d93035e8 Use nosetests in .travis.yml Chris Kerr 2017-04-22 12:48:21 +02:00
  • e38dc0c92a Created requirements.txt Chris Kerr 2017-04-22 12:47:05 +02:00
  • b8c8f23f63 Default Python .travis.yml file from the Travis-CI docs Chris Kerr 2017-04-22 12:38:23 +02:00
  • 22878be0c5 Explicitly coerce size-1 array to scalar Chris Kerr 2017-04-22 12:34:02 +02:00
  • 70e60b3565 Ignore .cache directory Chris Kerr 2017-04-22 12:29:08 +02:00
  • 907f209476 Requirements should be a list Chris Kerr 2014-11-09 12:48:20 +00:00
  • 260fa7f7c1 Install the res2sqlite.py script Chris Kerr 2014-11-08 14:42:52 +00:00
  • ae2b263989 FigShare changes all '-' to '_' in filenames Chris Kerr 2014-11-08 11:26:43 +00:00
  • 6973fc4e5c Make it work with Python 2 again Chris Kerr 2014-11-07 16:30:27 +00:00
  • 7da8b8b5e6 Changed to a standard setuptools package layout Chris Kerr 2014-11-07 15:42:53 +00:00
  • b7009e8630 Fixed some pyflakes warnings by removing unused imports Chris Kerr 2014-11-06 09:58:27 +00:00
  • ef6e7335e9 Added the test data files sent by Matthias Richter (see #1) Chris Kerr 2014-11-06 09:54:38 +00:00
  • 045f15c855 Script to download the test data from figshare Chris Kerr 2014-11-06 08:25:44 +00:00
  • 9b2a902061 Added some new dtypes suggested by @Yohko - re #1 Chris Kerr 2014-07-09 19:45:05 +01:00
  • cfffeee2e2 Made the individual components of the "flags" and "flags2" columns accessible Chris Kerr 2014-05-01 23:02:23 +01:00
  • c302ec9117 Tweaks to make things work in both python 3 and python 2 Chris Kerr 2013-12-12 15:24:20 +00:00
  • 5c747fe404 Tweaks to make things work on Python 2 Chris Kerr 2013-12-12 13:46:03 +00:00
  • 34440068a7 Added support for parsing out the timestamp Chris Kerr 2013-12-11 22:21:50 +00:00
  • de84f9dd40 Added column IDs from step voltammetry Chris Kerr 2013-12-11 13:14:19 +00:00
  • 00e6670b4a Added I/mA column type = 8 Chris Kerr 2013-12-11 12:50:45 +00:00
  • ce554aab2c Column ID 19 is "control/V" Chris Kerr 2013-12-11 11:58:41 +00:00
  • 3483195228 "control/V" and "control/V/mA" are different Chris Kerr 2013-12-11 11:48:15 +00:00
  • 6a63196a67 Created function to process the list of column types and return a numpy dtype Chris Kerr 2013-12-10 09:44:36 +00:00
  • 509b75a81f Deal with yet another format - with more flags data (I think) Chris Kerr 2013-12-08 14:07:32 +00:00
  • fa14ba94f8 Check for module version other than 0 or 2 Chris Kerr 2013-12-08 13:41:44 +00:00
  • 2724e2a833 Changed data reading to handle the newer file format Chris Kerr 2013-12-08 13:36:45 +00:00
  • 549b9ed61b The size part of the VMP module header seems only to be 32 bit, with 32 bits remaining for a ?version number? Chris Kerr 2013-12-08 13:11:03 +00:00
  • 0ce9b6fb16 There seem to be several different MPR formats - adding a test for a different one Chris Kerr 2013-12-08 13:09:35 +00:00
  • 7d0f1e0172 Added code to parse the date string in the module headers Chris Kerr 2013-12-04 23:20:26 +00:00
  • 3aa3716788 Improved MPRfile docstring Chris Kerr 2013-12-03 22:11:58 +00:00
  • ee892b12c7 Basic README Chris Kerr 2013-12-02 07:53:22 +00:00
  • e83d1936a5 Ported res2sqlite.py to Python 3 and changed argument parsing to use argparse Chris Kerr 2013-12-02 07:49:44 +00:00
  • d7c274ecd6 Imported res2sqlite.py script from previous work Chris Kerr 2013-12-02 07:25:35 +00:00
  • 1f9c9653c5 Added class to read in .mpr files Chris Kerr 2013-11-30 20:08:08 +00:00
  • d909305b74 Added a class to read in .mpt files as numpy record arrays Chris Kerr 2013-11-30 11:35:44 +00:00
  • 9e66d589a4 Simple function for reading in .mpt text files Chris Kerr 2013-11-29 22:19:01 +00:00
  • 98dc2800d7 Ignore test data for now Chris Kerr 2013-11-29 21:16:12 +00:00
  • b722421732 Initial commit Chris Kerr 2013-11-29 13:05:58 -08:00