Commit Graph
41575 Commits
Author SHA1 Message Date
mvdbeek 7be55d36f2 Fix default involucro path
BaseAppConfiguration.root is now an absolute path, and so is
BaseAppConfiguration.data_dir, so the result of
`resolve_path(kwargs.get("tool_dependency_dir", "dependencies"), self.data_dir)`
is not "none" as it used to be, but `"<galaxy_data_dir>/none"` and so
the fallback will not be used.

This can be fixed by setting the default target dir to `dependencies`
and join it to self.data_dir, which defaults to `galaxy_root/database`
on classic installations.

Fixes the issues in https://github.com/galaxyproject/galaxy/pull/8195#issuecomment-513246346
2019-07-19 17:01:40 +02:00
Martin Cech 3ae9207ba3 Merge pull request #8355 from jmchilton/copy_to_working_pulsar
Better config isolation for integration tests.
2019-07-18 20:37:37 -04:00
John Chilton a70595a23e Better separation for integration tests. 2019-07-18 18:31:17 -04:00
Martin Cech 00600e4006 Merge pull request #8298 from jmchilton/selenium_package
Create galaxy-selenium package.
2019-07-18 15:17:42 -04:00
Martin Cech 3e630bfae0 Merge pull request #8316 from guerler/fix_panel_spacing
Adjustments for panel spacing changes
2019-07-18 15:09:39 -04:00
Martin Cech c6bc618f8c Merge pull request #8335 from jmchilton/copy_to_working_pulsar
Integration test for 'outputs_to_working_directory' with Pulsar.
2019-07-18 15:08:30 -04:00
Martin Cech 0a51ea326b Merge pull request #8301 from juleengraham/zoom_function
Zoom reset feature
2019-07-18 15:06:48 -04:00
Martin Cech 354b73a141 Merge pull request #8351 from ic4f/dev_add_links_admin_mainpage
Add links to admin entry page
2019-07-18 12:56:57 -04:00
John Chilton 2b5f9e2f96 Merge pull request #8347 from blankenberg/icn3d-geda
Add GEDA for iCn3D
2019-07-18 10:35:26 -04:00
Sergey Golitsynskiy 0e3950ab53 Merge remote-tracking branch 'upstream/dev' into dev_add_links_admin_mainpage 2019-07-17 22:17:23 -04:00
Sergey Golitsynskiy e8c017892f Add links to admin entry page
This is a temporary solution. Ideally, this should be generated using
the same logic that is used for generating the links on the left menu
panel. And no page reloads, of course.
2019-07-17 19:49:46 -04:00
John Chilton a788eee913 Merge pull request #8346 from nsoranzo/startup_fixes
Startup fixes
2019-07-17 16:48:47 -04:00
John Chilton be7e881961 Merge pull request #8345 from ic4f/dev_toolutil_tests_restruct
Restructure unit tests for tool_util package
2019-07-17 16:47:59 -04:00
John Chilton da28369526 Merge pull request #8342 from nsoranzo/galaxy-tool-test
Add ``galaxy-tool-test`` entry-point to ``galaxy-tool-util`` package
2019-07-17 16:46:08 -04:00
Daniel Blankenberg 0b90afcfcb Enable iCn3D for mol2 and sdf files 2019-07-17 11:54:15 -04:00
Daniel Blankenberg 8dd9b2fe8c Missing space 2019-07-17 09:58:17 -04:00
Daniel Blankenberg dfb5a988e4 Add GEDA for iCn3D 2019-07-17 09:54:43 -04:00
Nicola Soranzo 397be57d0c Make `self.root` an absolute path
Fix comparisons of relative and absolute paths like the one described
at https://github.com/galaxyproject/galaxy/pull/921#discussion_r304356880
2019-07-17 12:52:08 +01:00
Nicola Soranzo e7165c37e3 Fix issues reported by shellcheck 2019-07-17 12:46:46 +01:00
Sergey Golitsynskiy 6fb6727d6d Merge remote-tracking branch 'upstream/dev' into dev_toolutil_tests_restruct 2019-07-16 23:16:59 -04:00
Sergey Golitsynskiy 65490868fb Fix linting errors 2019-07-16 20:54:01 -04:00
Sergey Golitsynskiy 0e4e1d9249 Restructure unit tests for tool_util package
This replaces a previous (now closed) PR:
https://github.com/galaxyproject/galaxy/pull/8279

A few changes:
- tests for code in galaxy/tool_util moved under test/unit/tool_util
- common parts (used in both tools and tool_util) factored out into
  unittest_utils/sample_data.py
- symlink to sample_data.py in test/unit/tool_util/ is needed to make
  the tool_util package tests run. This is not an ideal solution, but it
  avoids duplication of the sample data used by tests in tools/ and
  tool_util/.
2019-07-16 20:15:45 -04:00
Nicola Soranzo 600f8db5a5 Merge pull request #8343 from nsoranzo/pip_progress_bar
Fix use of ``PIP_PROGRESS_BAR`` env variable
2019-07-16 22:05:12 +01:00
Nicola Soranzo 8e8c64308a Fix use of `PIP_PROGRESS_BAR` env variable
`PIP_PROGRESS_BAR` environment variable is used by `pip` to set the value
for the `--progress-bar` option. It seems that specifying it also only the
command line does not override it in some configurations, e.g. on TravisCI
Linux builds of BioBlend, see e.g.

https://travis-ci.org/galaxyproject/bioblend/jobs/558857557
2019-07-16 17:17:32 +01:00
John Chilton ef29b72e00 Integration test for 'outputs_to_working_directory' with Pulsar. 2019-07-16 10:23:33 -04:00
Nicola Soranzo 751806d371 Add `galaxy-tool-test entry-point to galaxy-tool-util` package
As it was in galaxy-lib.
2019-07-16 11:19:31 +01:00
Nicola Soranzo f7b37516d7 Fix bug in a unit test (#8314)
Fix bug in a unit test
2019-07-16 10:52:09 +01:00
Sergey Golitsynskiy ac5d7dfd46 Merge remote-tracking branch 'upstream/dev' into dev_unittest_bugfix 2019-07-15 19:17:44 -04:00
Martin Cech e45d7959a7 Merge pull request #8308 from jmchilton/push_scripts_into_subpackages
Push galaxy-meta scripts into appropiate subpackages.
2019-07-15 18:45:13 -04:00
Juleen Graham 19c5fac23b Add hover text to reset button 2019-07-16 00:05:18 +02:00
John Chilton 8b52e9de4a Merge pull request #8287 from martenson/fix-sorting
Fix library folder sorting
2019-07-15 16:41:04 -04:00
John Chilton b893054e65 Merge pull request #8303 from martenson/admin-users-nonpurged
make admin/users grid filter on purged
2019-07-15 16:27:28 -04:00
Sergey Golitsynskiy f90c8c7bfb Merge remote-tracking branch 'upstream/dev' into dev_unittest_bugfix 2019-07-15 16:18:13 -04:00
John Chilton 574a7da326 Merge pull request #8327 from guerler/remove_backbone_toolshed
Remove legacy backbone toolshed code and entry points
2019-07-15 16:00:08 -04:00
John Chilton 6c48dc28b6 Merge pull request #8326 from scholtalbers/fix/modify_library_check_correct_permission
check correct permission for allowing a user to modify lib folder
2019-07-15 15:41:52 -04:00
Nicola Soranzo b578b0a793 test removing uwsgi weird python package from circleci (#8337)
test removing uwsgi weird python package from circleci
2019-07-15 19:34:32 +01:00
Martin Cech 568feb56a6 remove libpython requirement for uwsgi building 2019-07-15 13:57:00 -04:00
Martin Cech 46c32502a3 test removing uwsgi weird python package 2019-07-15 13:35:31 -04:00
Enis Afgan ed8150a897 Merge pull request #8123 from VJalili/cloudauthz_gcp
Enable authorization to Google Cloud Platform
2019-07-15 08:48:23 +02:00
Sergey Golitsynskiy 3df3ff0bec Fix package test
The cause of this is related to pulling tool_util out of tools:
https://github.com/galaxyproject/galaxy/pull/8279

The solution here is a temporary hack (add helper module, util.py, to
tests/, then make tests a package).

A better solution will be to separate test/unit/tools into tools/ and
tool_util/ - I intend to take care of it soon.
2019-07-13 20:18:57 -04:00
Sergey Golitsynskiy f3f979fd5d Fix linting errors (import stms) 2019-07-13 19:28:31 -04:00
Sergey Golitsynskiy 3d59d94aa8 Restructure/modify environ context manager + tests
Factor out __environ context manager into helper class (and rename).

Move context manager tests into separate test module. Improve tests.

Refactor context manager:
- Change default arg to None
- Simplify: I don't think we need to keep track of new keys;
  environ.clear() + environ.update(old_environ) should be sufficient.
  We significantly reduce complexity at the minor cost of a little more
  space.
- Instead of wrapping in a try/except block, just check if key exists
  before deleting.

Modify test_tool_deps to use the new context manager.
2019-07-13 13:08:59 -04:00
Sergey Golitsynskiy 205d82e3f6 Merge remote-tracking branch 'upstream/dev' into dev_unittest_bugfix 2019-07-13 12:43:13 -04:00
Nicola Soranzo de798d4829 Merge pull request #8329 from mvdbeek/fix_py3_startup
Cast uwsgi option to unicode, fixes startup under python 3
2019-07-13 15:50:17 +01:00
Nicola Soranzo c0e2e1a200 Merge pull request #8284 from ic4f/dev_packages_toolutil_verify
Move tools/verify/ into tool_util/verify/
2019-07-13 10:21:31 +01:00
mvdbeek 7f8c42421f Fix test_400_on_invalid_embedded_content on python 3 2019-07-13 10:47:30 +02:00
Sergey Golitsynskiy 2bb7149aac Move modules to tool_util package 2019-07-12 18:14:51 +01:00
Sergey Golitsynskiy dd15e24c33 Fix import statements ordering 2019-07-12 18:07:09 +01:00
Sergey Golitsynskiy c68ee9cae3 Fix failing tests
Fix import statements
2019-07-12 18:07:09 +01:00
Sergey Golitsynskiy 9713184b03 Move tools/verify/ into tool_util/verify/
Ref: https://github.com/galaxyproject/galaxy/issues/8073
2019-07-12 18:06:53 +01:00