Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 72aa96c7bcc21d333c17dffa5a5623b8b5dc82e4 https://github.com/galaxyproject/galaxy/commit/72aa96c7bcc21d333c17dffa5a562... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-12-02 (Sat, 02 Dec 2017) Changed paths: M lib/galaxy/datatypes/molecules.py Log Message: ----------- Stricter checks for SDF sniffing I had a bunch of protein FASTA files being sniffed as 'sdf'. Also fix https://github.com/galaxyproject/galaxy/issues/4558 . Commit: 95579883de61fb50bf3b309c8ab871b41d0d10ac https://github.com/galaxyproject/galaxy/commit/95579883de61fb50bf3b309c8ab87... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2017-12-02 (Sat, 02 Dec 2017) Changed paths: M lib/galaxy/datatypes/molecules.py A lib/galaxy/datatypes/test/chebi_57262.v3k.mol A lib/galaxy/datatypes/test/github88.v3k.sdf Log Message: ----------- More precise SDF sniffer First check 4th line: if this is conforming, scan up to 10000 lines. Add 2 test files downloaded from: https://github.com/rdkit/rdkit/tree/master/Code/GraphMol/FileParsers/test_da... Commit: c41fc0a4275ad4640a086d9bdf4d6bf3aec8c197 https://github.com/galaxyproject/galaxy/commit/c41fc0a4275ad4640a086d9bdf4d6... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-02 (Sat, 02 Dec 2017) Changed paths: M lib/galaxy/datatypes/molecules.py A lib/galaxy/datatypes/test/chebi_57262.v3k.mol A lib/galaxy/datatypes/test/github88.v3k.sdf Log Message: ----------- Merge pull request #5118 from mvdbeek/backport_sdf_sniffing_fixes [17.09] Backport stricter checks for SDF sniffing #4729 Commit: d73bb6c6c6b4d7efad56ec46653d11e4542e8f9a https://github.com/galaxyproject/galaxy/commit/d73bb6c6c6b4d7efad56ec46653d1... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-12-04 (Mon, 04 Dec 2017) Changed paths: M config/datatypes_conf.xml.sample Log Message: ----------- Fix ICM datatype sniffer config Probably a bad merge in https://github.com/galaxyproject/galaxy/pull/5108 Commit: 22aa02f59496f9c10a855a3aac58f785a13124a2 https://github.com/galaxyproject/galaxy/commit/22aa02f59496f9c10a855a3aac58f... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2017-12-04 (Mon, 04 Dec 2017) Changed paths: M config/datatypes_conf.xml.sample Log Message: ----------- Merge pull request #5121 from mvdbeek/fix_icm_datatype_config [17.09] Fix ICM datatype sniffer config Commit: 72ed629c2a333de1adaac6892642e39aba7478c8 https://github.com/galaxyproject/galaxy/commit/72ed629c2a333de1adaac6892642e... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-12-04 (Mon, 04 Dec 2017) Changed paths: M config/datatypes_conf.xml.sample Log Message: ----------- Merge branch 'release_17.09' into dev Conflicts: config/datatypes_conf.xml.sample Compare: https://github.com/galaxyproject/galaxy/compare/7c59b8a33be9...72ed629c2a33