opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-11-03 21:34:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,990 Commits 63 Branches 246 Tags
4e64c23f463c2a8f985010a02f86c19db55ff50d
Commit Graph
2226 Commits
Author SHA1 Message Date
Nicola Soranzo f06c895d61 Update INDETERMINATE_DEPENDENCY to NullDependency 
Fix unit test broken in https://github.com/galaxyproject/galaxy/pull/2554
 2016-07-29 19:38:06 +01:00
Dannon Baker fed3665fcf Merge pull request #2680 from mvdbeek/toolshed_test_fixes 
Fix broken toolshed tests with #2554
 2016-07-28 07:44:21 -04:00
Marius van den Beek 12a789f3e1 Adjust tests for 8cca7be 2016-07-28 14:05:09 +03:00
Daniel Blankenberg a731ce2e22 Merge pull request #2554 from bxlab/install_via_conda 
Fix bugs in post.
 2016-07-27 15:38:58 -04:00
Marius van den Beek 645a891706 Remove reference to /tmp 2016-07-26 20:35:16 +03:00
Marius van den Beek 9917512f8f Revert svgwrite import, fixed in #2656 2016-07-26 20:35:08 +03:00
Martin Cech 9607e528be Merge pull request #2656 from jmchilton/pyparsing_testing 
Import pyparsing in testing so twill's older version doesn't get loaded.
 2016-07-26 11:49:08 -04:00
John Chilton 93ba35fdd1 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.
 2016-07-26 11:18:18 -04:00
Marius van den Beek e53a81c40d Fix syntax, return None if dependency not found 2016-07-26 13:32:09 +03:00
Marius van den Beek deef480cad Add more API tests for resolver dependencies 2016-07-26 01:35:52 +03:00
Nicola Soranzo 134f988549 Merge pull request #2650 from dannon/flake8_update_tox_default 
Ignore .tox directory.  Used to be ignored by default w/ flake8 appar…
 2016-07-25 19:18:44 +01:00
Marius van den Beek b5fad4a048 Add api test for conda dependency resolution 2016-07-25 20:32:41 +03:00
Dannon Baker 9f2237905b Remove two #noqas and specify __all__ for those modules. Specify many more #noqas to skip the precise relevant exception. 2016-07-25 11:09:15 -04:00
Dannon Baker 10745f252f Apply @nsoranzo's fix for noqa changes (must end the line, comment comes before it) 2016-07-25 10:15:33 -04:00
Marius van den Beek 4ed151a771 Revert mako hack to always display install_tool_dependency button 
- Add resolver checkbox
 - Add possibility to disable resolvers if initialization failed
 2016-07-22 22:01:38 +02:00
guerler 881af45dfe Fix upload dialog test cases 2016-07-22 09:38:53 -04:00
guerler 45038d1399 Merge branch 'dev' into move_workflow_run 2016-07-22 09:24:48 -04:00
Dannon Baker 576e09fe63 Merge branch 'select_performance' into dev 2016-07-22 08:51:37 -04:00
guerler 35ef492e21 Merge branch 'dev' into move_workflow_run 2016-07-21 21:33:38 -04:00
John Chilton 2075af4de8 Merge pull request #2538 from pvanheus/dev 
Make conda autoinstall of packages safer:
 2016-07-21 15:47:31 -04:00
guerler 80d20900ef Adjust icon button, add test cases 2016-07-21 12:50:31 -04:00
guerler 842a981062 Adjust check state button and add test cases 2016-07-21 12:24:25 -04:00
John Chilton f67d3cbe93 Merge pull request #2579 from phac-nml/add-dtd-to-galaxy 
Add DTD to Galaxy
 2016-07-21 11:07:55 -04:00
Nicola Soranzo 47f25f1dc6 Merge pull request #2631 from jmchilton/output_filter_exception 
Add tool test for what happens when output filter throws exception.
 2016-07-21 15:59:43 +01:00
guerler 7b49080dc1 Adjust/fix button link variation, add test cases 2016-07-21 10:13:04 -04:00
guerler 193c27e3db Move execute button and new history form to top of workflow execution form 2016-07-21 09:46:07 -04:00
John Chilton 274ec0f953 Fix typo spotted by @nsoranzo. 2016-07-21 08:55:35 -04:00
Eric Enns 43fccc9887 Moved dtd tests into a different folder 2016-07-20 15:52:04 -05:00
John Chilton d87957e1a2 Ease configuration and add documentation for using DTD syntax for destinations. 
Moving rules also means it won't conflict with other peoples custom dynamic destinations and should prevent Galaxy from reloading the Python repeatedly.
 2016-07-20 15:58:34 -04:00
John Chilton 54b8ae00db Rework test case that fails occasionally on Jenkins. 
Should be a little more robust now.
 2016-07-20 12:08:18 -04:00
John Chilton 30fd1e0e64 Test case for dynamically creating list:list:lists. 
This could check the outputs ideally, but it was failing to simply execute the workflow so this does serve as check that some bugs are fixed.
 2016-07-19 16:20:09 -04:00
carlfeberhard 1e36eba631 Merge branch 'release_16.04' into dev 2016-07-19 14:06:26 -04:00
John Chilton 706a76ea80 Add tool test for what happens when output filter throws exception. 
Run new test with:

```
./run_tests.sh -framework -id output_filter_exception_1
```

xref https://github.com/galaxyproject/tools-iuc/pull/883
xref https://github.com/galaxyproject/planemo/commit/a066afb1c2c30f4ef2c3033ab9a884b31c06e783
xref https://github.com/galaxy-iuc/standards/pull/31
 2016-07-19 12:10:55 -04:00
Dannon Baker e21a81fbf0 Merge pull request #2595 from carlfeberhard/users.api-update 
Users API: add the update endpoint
 2016-07-18 11:08:47 -04:00
guerler b4ee77d282 Adjust content selector tests 2016-07-12 14:27:29 -04:00
guerler 4fac8884b6 Preserve selection order, allow empty string as valid selection 2016-07-12 14:27:29 -04:00
guerler 67c3ec899d Reinsert classic multiple select field box 2016-07-12 14:27:27 -04:00
guerler f947fb604e Remove dependency of select2 to regular select fields 2016-07-12 14:27:01 -04:00
carlfeberhard 09d10147f9 Tests, user: py3 exception and relative import fix 2016-07-11 15:31:49 -04:00
carlfeberhard 7ef9b2325e API, users: remove log, change assertion style 2016-07-07 14:04:01 -04:00
carlfeberhard ad95cad990 API, users: implement users update 
- users and admin can now update usernames via the API
- adds api tests to update
 2016-07-07 13:42:44 -04:00
Nicola Soranzo 05eebac85d Merge pull request #2570 from abretaud/identifier_bug 
Fix element_identifier unavailable with data_collection input param
 2016-07-07 16:47:35 +01:00
carlfeberhard f724e84fda API, users: use default to assign username 2016-07-07 11:20:02 -04:00
Anthony Bretaudeau 706a9bfb23 cleanup test tool 2016-07-07 17:10:03 +02:00
carlfeberhard 86a3531730 API, users: add deserializer to user manager 
- Adds deserialization method for usernames (note: still needs trans)
- Adds tests for deserializer in test_UserManager.py
 2016-07-07 10:38:08 -04:00
carlfeberhard 54e07906f5 User API tests: add update test 2016-07-06 14:10:14 -04:00
carlfeberhard aa69199bd1 User API tests: add show 2016-07-06 13:33:28 -04:00
Eric Enns 99161d6074 Flake8 fixes 2016-07-04 13:57:32 -05:00
Eric Enns c053197bee Added in DTD tests 2016-07-04 12:07:08 -05:00
Anthony Bretaudeau cf29b1dcd6 apply comments 2016-06-29 15:20:22 +02:00