Jip J. Dekker
|
4dcc8e6afe
|
We should never include an actual config file in our repository
|
2014-06-21 00:48:59 +02:00 |
|
Jip J. Dekker
|
b47d7d5e63
|
The config filenames should be more clear (so GUI & Sources)
|
2014-06-21 00:46:38 +02:00 |
|
Harmen Prins
|
c909830c46
|
Merge branch 'feature/GUI' of https://github.com/Recondor/Fourmi into feature/GUI
|
2014-06-20 23:31:42 +02:00 |
|
Harmen Prins
|
235ca3d8f8
|
Debugged unittests
|
2014-06-20 23:31:19 +02:00 |
|
Harmen Prins
|
edb3b57d8d
|
Delete travis.yml
|
2014-06-20 16:53:45 +02:00 |
|
Harmen Prins
|
520216b528
|
Merge branch 'develop' into feature/GUI
|
2014-06-20 16:51:19 +02:00 |
|
Harmen Prins
|
36c6c9e65e
|
Added file selector
|
2014-06-20 16:42:22 +02:00 |
|
Jip J. Dekker
|
f0e8ea1dc2
|
Merge branch 'develop' of github.com:Recondor/Fourmi into develop
|
2014-06-20 11:23:50 +02:00 |
|
Jip J. Dekker
|
11422e555e
|
Missed one test statement
|
2014-06-20 11:22:55 +02:00 |
|
Jip J. Dekker
|
76bf634ad9
|
Merge branch 'feature/compound-name' into develop
|
2014-06-20 11:21:43 +02:00 |
|
Jip J. Dekker
|
22ca4afa33
|
Code inspection
|
2014-06-20 11:21:26 +02:00 |
|
Jip J. Dekker
|
87275a6dc8
|
Edited the tests
|
2014-06-20 11:16:56 +02:00 |
|
Jip J. Dekker
|
6c0b55dab6
|
Edited the actual functions
|
2014-06-20 11:14:51 +02:00 |
|
RTB
|
98f63a212a
|
modified pubchem.py to use reliability from sources.cfg
|
2014-06-19 22:57:17 +02:00 |
|
Jip J. Dekker
|
335f558aca
|
Merge branch 'feature/PubChem-fixes' into develop
|
2014-06-19 22:51:07 +02:00 |
|
RTB
|
2290915209
|
fixed forgotten self.website usage
|
2014-06-19 22:45:01 +02:00 |
|
RTB
|
d7d2a659b1
|
changed https to http in PubChem.py
|
2014-06-19 22:34:53 +02:00 |
|
Jip J. Dekker
|
093eba8b04
|
Other occurences of website REGEX
|
2014-06-19 22:26:16 +02:00 |
|
Jip J. Dekker
|
a3e973ecad
|
Added INFO message when no compatible source on response
|
2014-06-19 22:08:45 +02:00 |
|
Jip J. Dekker
|
27529c414f
|
Fourmi as our USER_AGENT
|
2014-06-19 22:06:55 +02:00 |
|
Jip J. Dekker
|
ef1c319396
|
Escape escape characters
|
2014-06-19 22:05:21 +02:00 |
|
Jip J. Dekker
|
576683dcd0
|
These regular expressions where all wrong
|
2014-06-19 22:01:35 +02:00 |
|
Jip J. Dekker
|
1fb8450367
|
The cool folder seperators!
|
2014-06-19 21:05:17 +02:00 |
|
RTB
|
2cefcfdb13
|
made parse_searchrequest function to parse search page and modified new_compound_request accordingly
|
2014-06-19 12:46:09 +02:00 |
|
Harmen Prins
|
2adb619888
|
GUI verbosity settings tested
|
2014-06-18 10:48:31 +02:00 |
|
Harmen Prins
|
442ff9140e
|
Changed GUI logging
|
2014-06-18 10:37:00 +02:00 |
|
Harmen Prins
|
d6f5ed741a
|
Updated docopt argument call from gui to include -v
|
2014-06-18 10:20:27 +02:00 |
|
Harmen Prins
|
5fbbb26c00
|
GUI_Options -> GUI
|
2014-06-18 09:58:22 +02:00 |
|
Harmen Prins
|
3dfa75991b
|
Changed references to configuration file
|
2014-06-18 09:56:01 +02:00 |
|
Harmen Prins
|
b3a1792028
|
Moved gui config file to main package
|
2014-06-18 08:16:28 +02:00 |
|
Harmen Prins
|
1a5b804ee2
|
Fixed merge conflict
|
2014-06-18 07:26:20 +02:00 |
|
Harmen Prins
|
e015cc96a0
|
Last night's fiddling around
|
2014-06-18 07:23:10 +02:00 |
|
Jip J. Dekker
|
d8841b2f28
|
Added the changes so far into the changelog
|
2014-06-18 00:10:42 +02:00 |
|
Jip J. Dekker
|
484d10360c
|
Merge branch 'feature/sourcescfg_fixes' into develop
|
2014-06-17 23:53:10 +02:00 |
|
Jip J. Dekker
|
ad640c5cb3
|
Merge branch 'feature/NIST-cleanup' into develop
Conflicts:
FourmiCrawler/sources/NIST.py
|
2014-06-17 23:49:30 +02:00 |
|
Jip J. Dekker
|
2801ff2d21
|
Merge branch 'feature/ChemSpider-cleanup' into develop
Conflicts:
FourmiCrawler/sources/ChemSpider.py
|
2014-06-17 23:43:56 +02:00 |
|
Jip J. Dekker
|
f81addc2f0
|
ConfigImporter in it's own file
|
2014-06-17 23:34:52 +02:00 |
|
Jip J. Dekker
|
d0d0f9f72d
|
GUI as the default command without arguments
|
2014-06-17 22:11:22 +02:00 |
|
Harmen Prins
|
c6547f0199
|
Merge branch 'feature/GUI' of https://github.com/Recondor/Fourmi into feature/GUI
|
2014-06-17 22:05:40 +02:00 |
|
Jip J. Dekker
|
2789aca328
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-06-17 21:54:39 +02:00 |
|
Jip J. Dekker
|
30c7b5fbf8
|
Gammar error
|
2014-06-17 21:54:08 +02:00 |
|
Jip J. Dekker
|
02f226a8f8
|
PubChem was added
|
2014-06-17 21:53:37 +02:00 |
|
Jip J. Dekker
|
934c668c01
|
The path to the config should be absolute by default
|
2014-06-17 21:50:05 +02:00 |
|
Jip J. Dekker
|
65f39b11ba
|
Add the GUI folder in converage
|
2014-06-17 21:44:58 +02:00 |
|
Jip J. Dekker
|
8ded75d966
|
Ignore gui config file
|
2014-06-17 21:43:53 +02:00 |
|
Jip J. Dekker
|
b71d22b0ed
|
This config file is just a sample
|
2014-06-17 21:42:40 +02:00 |
|
RTB
|
3ac2a8c162
|
sample sources.cfg
|
2014-06-17 20:55:44 +02:00 |
|
RTB
|
d657f9420f
|
added absolute path to reading sources.cfg
|
2014-06-17 20:55:28 +02:00 |
|
Harmen Prins
|
738e1afb36
|
Merge branch 'develop' into feature/GUI
|
2014-06-17 17:14:36 +02:00 |
|
Harmen Prins
|
88a1390de8
|
Added asserts to the tests
|
2014-06-17 17:09:49 +02:00 |
|