Commit Graph
4751 Commits
Author SHA1 Message Date
Dannon 8e16fcb4cc Merge pull request #9233 from dannon/external-auth-login-refinement
[20.01] External auth login refinement
2020-01-28 13:22:55 -05:00
Nicola Soranzo 6fbe8c9031 Merge branch 'release_19.09' into release_20.01 2020-01-24 17:08:02 +00:00
Nicola Soranzo d67295162a Simplify and refactor 2020-01-23 21:57:54 +00:00
mvdbeek e227b1473f Fix unselected select parameter comparison to empty string
`$wrapper == ""` and `$wrapper == "None"` had been valid ways
to check for unselected / optional select parameters.
This restores the `$wrapper == ""` form as used by gffcompare
https://github.com/galaxyproject/tools-iuc/blob/master/tools/gffcompare/gffcompare.xml#L41
2020-01-23 19:24:52 +00:00
mvdbeek 5d379dc4a5 Fix unselected select parameter comparison to empty string
`$wrapper == ""` and `$wrapper == "None"` had been valid ways
to check for unselected / optional select parameters.
This restores the `$wrapper == ""` form as used by gffcompare
https://github.com/galaxyproject/tools-iuc/blob/master/tools/gffcompare/gffcompare.xml#L41
2020-01-23 16:02:56 +01:00
Dannon Baker f041eb2190 Fix lint in custos test 2020-01-22 16:43:42 -05:00
Dannon Baker 20a0777a25 Fix custos authnz tests. This should be swapped to use the standard mocked objects? 2020-01-22 11:44:27 -05:00
mvdbeek 83a8e1b7eb Test that working dir is intact on resubmission 2020-01-22 10:25:16 +01:00
M Bernt 5de147a181 re-remove the data input 2020-01-22 09:37:24 +01:00
M Bernt fff8d2ec7b inputs configfile: test for filename and data_style attributes 2020-01-22 09:37:19 +01:00
Dannon Baker c98c416fa5 Fix custos_authnz tests (allow email kwarg, which does nothing in this case..) 2020-01-21 14:37:50 -05:00
mvdbeek 28277d2b67 Fix unit test 2020-01-21 11:57:20 +01:00
mvdbeek 5ee23fd52b Fix mulled-build-files if name_override is not given 2020-01-17 09:35:16 +01:00
mvdbeek b1885b065f Sort best package by upload time (lowest priority)
in addition to version and build number. This is necessary for getting
the extended-base annotation for qiime 1.9.1, which does not contain the
annotation in linux-64/qiime-1.9.1-np110py27_1.tar.bz2 while in the
newer linux-64/qiime-1.9.1-np112py27_1.tar.bz2 it is present. This
depends of course on `conda search` returning packages sorted by upload
time and is a little brittle. It does seem better than always picking
the oldest upload time as we do without this change.  Also looks in
meta.yaml for extended base annotation, since sometimes this isn't
present in info/about.json.
2020-01-16 11:52:03 +01:00
mvdbeek 6d3b14f9a3 Change any_target_requires_extended_base to base_image_for_targets
This is easier to use in planemo (we don't need to figure out which
image to use based on the return value of
any_target_requires_extended_base) and leaves open the possibility for
custom base image annotation in conda recipes or other places.
2020-01-14 12:01:31 +02:00
mvdbeek c471ab2dde Add base_image column to mulled-build-files
This will continue to work for single column files
or files that make use of the second and third column already
(build_number and name_override).
I don't think we should be using name_override,
but given the library nature and not knowing if anyone
except for biocontainers/multi-package-containers uses
this I chose to keep backwards compaitbility.

This does add support for meaningful column headers,
so we can write something like
```
\#base_image	targets	build_number
extended	package	10
```
and not include name_override.
2020-01-10 20:09:09 +02:00
mvdbeek 9e9d08e98e Just make sure we're not using galaxy's isolated home dir 2020-01-09 17:47:10 +00:00
mvdbeek b58bf62252 Print output when exception occurs 2020-01-09 14:40:48 +01:00
mvdbeek 797fc57b0a Decorate class to skip, not class setup method 2020-01-09 14:40:48 +01:00
mvdbeek e7abcb030b Fix integration test case for database set through env var 2020-01-09 14:40:48 +01:00
Nicola Soranzo 1e4ec5c843 Use @pytest.mark.skipif decorator 2020-01-09 14:40:48 +01:00
mvdbeek 03e7ea25fb Fix tool watcher unit tests; sleep needs to happen after watching the file 2020-01-09 14:40:48 +01:00
mvdbeek 44eac318b0 Fix kubernetes tests on minikube 2020-01-09 14:40:48 +01:00
mvdbeek d0693ccbea Run and fix grt/export.py test
It used to take 35 minutes on jenkins, but it doesn't anymore, as we're
using a clean database for each test class.
2020-01-09 14:40:48 +01:00
mvdbeek ef3215d8c4 Update build_mulled integration test for new API
The previous API doesn't allow container installation after 2445425bf9
2020-01-09 14:40:48 +01:00
mvdbeek d5fc7d426e Fix interactivetool python 3 support and tests
- enables docker destination for interactivetool tests
- fixes a wrong argument in entrypoint management
- fixes the test setup that targeted a previous iteration (which was
  still called realtimetools)
- prevents deleting the working directory before python has a chance to
  start the container monitor (that's the sleep command)
- fixes some odd interactive tool test assertions
- uses unicode arguments in key_type_token_mapping.py.
  uwsgi arguments are always passed as bytestrings.
2020-01-09 14:40:48 +01:00
mvdbeek 55cf4451d0 CliRunner lint fix 2020-01-09 14:40:48 +01:00
mvdbeek cfe1ad7f85 Skip usermod on osx, isn't necessary with docker for mac 2020-01-09 14:40:48 +01:00
mvdbeek 1f9dc90f25 Run ssh/cluster containers in privileged mode 2020-01-09 14:40:48 +01:00
mvdbeek 9be9a5b5d2 Adjust uid of testuser inside slurm/pbs container 2020-01-09 14:40:48 +01:00
mvdbeek d33813c28d Tweak paramiko missing hostkey policies 2020-01-09 14:40:48 +01:00
mvdbeek 5b09f6d74c Disable strict host key checking during tests
And fix parsing of shell_strict_host_key_check
2020-01-09 14:40:48 +01:00
mvdbeek 4fd536658d Merge branch 'release_19.09' into release_20.01 2019-12-27 20:14:21 +01:00
mvdbeek f12e0844fe Merge branch 'release_19.05' into release_19.09 2019-12-27 20:12:05 +01:00
mvdbeek 9d1cccd14d Cast to None for optional params if not comparing strings
Proposed by @nsroanzo in https://github.com/galaxyproject/galaxy/pull/9149#discussion_r360225247
2019-12-21 17:22:34 +01:00
John Chilton a2d14be11f Allow testing command versions in tools - tests, XSD. 2019-12-19 17:34:31 -05:00
John Chilton 738ea0c506 Re-locate version path to a writable directory in containers. 2019-12-19 17:32:40 -05:00
mvdbeek d12f21d62e Add test for unset optional parameters 2019-12-19 17:55:00 +01:00
Dannon 84a0ec271a Merge pull request #8893 from jmchilton/markdown_export
PDF Export of Galaxy Markdown
2019-12-19 11:21:09 -05:00
mvdbeek b52b022383 Merge branch 'release_19.09' into dev 2019-12-19 10:36:07 +01:00
mvdbeek 5759160036 Merge branch 'release_19.05' into release_19.09 2019-12-19 10:28:30 +01:00
Nicola Soranzo 21cb3d9d7d Restore returning "None" when casting unselected multiselect param to str
Broken in commit 7d3b9c53bb .

Before the above-mentioned commit, when a
`<param name="blah" type="select" multiple="true"/>` was left unselected,
its value was `None`, casted to string as `"None"`.
Tool authors would check if the user has selected a value with something
like:

```
 #if str($blah) != 'None':
```

After the above-mentioned commit, the value of the unselected param is `[]`,
casted to string as `""`, which breaks tools using the check above.
This restores the previous behaviour.

Seen in pull request:

https://github.com/galaxyproject/tools-iuc/pull/2691
2019-12-19 02:21:28 +00:00
John Chilton eca65e9c01 PDF generation for reports. 2019-12-18 17:18:05 -05:00
Marius van den Beek e5d7a6d927 Merge pull request #9075 from jmchilton/fix_format2_exports
[19.09] Rev gxformat2 dependency to fix various export issues.
2019-12-17 23:19:48 +01:00
Marius van den Beek 005c7e0ea1 Merge pull request #9099 from jmchilton/validation_separation
Separate Markdown Validation into its own module.
2019-12-17 22:38:59 +02:00
Marius van den Beek c10a434fcc Merge pull request #8512 from jmchilton/page_format
Markdown-based Galaxy Pages.
2019-12-17 22:37:21 +02:00
Marius van den Beek 9c46e852b1 Merge pull request #9086 from jmchilton/revise_workflow_inputs_2
Even Richer Workflow Inputs
2019-12-17 22:26:08 +02:00
Björn Grüning 850d483bf2 Merge pull request #9116 from mvdbeek/mulled_build_minimal
Automatically use extended-base-image if necessary
2019-12-16 20:59:27 +01:00
John Chilton 7a09995b3a Separate markdown parse out into own module for reuse. 2019-12-16 10:13:33 -05:00
John Chilton 5fc7c3b8b2 Implement Markdown pages w/editor toolbar. 2019-12-16 07:25:16 -05:00