Commit Graph

59151 Commits

Author SHA1 Message Date
mvdbeek 101d4a6d41 Merge branch 'release_21.09' into release_22.01 2024-09-20 08:16:44 +02:00
mvdbeek 0a039981bb Merge branch 'release_21.05' into release_21.09 2024-09-20 08:15:59 +02:00
John Chilton 9a9c4a8eb8 Do not set uuid on dataset imports. 2024-09-20 08:15:27 +02:00
mvdbeek 6370059700 Merge branch 'release_21.01' into release_21.05 2024-09-20 08:14:04 +02:00
mvdbeek b1da9d832e Merge branch 'release_20.09' into release_21.01 2024-09-20 07:15:42 +02:00
mvdbeek 13ab9430b3 Merge branch 'release_20.05' into release_20.09 2024-09-20 07:15:06 +02:00
Dannon 99b3d29e69 Change mechanism for loading data into editor viz
avoiding injecting it as innerHTML and executing contents.
2024-09-20 07:14:37 +02:00
Marius van den Beek a03856c8e5 Merge pull request #16598 from assuntad23/bug/16191/boxplot-render-fix
[22.01] Passing Identifier for div to Write the Chart Panel to
2023-08-30 16:25:01 +02:00
Assunta DeSanto e412b5db8b passing identifier for div to write the chart panel to 2023-08-25 14:17:06 -04:00
Marius van den Beek 396eebf670 Merge pull request #16575 from davelopez/22.01_fix_asgi_request_host
[22.01] Fix incorrect ASGI request host
2023-08-18 22:35:45 +02:00
davelopez e6d158f72c Fix incorrect request host in ASGI 2023-08-18 12:32:32 +02:00
Marius van den Beek 54c44b6811 Merge pull request #16567 from mvdbeek/tox_fix
[22.01] Fix up tox.ini
2023-08-17 11:35:13 +02:00
mvdbeek 03fa9eb259 Fix up tox.ini 2023-08-17 10:53:03 +02:00
Marius van den Beek f76d894fa9 Merge pull request #15893 from bernt-matthias/fix/cached_explicit_singularity_container_description
[22.01] cached_explicit_singularity: needs to copy container description
2023-04-04 14:35:04 +02:00
Matthias Bernt e81fc67d44 cached_explicit_singularity: copy container description
otherwise `container_description.identifier = cache_path` (at the end of the function)
will modify the original (i.e. the tools) container description which influences
i.e. (may break) successive container resolutions.
2023-04-04 12:09:36 +02:00
Dannon 6f6e375b63 Merge pull request #15791 from bernt-matthias/topic/has_n_columns_comment
[22.01] xsd: add forgotten comment attribute
2023-03-27 09:26:26 -04:00
Martin Cech 5141a0f6cc Merge pull request #15826 from martenson/release_22.01
[22.01] add security checks to page and visualization APIs
2023-03-20 16:04:18 +01:00
Martin Cech e2d0ef27eb add security checks to page and visualzation APIs 2023-03-19 20:41:56 -07:00
M Bernt 90b3559746 Doc text improvement
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
2023-03-14 15:51:04 +01:00
Matthias Bernt 92597e46d4 xsd: add forgotten comment attribute
for has_n_columns

follow up on https://github.com/galaxyproject/galaxy/pull/12528
2023-03-14 13:32:42 +01:00
John Chilton d62235fcb7 Merge pull request #15222 from jdavcs/release_22.01_table_attr_err
[22.01] Fix maintenance script bug
2022-12-17 10:17:44 -05:00
John Davis dd553e805f Fix maintenance script bug 2022-12-16 10:15:21 -05:00
Nicola Soranzo a425b5d08d Merge branch 'release_21.09' into release_22.01 2022-12-11 22:32:46 +00:00
Nicola Soranzo 72bfa2b76d Merge branch 'release_21.05' into release_21.09 2022-12-11 22:31:52 +00:00
Nicola Soranzo 6b9f0902b8 Merge branch 'release_21.01' into release_21.05 2022-12-11 21:54:23 +00:00
Dannon 2b79cf2aea Merge pull request #15170 from nsoranzo/release_21.01_fix_passenv
[21.01] Fix `passenv` option for tox 4.0
2022-12-11 15:25:50 -05:00
Nicola Soranzo 653b415e21 Fix passenv option for tox 4.0
See https://tox.wiki/en/latest/faq.html#tox-4-changed-ini-rules
2022-12-11 18:35:04 +00:00
Nicola Soranzo 1a5f738c35 Merge branch 'release_21.09' into release_22.01 2022-12-08 14:21:59 +00:00
Nicola Soranzo 69ef5711c8 Merge branch 'release_21.05' into release_21.09 2022-12-08 12:52:58 +00:00
Nicola Soranzo a59d4d48dd Merge branch 'release_21.01' into release_21.05 2022-12-08 12:39:45 +00:00
Marius van den Beek e7b8e9231f Merge pull request #15148 from mvdbeek/pin_packaging
[22.01] Pin packaging to below 22
2022-12-08 12:18:29 +01:00
mvdbeek 173177e12e Add missing pyparsing dependency to galaxy-util 2022-12-08 12:01:55 +01:00
Nicola Soranzo b3eedc1049 Update minikube-setup-action and use more recent k8s version
The older minikube/k8s fail to launch under Ubuntu 22.04, which
is being deployed on GitHub action workers:
2022-12-08 12:01:55 +01:00
mvdbeek dc7c8e7ac6 Pin packaging to below 22 2022-12-08 12:01:55 +01:00
Nicola Soranzo 7d21208153 Merge pull request #15143 from martenson/release_21.01
[21.01] Rename removed tox configuration option
2022-12-08 08:13:16 +00:00
Dannon 81ddf41685 Merge pull request #15144 from martenson/tox4-allow
[22.01] Rename removed tox configuration option
2022-12-07 20:27:29 -05:00
Martin Cech d251aa2d53 [22.01] Rename removed tox configuration option
breaks our tox setup with 4.0.0
2022-12-07 22:52:11 +01:00
Martin Cech 2887eb8747 rename removed tox configuration option 2022-12-07 12:47:41 -08:00
Dannon Baker e5e6bda4f0 Contain directory traversal for static files to host static root. 2022-12-05 14:35:56 -05:00
Nicola Soranzo 7136d72b06 Merge pull request #15006 from nsoranzo/release_22.01_fix_LC_CTYPE_macOS
[22.01] Fix setting ``LC_CTYPE`` variable in clean environment on macOS
2022-11-17 17:18:52 +00:00
Nicola Soranzo c80577e0b3 Fix setting `LC_CTYPE` variable in clean environment on macOS
Fix some older tools (not using `profile` or `stdio`) failing because
of the following warning printed on stderr when run locally on macOS:

```
perl: warning: Setting locale failed.
perl: warning: Please check that your locale settings:
LC_ALL = (unset),
LC_CTYPE = "C.UTF-8",
LANG = (unset)
are supported and installed on your system.
perl: warning: Falling back to the standard locale ("C").
```
2022-11-17 10:50:07 +00:00
mvdbeek df7712927b Start work on galaxy-tool-util 22.1.6 2022-11-14 10:28:55 +01:00
mvdbeek 642c28a3e9 Release galaxy-tool-util-22.1.5 galaxy-tool-util-22.1.5 2022-11-14 10:22:28 +01:00
Marius van den Beek a8ab71fc9e Merge pull request #14970 from mvdbeek/alt_fix_expected_failure_occurred
[22.01] Set test status to success on expected failure
2022-11-11 09:07:11 +01:00
mvdbeek 9570da58c1 Avoid negations 2022-11-10 16:25:26 +01:00
mvdbeek 0687217a16 Set test status to success on expected failure
Alternative to https://github.com/galaxyproject/galaxy/pull/14958
2022-11-10 16:20:17 +01:00
Martin Cech d75c0fdbc2 Merge pull request #14933 from mvdbeek/switch_back_to__run_workflow
[22.01] Revert "Use _run_jobs instead of _run_workflows"
2022-11-06 00:56:23 +01:00
mvdbeek 494bae8ddd Revert "Use _run_jobs instead of _run_workflows"
This reverts commit a01c8c5a88.

_run_workflow has the right type annotations, but 21.09 didn't have
this.
2022-11-05 18:14:18 +01:00
Martin Cech 6623f4424b Merge branch 'release_21.09' into release_22.01 2022-11-05 09:19:44 -07:00
Martin Cech ce400589f5 Merge pull request #14908 from mvdbeek/backport_data_column_fix
[21.09] Backport 14518: Always call strip() on data_column column values
2022-11-05 17:17:37 +01:00