Commit Graph
22896 Commits
Author SHA1 Message Date
Matthias Bernt add9e565aa fix options_filter_attribute: needs to be str
since in the tool xml the values can only be specified as str
also the attribute needs to be a str. currently, for instance,
filtering for non-str (e.g. int) metadata values does not work.

for instance this does not worked so far

```
    <param ... type="data" format="fasta">
      <options options_filter_attribute="metadata.sequences">
        <filter type="add_value" value="1"/>
      </options>
    </param>
```
2020-03-01 00:23:07 +01:00
Sergey Golitsynskiy 4a847a2fab Merge pull request #9444 from ic4f/dev_managed_config_dir2
Make mutable_config_dir configurable + rename
2020-02-27 20:54:04 -05:00
Dannon 361dafe312 Merge pull request #8187 from Nerdinacan/update_time_trigger
Added trigger to dataset table to update history.update_time
2020-02-27 13:39:57 -05:00
mvdbeek 4759d3d33d Update version to 20.05.dev 2020-02-27 18:09:04 +01:00
mvdbeek a02480f35b Merge branch 'release_20.01' into dev 2020-02-27 17:51:34 +01:00
Sergey GolitsynskiyandNicola Soranzo 5d4d4c6707 If managed_config_dir is set by user, ensure path is absolute.
Co-Authored-By: Nicola Soranzo <nicola.soranzo@gmail.com>
2020-02-27 11:50:42 -05:00
Dannon 63e28b6ef9 Merge pull request #9271 from mvdbeek/20.01_release_notes
[20.01] Release notes for 20.01
2020-02-27 11:15:59 -05:00
Nicola Soranzo 2bfeeec299 Drop pygithub3 dev requirement 2020-02-27 16:04:40 +00:00
Sergey Golitsynskiy 5e3750d9a7 Interpret empty string as 'value not set'
Based on code review discussion
2020-02-27 11:03:47 -05:00
Marius van den Beek 8f8423576c Merge pull request #9439 from bernt-matthias/topic/sim_size_default
Unify default values used for delta (sim_size)
2020-02-27 16:55:28 +01:00
Dannon Baker b2e00afbaf Followup to shed tool static fixes; change order of lookup preferring to check static/images first. 2020-02-26 15:35:03 -05:00
Dannon Baker 74cd45d2ad Update migration version number, fix typo 2020-02-26 13:34:45 -05:00
Sergey GolitsynskiyandNicola Soranzo 823526a1fc Use helper method
Co-Authored-By: Nicola Soranzo <nicola.soranzo@gmail.com>
2020-02-26 10:57:48 -05:00
Sergey GolitsynskiyandNicola Soranzo 738566ec9e Use helper method
Co-Authored-By: Nicola Soranzo <nicola.soranzo@gmail.com>
2020-02-26 10:46:05 -05:00
Sergey GolitsynskiyandNicola Soranzo 3d907241a7 Use helper method
Co-Authored-By: Nicola Soranzo <nicola.soranzo@gmail.com>
2020-02-26 10:44:45 -05:00
Sergey GolitsynskiyandNicola Soranzo 35e9af18af Update lib/galaxy/config/__init__.py
Use helper method

Co-Authored-By: Nicola Soranzo <nicola.soranzo@gmail.com>
2020-02-26 10:36:45 -05:00
mvdbeek 475ad877d1 Merge branch 'release_20.01' into dev 2020-02-26 16:11:33 +01:00
mvdbeek aa0b8833ee Merge branch 'release_19.09' into release_20.01 2020-02-26 16:10:15 +01:00
Nicola Soranzo 865ba235d1 Fix UserManager.get_reset_token() after #9432
Remove `lower()` also from the right side.
2020-02-26 14:32:42 +01:00
M BerntandNicola Soranzo 04515f11bd Correct number
Co-Authored-By: Nicola Soranzo <nicola.soranzo@gmail.com>
2020-02-26 12:57:23 +01:00
M Bernt 45eb41a80e add default to docs
and restore empty line to separate third-party from "internal" imports
2020-02-26 12:53:56 +01:00
M BerntandNicola Soranzo cfeff79378 remove remnant line
Co-Authored-By: Nicola Soranzo <nicola.soranzo@gmail.com>
2020-02-26 12:51:56 +01:00
Nicola Soranzo 775a771702 Merge branch 'release_20.01' into dev 2020-02-26 11:10:31 +01:00
Nicola Soranzo 37624188e8 Merge branch 'release_19.09' into release_20.01 2020-02-26 11:04:12 +01:00
M Bernt 7624a4dc66 add missing import 2020-02-26 10:52:11 +01:00
M Bernt 28aaa88344 apply int to default also in yaml parser 2020-02-26 10:37:01 +01:00
M BerntandNicola Soranzo 4f8ce5ecbf use TextIOWrapper instead of decode
Co-Authored-By: Nicola Soranzo <nicola.soranzo@gmail.com>
2020-02-26 10:22:30 +01:00
Sergey Golitsynskiy ed19b91941 Run make config-rebuild 2020-02-25 22:28:46 -05:00
Sergey Golitsynskiy 2f264977f1 Make mutable_config_dir configurable + rename
Also: do not run integration test on managed_config_dir: it depends on
config_dir, which is modified for testing.

Note: replaces previous commit from 9377
2020-02-25 22:21:42 -05:00
Dannon 3851b119ed Merge pull request #9432 from mvdbeek/restore_non_lowercase_access
[20.01] Fix login to accounts using different email capitalization
2020-02-25 16:28:11 -05:00
mvdbeek 5cac6a706f Fix to_dict for upload1 tool
This used to happen in tool_form.mako (https://github.com/galaxyproject/galaxy/blob/0637e0adeeafde44405f69581c3e9b2ae7123ef7/templates/webapps/galaxy/tool_form.mako#L299),
where the code was:
```
    # Handle calculating the redirect url for the special case where we have nginx proxy
    # upload and need to do url_for on the redirect portion of the tool action.
    try:
        tool_url = h.url_for(tool.action)
    except AttributeError:
        assert len(tool.action) == 2
        tool_url = tool.action[0] + h.url_for(tool.action[1])
```
Fixes https://sentry.galaxyproject.org/sentry/main/issues/300358/:
```
AttributeError: 'tuple' object has no attribute 'startswith'
  File "galaxy/web/framework/decorators.py", line 282, in decorator
    rval = func(self, trans, *args, **kwargs)
  File "galaxy/webapps/galaxy/api/tools.py", line 124, in build
    return tool.to_json(trans, kwd.get('inputs', kwd))
  File "galaxy/tools/__init__.py", line 2057, in to_json
    'action'        : self.app.url_for(self.action),
  File "routes/util.py", line 211, in url_for
    if url.startswith('/') and hasattr(config, 'environ') \
```
2020-02-25 19:20:54 +01:00
M Bernt dc3c9009f1 also use the default for yaml parser 2020-02-25 17:36:02 +01:00
M Bernt 0e98dbd778 fix imports 2020-02-25 17:36:02 +01:00
M Bernt e47ab7a13a use a constant to specify default 2020-02-25 17:35:59 +01:00
M Bernt 10c2715d7a make delta (sim_size) default consistent 2020-02-25 17:34:22 +01:00
Marius van den BeekandNicola Soranzo d5be9b3ae5 Don't check username again
Co-Authored-By: Nicola Soranzo <nicola.soranzo@gmail.com>
2020-02-25 16:29:32 +01:00
M Bernt 229e04a5fd fix searchgui_archive set_meta
probably with py3 reading a file from a zip file is binary.
hence startswith and split fail.
2020-02-25 16:05:10 +01:00
Dannon a1f9ae28ec Merge pull request #9433 from mvdbeek/fix_twobitfile_reading
[20.01] Fix TwoBitFile handle not opened in binary mode
2020-02-25 09:56:16 -05:00
Dannon 62d432582c Merge pull request #9430 from mvdbeek/add_additional_strip_null
[20.01] Strip unicode null characters from traceback and job_messages
2020-02-25 09:04:57 -05:00
M Bernt 6be7ac8eee fix two cases of opening a file binary
might fix https://github.com/galaxyproject/galaxy/issues/9328
2020-02-25 15:00:57 +01:00
Marius van den Beek 207f4c5fb0 Merge pull request #9424 from bernt-matthias/topic/ts-handlers-write-binary
fix two cases of opening a file binary
2020-02-25 15:00:04 +01:00
Dannon b57112bd9d Merge pull request #9434 from mvdbeek/cast_uploaded_file_content_to_unicode
[20.01] Fix uploading workflow archives
2020-02-25 08:49:40 -05:00
mvdbeek 382b6a41bc Fix uploading workflow archives
This fixes https://sentry.galaxyproject.org/sentry/main/issues/502038/:
```
TypeError: a bytes-like object is required, not 'str'
  File "galaxy/web/framework/decorators.py", line 282, in decorator
    rval = func(self, trans, *args, **kwargs)
  File "galaxy/webapps/galaxy/api/workflows.py", line 361, in create
    return self.__api_import_from_archive(trans, archive_data, "uploaded file")
  File "galaxy/webapps/galaxy/api/workflows.py", line 640, in __api_import_from_archive
    if "GalaxyWorkflow" in archive_data:
```
The actual uploaded data is still invalid, but a more meaningful message
will be raised with this fix.
2020-02-25 12:31:18 +01:00
mvdbeek d649338297 Fix TwoBitFile handle not opened in binary mode
Fixes https://sentry.galaxyproject.org/sentry/main/issues/501741/:
```
UnicodeDecodeError: 'utf-8' codec can't decode byte 0xd7 in position 77: invalid continuation byte
  File "galaxy/web/framework/middleware/sentry.py", line 43, in __call__
    iterable = self.application(environ, start_response)
  File "/cvmfs/main.galaxyproject.org/venv/lib/python3.6/site-packages/paste/recursive.py", line 85, in __call__
    return self.application(environ, start_response)
  File "galaxy/web/framework/middleware/statsd.py", line 34, in __call__
    req = self.application(environ, start_response)
  File "/cvmfs/main.galaxyproject.org/venv/lib/python3.6/site-packages/paste/httpexceptions.py", line 640, in __call__
    return self.application(environ, start_response)
  File "galaxy/web/framework/base.py", line 143, in __call__
    return self.handle_request(environ, start_response)
  File "galaxy/web/framework/base.py", line 222, in handle_request
    body = method(trans, **kwargs)
  File "galaxy/web/framework/decorators.py", line 57, in call_and_format
    rval = func(self, trans, *args, **kwargs)
  File "galaxy/webapps/galaxy/api/genomes.py", line 41, in show
    region = self.app.genomes.reference(trans, dbkey=id, chrom=chrom, low=low, high=high)
  File "galaxy/visualization/genomes.py", line 395, in reference
    twobit = TwoBitFile(open(twobit_file_name))
  File "bx/seq/twobit.py", line 56, in __init__
    strng = file.read(TWOBIT_MAGIC_SIZE)
  File "python3.6/codecs.py", line 321, in decode
    (result, consumed) = self._buffer_decode(data, self.errors, final)
```
2020-02-25 12:13:17 +01:00
mvdbeek c86c75cc2b Fix login to accounts using different email capitalization
https://github.com/galaxyproject/galaxy/pull/8631 added case-insensitive
matches to user emails. If two accounts with different email
capitalizations exist one of them will be picked at random for login.
To fix this we first check for exact match and only if there is no
direct match we lowercase the comparison.
2020-02-25 12:02:59 +01:00
Sergey Golitsynskiy 24a97be154 Check sample config for build_sites 2020-02-25 10:01:14 +01:00
Sergey Golitsynskiy c54836e984 Remove '.sample' from default value; rebuild schema 2020-02-25 10:01:10 +01:00
mvdbeek ead6bb4c82 Strip unicode null characters from traceback and job_messages
May or may not help with
https://github.com/galaxyproject/galaxy/issues/9428.
2020-02-25 09:48:07 +01:00
Sergey Golitsynskiy c3c0f2d988 Check sample config for build_sites 2020-02-24 15:47:09 -05:00
Sergey Golitsynskiy 6d29650673 Remove '.sample' from default value; rebuild schema 2020-02-24 14:36:24 -05:00