Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 93ba35fdd16a96b46ccac6884b7efcb4a5d3e8a3 https://github.com/galaxyproject/galaxy/commit/93ba35fdd16a96b46ccac6884b7ef... Author: John Chilton jmchilton@gmail.com Date: 2016-07-26 (Tue, 26 Jul 2016)

Changed paths: M test/base/twilltestcase.py

Log Message: ----------- Import pyparsing in testing so twill's older version doesn't get loaded.

There are unintended consequences if not, such as svgwrite not loading properly.

Commit: 9607e528be01234b1107db29e0a910043d12507e https://github.com/galaxyproject/galaxy/commit/9607e528be01234b1107db29e0a91... Author: Martin Cech cech.marten@gmail.com Date: 2016-07-26 (Tue, 26 Jul 2016)

Changed paths: M test/base/twilltestcase.py

Log Message: ----------- Merge pull request #2656 from jmchilton/pyparsing_testing

Import pyparsing in testing so twill's older version doesn't get loaded.

Compare: https://github.com/galaxyproject/galaxy/compare/134f98854931...9607e528be01