opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-11-01 02:59:47 +08:00
Code Issues Packages Projects Releases Wiki Activity
85,639 Commits 64 Branches 246 Tags
68b4a0c948d94de4d1002e0f16efceec8501998b
Commit Graph
227 Commits
Author SHA1 Message Date
mvdbeek ac8ec8c08d Merge branch 'release_25.0' into dev 
# Conflicts:
#	client/package.json
#	lib/galaxy/version.py
#	package.json
#	packages/app/HISTORY.rst
#	packages/app/setup.cfg
#	packages/auth/HISTORY.rst
#	packages/auth/setup.cfg
#	packages/config/HISTORY.rst
#	packages/config/setup.cfg
#	packages/data/HISTORY.rst
#	packages/data/setup.cfg
#	packages/files/HISTORY.rst
#	packages/files/setup.cfg
#	packages/job_execution/HISTORY.rst
#	packages/job_execution/setup.cfg
#	packages/job_metrics/HISTORY.rst
#	packages/job_metrics/setup.cfg
#	packages/meta/HISTORY.rst
#	packages/meta/setup.cfg
#	packages/navigation/HISTORY.rst
#	packages/navigation/setup.cfg
#	packages/objectstore/HISTORY.rst
#	packages/objectstore/setup.cfg
#	packages/schema/HISTORY.rst
#	packages/schema/setup.cfg
#	packages/selenium/HISTORY.rst
#	packages/selenium/setup.cfg
#	packages/test_api/HISTORY.rst
#	packages/test_api/setup.cfg
#	packages/test_base/HISTORY.rst
#	packages/test_base/setup.cfg
#	packages/test_driver/HISTORY.rst
#	packages/test_driver/setup.cfg
#	packages/tool_shed/HISTORY.rst
#	packages/tool_shed/setup.cfg
#	packages/tool_shed_schema/HISTORY.rst
#	packages/tool_shed_schema/setup.cfg
#	packages/tool_util/HISTORY.rst
#	packages/tool_util/setup.cfg
#	packages/tool_util_models/HISTORY.rst
#	packages/tool_util_models/setup.cfg
#	packages/tours/HISTORY.rst
#	packages/tours/setup.cfg
#	packages/util/HISTORY.rst
#	packages/util/setup.cfg
#	packages/web_apps/HISTORY.rst
#	packages/web_apps/setup.cfg
#	packages/web_client/HISTORY.rst
#	packages/web_client/setup.cfg
#	packages/web_framework/HISTORY.rst
#	packages/web_framework/setup.cfg
#	packages/web_stack/HISTORY.rst
#	packages/web_stack/setup.cfg
 2025-09-23 19:10:06 +02:00
mvdbeek 3118cd2de2 Start work on 25.0.4.dev0 2025-09-23 19:09:48 +02:00
mvdbeek 1492e51b24 Create version 25.0.3 2025-09-23 19:09:42 +02:00
Matthias Bernt 70444d3177 Merge branch 'release_25.0' into dev 
# Conflicts:
#	client/package.json
#	lib/galaxy/version.py
#	package.json
#	packages/app/HISTORY.rst
#	packages/app/setup.cfg
#	packages/auth/HISTORY.rst
#	packages/auth/setup.cfg
#	packages/config/HISTORY.rst
#	packages/config/setup.cfg
#	packages/data/HISTORY.rst
#	packages/data/setup.cfg
#	packages/files/HISTORY.rst
#	packages/files/setup.cfg
#	packages/job_execution/HISTORY.rst
#	packages/job_execution/setup.cfg
#	packages/job_metrics/HISTORY.rst
#	packages/job_metrics/setup.cfg
#	packages/meta/HISTORY.rst
#	packages/meta/setup.cfg
#	packages/navigation/HISTORY.rst
#	packages/navigation/setup.cfg
#	packages/objectstore/HISTORY.rst
#	packages/objectstore/setup.cfg
#	packages/schema/HISTORY.rst
#	packages/schema/setup.cfg
#	packages/selenium/HISTORY.rst
#	packages/selenium/setup.cfg
#	packages/test_api/HISTORY.rst
#	packages/test_api/setup.cfg
#	packages/test_base/HISTORY.rst
#	packages/test_base/setup.cfg
#	packages/test_driver/HISTORY.rst
#	packages/test_driver/setup.cfg
#	packages/tool_shed/HISTORY.rst
#	packages/tool_shed/setup.cfg
#	packages/tool_shed_schema/HISTORY.rst
#	packages/tool_shed_schema/setup.cfg
#	packages/tool_util/HISTORY.rst
#	packages/tool_util/setup.cfg
#	packages/tool_util_models/HISTORY.rst
#	packages/tool_util_models/setup.cfg
#	packages/tours/HISTORY.rst
#	packages/tours/setup.cfg
#	packages/util/HISTORY.rst
#	packages/util/setup.cfg
#	packages/web_apps/HISTORY.rst
#	packages/web_apps/setup.cfg
#	packages/web_client/HISTORY.rst
#	packages/web_client/setup.cfg
#	packages/web_framework/HISTORY.rst
#	packages/web_framework/setup.cfg
#	packages/web_stack/HISTORY.rst
#	packages/web_stack/setup.cfg
 2025-08-13 14:34:10 +02:00
Matthias Bernt 2533594f58 Start work on 25.0.3.dev0 2025-08-13 14:34:04 +02:00
Matthias Bernt 34d077d19c Create version 25.0.2 2025-08-13 14:33:57 +02:00
Nicola Soranzo 6ec1249584 Merge branch 'release_25.0' into dev 2025-07-10 12:16:38 +01:00
Nicola Soranzo b2215984a9 Drop support for Python 3.7 in 5 packages 2025-07-08 16:48:36 +01:00
Nate Coraor 3daf07de4b Merge branch 'release_25.0' into dev 
# Conflicts:
#	client/package.json
#	lib/galaxy/version.py
#	package.json
#	packages/app/HISTORY.rst
#	packages/app/setup.cfg
#	packages/auth/HISTORY.rst
#	packages/auth/setup.cfg
#	packages/config/HISTORY.rst
#	packages/config/setup.cfg
#	packages/data/HISTORY.rst
#	packages/data/setup.cfg
#	packages/files/HISTORY.rst
#	packages/files/setup.cfg
#	packages/job_execution/HISTORY.rst
#	packages/job_execution/setup.cfg
#	packages/job_metrics/HISTORY.rst
#	packages/job_metrics/setup.cfg
#	packages/meta/HISTORY.rst
#	packages/meta/setup.cfg
#	packages/navigation/HISTORY.rst
#	packages/navigation/setup.cfg
#	packages/objectstore/HISTORY.rst
#	packages/objectstore/setup.cfg
#	packages/schema/HISTORY.rst
#	packages/schema/setup.cfg
#	packages/selenium/HISTORY.rst
#	packages/selenium/setup.cfg
#	packages/test_api/HISTORY.rst
#	packages/test_api/setup.cfg
#	packages/test_base/HISTORY.rst
#	packages/test_base/setup.cfg
#	packages/test_driver/HISTORY.rst
#	packages/test_driver/setup.cfg
#	packages/tool_shed/HISTORY.rst
#	packages/tool_shed/setup.cfg
#	packages/tool_shed_schema/HISTORY.rst
#	packages/tool_shed_schema/setup.cfg
#	packages/tool_util/HISTORY.rst
#	packages/tool_util/setup.cfg
#	packages/tool_util_models/HISTORY.rst
#	packages/tool_util_models/setup.cfg
#	packages/tours/HISTORY.rst
#	packages/tours/setup.cfg
#	packages/util/HISTORY.rst
#	packages/util/setup.cfg
#	packages/web_apps/HISTORY.rst
#	packages/web_apps/setup.cfg
#	packages/web_client/setup.cfg
#	packages/web_framework/HISTORY.rst
#	packages/web_framework/setup.cfg
#	packages/web_stack/HISTORY.rst
#	packages/web_stack/setup.cfg
 2025-06-20 16:37:15 -04:00
Nate Coraor 751b52f1ec Start work on 25.0.2.dev0 2025-06-20 16:37:11 -04:00
Nate Coraor 5915a88342 Create version 25.0.1 2025-06-20 16:37:07 -04:00
Nate Coraor 96523d4570 Merge remote-tracking branch 'upstream/release_25.0' into dev 2025-06-20 16:18:47 -04:00
Michael R. Crusoe 03211a48ee names of package extras cannot contain underscores. https://packaging.python.org/en/latest/specifications/core-metadata/#provides-extra-multiple-use 2025-06-20 12:12:45 +01:00
Ahmed Awan 0f9561ec32 Fix package versions 2025-06-18 12:23:14 -05:00
Ahmed Awan 3000e4343d Merge branch 'release_25.0' into dev 
# Conflicts:
#	lib/galaxy/version.py
#	packages/app/HISTORY.rst
#	packages/auth/HISTORY.rst
#	packages/config/HISTORY.rst
#	packages/data/HISTORY.rst
#	packages/files/HISTORY.rst
#	packages/job_execution/HISTORY.rst
#	packages/job_metrics/HISTORY.rst
#	packages/meta/HISTORY.rst
#	packages/navigation/HISTORY.rst
#	packages/objectstore/HISTORY.rst
#	packages/schema/HISTORY.rst
#	packages/selenium/HISTORY.rst
#	packages/test_api/HISTORY.rst
#	packages/test_base/HISTORY.rst
#	packages/test_driver/HISTORY.rst
#	packages/tool_shed/HISTORY.rst
#	packages/tool_util/HISTORY.rst
#	packages/tours/HISTORY.rst
#	packages/util/HISTORY.rst
#	packages/web_apps/HISTORY.rst
#	packages/web_framework/HISTORY.rst
#	packages/web_stack/HISTORY.rst
 2025-06-18 12:00:07 -05:00
Ahmed Awan 0d223a99b2 Start work on 25.0.1.dev0 2025-06-18 11:59:57 -05:00
Ahmed Awan b15565d03e Create version 25.0.0 2025-06-18 11:59:32 -05:00
Nate Coraor d8998d5227 Merge branch 'release_25.0' into dev 2025-06-17 12:17:34 -04:00
Nate Coraor cb08cd758f Merge branch 'release_24.2' into release_25.0 
# Conflicts:
#	lib/galaxy/version.py
#	packages/app/HISTORY.rst
#	packages/app/setup.cfg
#	packages/auth/HISTORY.rst
#	packages/auth/setup.cfg
#	packages/config/HISTORY.rst
#	packages/config/setup.cfg
#	packages/data/HISTORY.rst
#	packages/data/setup.cfg
#	packages/files/HISTORY.rst
#	packages/files/setup.cfg
#	packages/job_execution/HISTORY.rst
#	packages/job_execution/setup.cfg
#	packages/job_metrics/HISTORY.rst
#	packages/job_metrics/setup.cfg
#	packages/meta/setup.cfg
#	packages/navigation/HISTORY.rst
#	packages/navigation/setup.cfg
#	packages/objectstore/HISTORY.rst
#	packages/objectstore/setup.cfg
#	packages/schema/HISTORY.rst
#	packages/schema/setup.cfg
#	packages/selenium/HISTORY.rst
#	packages/selenium/setup.cfg
#	packages/test_api/HISTORY.rst
#	packages/test_api/setup.cfg
#	packages/test_base/HISTORY.rst
#	packages/test_base/setup.cfg
#	packages/test_driver/HISTORY.rst
#	packages/test_driver/setup.cfg
#	packages/tool_shed/HISTORY.rst
#	packages/tool_shed/setup.cfg
#	packages/tool_util/HISTORY.rst
#	packages/tool_util/setup.cfg
#	packages/tours/HISTORY.rst
#	packages/tours/setup.cfg
#	packages/util/HISTORY.rst
#	packages/util/setup.cfg
#	packages/web_apps/HISTORY.rst
#	packages/web_apps/setup.cfg
#	packages/web_framework/HISTORY.rst
#	packages/web_framework/setup.cfg
#	packages/web_stack/HISTORY.rst
#	packages/web_stack/setup.cfg
 2025-06-17 12:17:33 -04:00
Nate Coraor dcd4cdca08 Start work on 24.2.5.dev0 2025-06-17 12:17:28 -04:00
Nate Coraor 7b1e4465bf Create version 24.2.4 2025-06-17 12:17:16 -04:00
mvdbeek c6b2a34916 Merge branch 'release_24.2' into dev 
# Conflicts:
#	lib/galaxy/version.py
#	packages/app/HISTORY.rst
#	packages/app/setup.cfg
#	packages/auth/HISTORY.rst
#	packages/auth/setup.cfg
#	packages/config/HISTORY.rst
#	packages/config/setup.cfg
#	packages/data/HISTORY.rst
#	packages/data/setup.cfg
#	packages/files/HISTORY.rst
#	packages/files/setup.cfg
#	packages/job_execution/HISTORY.rst
#	packages/job_execution/setup.cfg
#	packages/job_metrics/HISTORY.rst
#	packages/job_metrics/setup.cfg
#	packages/navigation/HISTORY.rst
#	packages/navigation/setup.cfg
#	packages/objectstore/HISTORY.rst
#	packages/objectstore/setup.cfg
#	packages/schema/HISTORY.rst
#	packages/schema/setup.cfg
#	packages/selenium/HISTORY.rst
#	packages/selenium/setup.cfg
#	packages/test_api/HISTORY.rst
#	packages/test_api/setup.cfg
#	packages/test_base/HISTORY.rst
#	packages/test_base/setup.cfg
#	packages/test_driver/HISTORY.rst
#	packages/test_driver/setup.cfg
#	packages/tool_shed/HISTORY.rst
#	packages/tool_shed/setup.cfg
#	packages/tool_util/HISTORY.rst
#	packages/tool_util/setup.cfg
#	packages/tours/HISTORY.rst
#	packages/tours/setup.cfg
#	packages/util/HISTORY.rst
#	packages/util/setup.cfg
#	packages/web_apps/HISTORY.rst
#	packages/web_apps/setup.cfg
#	packages/web_framework/HISTORY.rst
#	packages/web_framework/setup.cfg
#	packages/web_stack/HISTORY.rst
#	packages/web_stack/setup.cfg
 2025-03-16 11:38:19 +01:00
mvdbeek 6a610a1b4b Start work on 24.2.4.dev0 2025-03-16 11:38:12 +01:00
mvdbeek f82f1fc5e8 Create version 24.2.3 2025-03-16 11:37:42 +01:00
mvdbeek c996ec452f Merge branch 'release_24.2' into dev 
# Conflicts:
#	lib/galaxy/version.py
#	packages/app/HISTORY.rst
#	packages/app/setup.cfg
#	packages/auth/HISTORY.rst
#	packages/auth/setup.cfg
#	packages/config/HISTORY.rst
#	packages/config/setup.cfg
#	packages/data/HISTORY.rst
#	packages/data/setup.cfg
#	packages/files/HISTORY.rst
#	packages/files/setup.cfg
#	packages/job_execution/HISTORY.rst
#	packages/job_execution/setup.cfg
#	packages/job_metrics/HISTORY.rst
#	packages/job_metrics/setup.cfg
#	packages/navigation/HISTORY.rst
#	packages/navigation/setup.cfg
#	packages/objectstore/HISTORY.rst
#	packages/objectstore/setup.cfg
#	packages/schema/HISTORY.rst
#	packages/schema/setup.cfg
#	packages/selenium/HISTORY.rst
#	packages/selenium/setup.cfg
#	packages/test_api/HISTORY.rst
#	packages/test_api/setup.cfg
#	packages/test_base/HISTORY.rst
#	packages/test_base/setup.cfg
#	packages/test_driver/HISTORY.rst
#	packages/test_driver/setup.cfg
#	packages/tool_shed/HISTORY.rst
#	packages/tool_shed/setup.cfg
#	packages/tool_util/HISTORY.rst
#	packages/tool_util/setup.cfg
#	packages/tours/HISTORY.rst
#	packages/tours/setup.cfg
#	packages/util/HISTORY.rst
#	packages/util/setup.cfg
#	packages/web_apps/HISTORY.rst
#	packages/web_apps/setup.cfg
#	packages/web_framework/HISTORY.rst
#	packages/web_framework/setup.cfg
#	packages/web_stack/HISTORY.rst
#	packages/web_stack/setup.cfg
 2025-03-08 11:44:14 +01:00
mvdbeek 7ad18a9d78 Start work on 24.2.3.dev0 2025-03-08 11:44:06 +01:00
mvdbeek c80d7d92a1 Create version 24.2.2 2025-03-08 11:44:03 +01:00
Matthias Bernt 9d876d1a52 Merge branch 'release_24.2' into dev 
# Conflicts:
#	lib/galaxy/version.py
#	packages/app/HISTORY.rst
#	packages/app/setup.cfg
#	packages/auth/HISTORY.rst
#	packages/auth/setup.cfg
#	packages/config/HISTORY.rst
#	packages/config/setup.cfg
#	packages/data/HISTORY.rst
#	packages/data/setup.cfg
#	packages/files/HISTORY.rst
#	packages/files/setup.cfg
#	packages/job_execution/HISTORY.rst
#	packages/job_execution/setup.cfg
#	packages/job_metrics/HISTORY.rst
#	packages/job_metrics/setup.cfg
#	packages/navigation/HISTORY.rst
#	packages/navigation/setup.cfg
#	packages/objectstore/HISTORY.rst
#	packages/objectstore/setup.cfg
#	packages/schema/HISTORY.rst
#	packages/schema/setup.cfg
#	packages/selenium/HISTORY.rst
#	packages/selenium/setup.cfg
#	packages/test_api/HISTORY.rst
#	packages/test_api/setup.cfg
#	packages/test_base/HISTORY.rst
#	packages/test_base/setup.cfg
#	packages/test_driver/HISTORY.rst
#	packages/test_driver/setup.cfg
#	packages/tool_shed/HISTORY.rst
#	packages/tool_shed/setup.cfg
#	packages/tool_util/HISTORY.rst
#	packages/tool_util/setup.cfg
#	packages/tours/HISTORY.rst
#	packages/tours/setup.cfg
#	packages/util/HISTORY.rst
#	packages/util/setup.cfg
#	packages/web_apps/HISTORY.rst
#	packages/web_apps/setup.cfg
#	packages/web_framework/HISTORY.rst
#	packages/web_framework/setup.cfg
#	packages/web_stack/HISTORY.rst
#	packages/web_stack/setup.cfg
 2025-02-28 12:39:11 +01:00
Matthias Bernt 5547ad5db9 Start work on 24.2.2.dev0 2025-02-28 12:39:06 +01:00
Matthias Bernt 8ff7c9b1b8 Create version 24.2.1 2025-02-28 12:39:03 +01:00
John Davis 4f8244bc10 Merge branch 'release_24.2' into dev 2025-02-11 21:03:18 -05:00
John Davis b56638b9d6 Start work on 24.2.1.dev0 2025-02-11 20:41:00 -05:00
John Davis 490257d237 Create version 24.2.0 
This is the final version 24.2.0.
It contains the content generated by the release script, minus the
duplicate content (which resulted from the existing 24.2.0 changelogs
that had been pushed upstream on 2/6/25).
 2025-02-11 20:36:31 -05:00
Nicola Soranzo 829c7459f9 Merge branch 'release_24.2' into dev 2025-02-08 21:14:23 +00:00
Nicola Soranzo 1bc76f0c40 Add Python 3.13 classifier to packages 
Follow-up on https://github.com/galaxyproject/galaxy/pull/18449 .
 2025-02-08 18:58:58 +00:00
John Davis 54f918d09c Fix package versions 2025-02-07 00:53:54 -05:00
John Davis c1934993ef Merge branch 'release_24.2' into dev 
# Conflicts:
#	lib/galaxy/version.py
#	packages/app/HISTORY.rst
#	packages/auth/HISTORY.rst
#	packages/config/HISTORY.rst
#	packages/data/HISTORY.rst
#	packages/files/HISTORY.rst
#	packages/job_execution/HISTORY.rst
#	packages/job_metrics/HISTORY.rst
#	packages/navigation/HISTORY.rst
#	packages/objectstore/HISTORY.rst
#	packages/schema/HISTORY.rst
#	packages/selenium/HISTORY.rst
#	packages/test_api/HISTORY.rst
#	packages/test_base/HISTORY.rst
#	packages/test_driver/HISTORY.rst
#	packages/tool_shed/HISTORY.rst
#	packages/tool_util/HISTORY.rst
#	packages/tours/HISTORY.rst
#	packages/util/HISTORY.rst
#	packages/web_apps/HISTORY.rst
#	packages/web_framework/HISTORY.rst
#	packages/web_stack/HISTORY.rst
 2025-02-06 22:46:18 -05:00
John Davis e3b1795275 Start work on 24.2.1.dev0 2025-02-06 22:46:15 -05:00
John Davis 2bff8f5a9a Create version 24.2.0 2025-02-06 22:46:04 -05:00
Nicola Soranzo 78234720c4 Replace deprecated `__package__ with __name__ 
`__package__` is deprecated since Python 3.13, see
https://docs.python.org/3/reference/datamodel.html#module.__package__

`importlib.resources.files()` can be passed a non-package module
since Python 3.12 (or importlib-resources 5.10.0, see
https://importlib-resources.readthedocs.io/en/latest/history.html#v5-10-0 ),
so we can use `__name__` instead of `__package__`.

Also, I noticed that in lib/galaxy/config/__init__.py we are passing
a directory to `importlib.resources.as_file()`, which is supported
only since Python 3.12 (or importlib-resources 5.9.0).

For the reasons above:
- Update conditional imports in `lib/galaxy/util/resources.py` to
  import from `importlib.resources` only for Python 3.12,
  otherwise from the importlib-resources package.
- Update importlib-resources requirement in galaxy-util package.
- Drop importlib-resources requirement from galaxy-web-apps as it's
  not imported directly from its code any more.
 2024-12-16 15:16:41 +00:00
Matthias Bernt 21f8bc80ad Merge branch 'release_24.2' into dev 2024-12-11 10:48:13 +01:00
Matthias Bernt b5c1637a45 Merge branch 'release_24.1' into release_24.2 
# Conflicts:
#	lib/galaxy/version.py
#	packages/app/HISTORY.rst
#	packages/app/setup.cfg
#	packages/auth/HISTORY.rst
#	packages/auth/setup.cfg
#	packages/config/HISTORY.rst
#	packages/config/setup.cfg
#	packages/data/HISTORY.rst
#	packages/data/setup.cfg
#	packages/files/HISTORY.rst
#	packages/files/setup.cfg
#	packages/job_execution/HISTORY.rst
#	packages/job_execution/setup.cfg
#	packages/job_metrics/HISTORY.rst
#	packages/job_metrics/setup.cfg
#	packages/navigation/HISTORY.rst
#	packages/navigation/setup.cfg
#	packages/objectstore/HISTORY.rst
#	packages/objectstore/setup.cfg
#	packages/schema/HISTORY.rst
#	packages/schema/setup.cfg
#	packages/selenium/HISTORY.rst
#	packages/selenium/setup.cfg
#	packages/test_api/HISTORY.rst
#	packages/test_api/setup.cfg
#	packages/test_base/HISTORY.rst
#	packages/test_base/setup.cfg
#	packages/test_driver/HISTORY.rst
#	packages/test_driver/setup.cfg
#	packages/tool_shed/HISTORY.rst
#	packages/tool_shed/setup.cfg
#	packages/tool_util/HISTORY.rst
#	packages/tool_util/setup.cfg
#	packages/tours/HISTORY.rst
#	packages/tours/setup.cfg
#	packages/util/HISTORY.rst
#	packages/util/setup.cfg
#	packages/web_apps/HISTORY.rst
#	packages/web_apps/setup.cfg
#	packages/web_framework/HISTORY.rst
#	packages/web_framework/setup.cfg
#	packages/web_stack/HISTORY.rst
#	packages/web_stack/setup.cfg
 2024-12-11 10:48:07 +01:00
Matthias Bernt 0f83529907 Start work on 24.1.5.dev0 2024-12-11 10:47:56 +01:00
Matthias Bernt db7395b423 Create version 24.1.4 2024-12-11 10:47:48 +01:00
Nicola Soranzo febd6f9413 Use fissix to replace lib2to3 under Python >=3.13 
Add entries to `sys.modules` so that `future`/`past` can find
lib2to3 modules.
 2024-10-31 12:09:22 +00:00
Nicola Soranzo ac480e7df5 Drop use of deprecated imghdr standard library module 
which has been removed in the upcoming Python 3.13 .
 2024-10-31 12:09:21 +00:00
Nicola Soranzo f0420d70a3 Pin minimum package versions for Python 3.13 support 
Also:
- Cheetah3 package on PyPI has been renamed to CT3 since 3.3.0, see
  https://cheetahtemplate.org/news.html
 2024-10-31 12:09:20 +00:00
Matthias Bernt 3d66d5f8ae Merge branch 'release_24.1' into dev 
# Conflicts:
#	lib/galaxy/version.py
#	packages/app/HISTORY.rst
#	packages/app/setup.cfg
#	packages/auth/HISTORY.rst
#	packages/auth/setup.cfg
#	packages/config/HISTORY.rst
#	packages/config/setup.cfg
#	packages/data/HISTORY.rst
#	packages/data/setup.cfg
#	packages/files/HISTORY.rst
#	packages/files/setup.cfg
#	packages/job_execution/HISTORY.rst
#	packages/job_execution/setup.cfg
#	packages/job_metrics/HISTORY.rst
#	packages/job_metrics/setup.cfg
#	packages/navigation/HISTORY.rst
#	packages/navigation/setup.cfg
#	packages/objectstore/HISTORY.rst
#	packages/objectstore/setup.cfg
#	packages/schema/HISTORY.rst
#	packages/schema/setup.cfg
#	packages/selenium/HISTORY.rst
#	packages/selenium/setup.cfg
#	packages/test_api/HISTORY.rst
#	packages/test_api/setup.cfg
#	packages/test_base/HISTORY.rst
#	packages/test_base/setup.cfg
#	packages/test_driver/HISTORY.rst
#	packages/test_driver/setup.cfg
#	packages/tool_shed/HISTORY.rst
#	packages/tool_shed/setup.cfg
#	packages/tool_util/HISTORY.rst
#	packages/tool_util/setup.cfg
#	packages/tours/HISTORY.rst
#	packages/tours/setup.cfg
#	packages/util/HISTORY.rst
#	packages/util/setup.cfg
#	packages/web_apps/HISTORY.rst
#	packages/web_apps/setup.cfg
#	packages/web_framework/HISTORY.rst
#	packages/web_framework/setup.cfg
#	packages/web_stack/HISTORY.rst
#	packages/web_stack/setup.cfg
 2024-10-25 12:51:19 +02:00
Matthias Bernt 17056521bd Start work on 24.1.4.dev0 2024-10-25 12:51:08 +02:00
Matthias Bernt 71f5048e52 Create version 24.1.3 2024-10-25 12:51:02 +02:00