Commit Graph
21097 Commits
Author SHA1 Message Date
Daniel Blankenberg 8aebb64ae4 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into realtimetools 2019-07-25 14:59:53 -04:00
Martin Cech e7c106b01d Merge pull request #8366 from bernt-matthias/topic/sortlist-missing-when
Sort Collection: add missing when tags
2019-07-22 23:28:08 -04:00
Marius van den Beek 9606690ac2 Merge pull request #8360 from mvdbeek/fix_default_involucro_path
Fix default involucro path
2019-07-22 10:44:26 +02:00
M Bernt a2e2139d5d Sort Collection: add missing when tags 2019-07-22 10:23:33 +02:00
Wolfgang Maier b66eeea526 Fix and improve unit tests 2019-07-21 10:48:15 +02:00
Wolfgang Maier 31869d385d Fix zipped files autodetection 2019-07-21 00:08:12 +02:00
Nicola Soranzo e565ef043c Merge branch 'release_19.05' into dev 2019-07-20 01:33:10 +01:00
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 00600e4006 Merge pull request #8298 from jmchilton/selenium_package
Create galaxy-selenium package.
2019-07-18 15:17:42 -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
Daniel Blankenberg 0b90afcfcb Enable iCn3D for mol2 and sdf files 2019-07-17 11:54:15 -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
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
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
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
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
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
mvdbeek b22b5581e4 Don't run through _executable() on import
Instead make it a regular function.
2019-07-12 18:10:55 +02:00
mvdbeek 9574de30f6 Fix startup on python 3 if run through uwsgi
uwsgi options are returned as bytestring, so this avoids:
```
Traceback (most recent call last):
  File "lib/galaxy/webapps/galaxy/buildapp.py", line 12, in <module>
    import galaxy.app
  File "lib/galaxy/app.py", line 8, in <module>
    import galaxy.model
  File "lib/galaxy/model/__init__.py", line 45, in <module>
    import galaxy.exceptions
  File "lib/galaxy/exceptions/__init__.py", line 19, in <module>
    from ..exceptions import error_codes
  File "lib/galaxy/exceptions/error_codes.py", line 9, in <module>
    from galaxy.util import unicodify
  File "lib/galaxy/util/__init__.py", line 1708, in <module>
    executable = _executable()
  File "lib/galaxy/util/__init__.py", line 1700, in _executable
    exe = os.path.join(virtualenv, 'bin', 'python')
  File "/Users/mvandenb/src/galaxy/.venv3/lib/python3.6/posixpath.py", line 94, in join
    genericpath._check_arg_types('join', a, *p)
  File "/Users/mvandenb/src/galaxy/.venv3/lib/python3.6/genericpath.py", line 151, in _check_arg_types
    raise TypeError("Can't mix strings and bytes in path components") from None
TypeError: Can't mix strings and bytes in path components
```

Broken in https://github.com/galaxyproject/galaxy/commit/891daf4f82eb45c692f3fc5542cea35f94e10118
2019-07-12 16:53:21 +02:00
guerler 4d313fd3d4 Remove legacy admin toolshed entry point 2019-07-12 16:52:09 +02:00
Nicola Soranzo e9b6c106d2 Sniff fastqsanger more aggressively (#8322)
Sniff fastqsanger more aggressively
2019-07-12 10:03:21 +01:00
Enis Afgan 33f442f0c8 Merge pull request #8311 from telukir/f-kt-r19.05-jwt1
walltime_limit added for the k8s jobs
2019-07-12 08:30:29 +02:00
Daniel Blankenberg 56aab88923 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into realtimetools 2019-07-11 17:04:17 -04:00
Wolfgang Maier 80b9be3cf5 Clean up code 2019-07-11 21:14:05 +02:00
Martin Cech b415dfddfa Merge pull request #8294 from bwlang/library_date_propagate
Library date propagate
2019-07-11 13:55:31 -04:00
Wolfgang Maier ff6f1084a7 Reduce to minimal required change 2019-07-11 16:47:25 +02:00
John Chilton c2ac586669 Merge pull request #8296 from blankenberg/environment_variable-strip
Add ability to strip whitespace from tool environment_variables.
2019-07-11 16:28:29 +02:00
John Chilton 6a1c05fac2 Merge pull request #8300 from mvdbeek/skip_migration_for_new_databases
Skip migrations on entirely clean new databases
2019-07-11 16:24:07 +02:00
Jelle Scholtalbers a1ea006d91 remove unreachable exception 2019-07-11 15:33:11 +02:00
Jelle Scholtalbers dd93cefdba check correct permission for allowing a user to modify (rename) a library folder 2019-07-11 14:10:02 +02:00
Vahid 731b3eb8d2 add r to regexp to escape \d & satisfy lint. 2019-07-10 13:49:33 -07:00
Vahid 40fe0a3e86 Enable user1 & user2 resolve to different usernames 2019-07-10 12:51:52 -07:00
Wolfgang Maier 37b3a0fe13 Improve readability 2019-07-10 17:37:56 +02:00
Wolfgang Maier 3df7b2591c Avoid previously used test file names 2019-07-10 17:22:14 +02:00
mvdbeek 6fc3d09b60 Fix and simplify k8s error handling 2019-07-10 17:16:37 +02:00
Nicola Soranzo bdee798bc0 Fix kubernetes runner on py3 (#8321)
Fix kubernetes runner on py3
2019-07-10 15:59:37 +01:00
Wolfgang Maier 986c1831d3 Add unit test and fix test file 2019-07-10 16:04:05 +02:00
Wolfgang Maier 79f2bb5991 Sniff fastqsanger with telltale low quality scores
When a fastq file contains quality scores that are too low to be
compatible with any +64 encoding scheme, the assumption should be
that the file is Phred+33 encoded even if some scores are above
the current upper threshold of 44.
2019-07-10 15:55:58 +02:00
mvdbeek b2cd5ba8d0 Add k8s_walltime_limit to job_conf.xml.sample_advanced 2019-07-10 15:27:25 +02:00
mvdbeek 8fb5936f92 Fix kubernetes runner on py3
instance_id is a string, so this can't be compared to an integer
on python 3. Broken in ac1b25ed4c,
prior to that the comparison was `len(self._galaxy_instance_id) > 0:`
2019-07-10 13:55:49 +02:00
mvdbeek 888c03877d Fix kubernetes runner on py3
instance_id is a string, so this can't be compared to an integer
on python 3. Broken in ac1b25ed4c,
prior to that the comparison was `len(self._galaxy_instance_id) > 0:`
2019-07-10 13:49:53 +02:00
Kiran Telukunta saraswathi 34bde631f4 * walltime_limit added for the k8s jobs
* default is also set to the k8s_walltime_limit in job specification
2019-07-10 12:51:29 +02:00
Brad Langhorst 485e0043a7 implements nicola's suggestion -> snakecase 2019-07-10 05:22:27 -04:00
Marius van den Beek ef9698895a Merge pull request #8319 from nsoranzo/lowercase_boolean_yaml
Use lowercase true/false in config_schema.yml
2019-07-10 11:18:19 +02:00
Marius van den Beek db3a1bac1d Merge pull request #8320 from nsoranzo/merge_19.05_20190709
Merge 19.05 20190709
2019-07-10 11:15:46 +02:00
Marius van den Beek bc7b48756b Merge pull request #7402 from guerler/activate_toolshed
Activate api-based Toolshed interface in Admin panel
2019-07-10 11:06:18 +02:00