d1e8616f1e
Use pytest.mark.parametrize to combine test cases
2019-03-16 13:35:13 +01:00
a618f75bb6
Change testing config to use pytest instead of nosetests
...
Closes #5
2019-03-16 13:10:08 +01:00
b110162763
Replace nose.raises with pytest.raises
2019-03-16 13:03:54 +01:00
de29b0863c
Replace nose.eq_ with assert x == y
2019-03-16 12:59:23 +01:00
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
da67a36308
Merge branch 'pypi-release'
...
Closes #7
2019-03-10 10:44:49 +01:00
757f56826b
Release version 0.0.1
2019-03-10 10:41:56 +01:00
d4d56efc47
Merge branch 'master' into pypi-release
2019-03-10 10:39:13 +01:00
803c4f3dc2
Disable Python 3.7 Travis testing
2019-03-10 10:38:26 +01:00
95ae6caa29
Merge branch 'py37777777'
2019-03-10 10:35:38 +01:00
85eb7249ad
Use break instead of StopIteration - fixes #17
2019-03-10 10:34:02 +01:00
d5f7cfd301
Add python 3.7 to tox.ini and travis.yml
2019-03-10 10:30:46 +01:00
bf24fbfa00
Minor formatting tweaks
2019-03-10 09:56:00 +01:00
ef95863735
Use README.md for long_description
2019-03-10 09:51:34 +01:00
e5e75ff2f0
Make res2sqlite.py an entry_point rather than a script
2019-03-10 09:28:09 +01:00
e3d9073d02
Changed res2sqlite to have a main() function
2019-03-10 09:21:57 +01:00
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
809f1df914
Merge pull request #12 from bayesfactor/patch-1
...
improved parsing for PEIS files
2018-09-29 18:40:12 +02:00
Tim
3cf6bca027
improved parsing for PEIS files
...
I found some new column types and a new placement of the ole_timestamp for PEIS files
2018-07-10 22:42:23 -07:00
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
Dennis
ebdb030f6a
Improved compatibility with .mpr files
...
Added new ColD #9 'Ece/V'
2017-04-22 13:52:52 +02:00
dennissheberla
9109285b58
Improved compatibility with new .mpr files
...
Temporary removed mpr file LOG MODULE support
2017-04-22 13:50:53 +02:00
dennissheberla
b96fedac05
Improved compatibility with .mpt files
...
Fixes bugs in reading new fields and non-ascii chars in .mpt files
2017-04-22 13:46:30 +02:00
Chris Kerr
3423fe7dc9
Merge pull request #11 from chatcannon/tox
...
Add testing with tox
2017-04-22 13:31:04 +02:00
791cb8987e
In get_testdata.sh, don't download files that have already been downloaded
2017-04-22 13:27:55 +02:00
Chris Kerr
f58b3f6ffd
Merge pull request #10 from chatcannon/fix-numpy-1.12
...
Fix numpy 1.12 TypeError
2017-04-22 13:18:09 +02:00
760bf30b1a
Add caching to the .travis.yml file
2017-04-22 13:17:06 +02:00
49bfcb75eb
Proper syntax for two install commands
2017-04-22 13:08:06 +02:00
3d21eade48
Tox testing on Travis with tox-travis
2017-04-22 13:05:19 +02:00
169f2a6b88
Added tox.ini for testing with tox
...
see #5
2017-04-22 13:02:53 +02:00
dfd0d14eae
Merge branch 'master' into fix-numpy-1.12
2017-04-22 12:56:09 +02:00
Chris Kerr
f1b618f121
Merge pull request #9 from chatcannon/setup-travis-ci
...
Setup travis ci
2017-04-22 12:55:39 +02:00
5df258f125
Don't test on Python 2.6 as it does not have OrderedDict
...
Fixes #6
2017-04-22 12:54:07 +02:00
fa264ff08e
Download the test data when running the tests
2017-04-22 12:51:01 +02:00
a7d93035e8
Use nosetests in .travis.yml
2017-04-22 12:48:21 +02:00
e38dc0c92a
Created requirements.txt
2017-04-22 12:47:05 +02:00
b8c8f23f63
Default Python .travis.yml file from the Travis-CI docs
2017-04-22 12:38:23 +02:00
22878be0c5
Explicitly coerce size-1 array to scalar
...
Fixes #4
2017-04-22 12:34:02 +02:00
70e60b3565
Ignore .cache directory
2017-04-22 12:29:08 +02:00
Chris Kerr
907f209476
Requirements should be a list
2014-11-09 12:48:20 +00:00
Chris Kerr
260fa7f7c1
Install the res2sqlite.py script
2014-11-08 14:42:52 +00:00
Chris Kerr
ae2b263989
FigShare changes all '-' to '_' in filenames
2014-11-08 11:26:43 +00:00
Chris Kerr
6973fc4e5c
Make it work with Python 2 again
2014-11-07 16:30:27 +00:00
Chris Kerr
7da8b8b5e6
Changed to a standard setuptools package layout
2014-11-07 15:42:53 +00:00
Chris Kerr
b7009e8630
Fixed some pyflakes warnings by removing unused imports
2014-11-06 09:58:27 +00:00
Chris Kerr
ef6e7335e9
Added the test data files sent by Matthias Richter (see #1 )
...
Had to make a few changes to ensure that they open correctly
2014-11-06 09:54:38 +00:00
Chris Kerr
045f15c855
Script to download the test data from figshare
2014-11-06 08:25:44 +00:00
