Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: a7d05a47da592e76fd88ed699f034e13e2dba08e https://github.com/galaxyproject/galaxy/commit/a7d05a47da592e76fd88ed699f034... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-02-10 (Fri, 10 Feb 2017) Changed paths: M .ci/flake8_lint_include_list.txt M .ci/py3_sources.txt M lib/galaxy/datatypes/genetics.py M lib/galaxy/datatypes/interval.py M lib/galaxy/datatypes/proteomics.py M lib/galaxy/datatypes/tabular.py Log Message: ----------- Prevent make_html_table() datatype methods from raising Exceptions This was preventing the browse of a data library which contained a purged dataset of gg datatype. Also fix import order and Python3 compatibility. Commit: f8dcae95364b79a1612c7a0d04b489d874512aa7 https://github.com/galaxyproject/galaxy/commit/f8dcae95364b79a1612c7a0d04b48... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-02-10 (Fri, 10 Feb 2017) Changed paths: M config/datatypes_conf.xml.sample Log Message: ----------- Remove edam_format for Genbank from config/datatypes_conf.xml.sample This was preventing the loading of the datatype: WARNING 2017-02-10 11:07:05,162 Cannot specify edam_format without setting subclass to True, skipping datatype. Bug introduced in commit c36fbebb443ae5b5263ba6cad6ad36113bb52f44 . Also backport commit 5657a8b809e5938d3d996a77c826811e1176c108 from dev. Commit: 087c75e76ff44cf49eb0b458520d2df4db31e32e https://github.com/galaxyproject/galaxy/commit/087c75e76ff44cf49eb0b458520d2... Author: Martin Cech <cech.marten@gmail.com> Date: 2017-02-10 (Fri, 10 Feb 2017) Changed paths: M .ci/flake8_lint_include_list.txt M .ci/py3_sources.txt M config/datatypes_conf.xml.sample M lib/galaxy/datatypes/genetics.py M lib/galaxy/datatypes/interval.py M lib/galaxy/datatypes/proteomics.py M lib/galaxy/datatypes/tabular.py Log Message: ----------- Merge pull request #3585 from nsoranzo/release_17.01_datatypes_fixes [17.01] Two datatypes fixes Commit: ed52230952a1411a39cff3bde7a7ed66e1344f6f https://github.com/galaxyproject/galaxy/commit/ed52230952a1411a39cff3bde7a7e... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-02-10 (Fri, 10 Feb 2017) Changed paths: M .ci/flake8_lint_include_list.txt M .ci/py3_sources.txt M config/datatypes_conf.xml.sample M lib/galaxy/datatypes/genetics.py M lib/galaxy/datatypes/interval.py M lib/galaxy/datatypes/proteomics.py M lib/galaxy/datatypes/tabular.py Log Message: ----------- Merge branch 'release_17.01' into dev Conflicts: config/datatypes_conf.xml.sample Compare: https://github.com/galaxyproject/galaxy/compare/6f5743d052fb...ed52230952a1