229 Commits
Author SHA1 Message Date
mvdbeek aa0f6246b8 Merge branch 'release_26.2' into dev 2026-11-19 06:09:44 +01:00
Nicola Soranzo b86e88720c Drop support for Python 3.10
Python 3.10 reached its end-of-life in October 2026.

Also:
- Run `make pyupgrade` and `make format`
- Fix new ruff and mypy errors
- Run `uv lock` and `sh lib/galaxy/dependencies/update.sh --export-only`
- Run `make update-client-api-schema`
2026-11-17 21:57:50 +00:00
mvdbeek c93175dc98 Merge branch 'release_26.2' into dev 2026-10-25 23:29:17 +01:00
mvdbeek 849c2573cb Merge branch 'release_26.1' into release_26.2
# Conflicts:
#	client/package.json
#	lib/galaxy/version/__init__.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/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/test_selenium/HISTORY.rst
#	packages/test_selenium/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
2026-10-25 23:29:14 +01:00
mvdbeek cf168b20f6 Start work on 26.1.3.dev0 2026-10-25 23:29:09 +01:00
mvdbeek 391641a4e1 Create version 26.1.2 2026-10-25 23:29:09 +01:00
mvdbeek a12d41943d Merge branch 'release_26.2' into dev 2026-10-25 23:28:15 +01:00
mvdbeek a63173cffa Merge branch 'release_26.1' into release_26.2 2026-10-25 23:28:12 +01:00
mvdbeek 369379c164 Merge branch 'release_26.0' into release_26.1
# Conflicts:
#	client/package.json
#	lib/galaxy/version/__init__.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/test_selenium/HISTORY.rst
#	packages/test_selenium/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
2026-10-25 23:28:08 +01:00
mvdbeek c4b1812bd6 Start work on 26.0.3.dev0 2026-10-25 23:28:04 +01:00
mvdbeek cef25a15a6 Create version 26.0.2 2026-10-25 23:28:04 +01:00
mvdbeek a02b7a1e41 Merge branch 'release_26.2' into dev 2026-10-25 23:26:44 +01:00
mvdbeek c453b526ff Merge branch 'release_26.1' into release_26.2 2026-10-25 23:26:41 +01:00
mvdbeek 2f197a62fe Merge branch 'release_26.0' into release_26.1
# Conflicts:
#	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_shed_schema/HISTORY.rst
#	packages/tool_util/HISTORY.rst
#	packages/tool_util_models/HISTORY.rst
#	packages/tours/HISTORY.rst
#	packages/util/HISTORY.rst
#	packages/web_apps/HISTORY.rst
#	packages/web_client/HISTORY.rst
#	packages/web_framework/HISTORY.rst
#	packages/web_stack/HISTORY.rst
2026-10-25 23:26:37 +01:00
mvdbeek 0b46778d6c Merge branch 'release_25.1' into release_26.0
# 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
2026-10-25 23:26:34 +01:00
mvdbeek bd2cb474a8 Start work on 25.1.4.dev0 2026-10-25 23:26:30 +01:00
mvdbeek 67d98b2b6b Create version 25.1.3 2026-10-25 23:26:30 +01:00
mvdbeek a75c6f864e Set package versions to 27.0.dev0 2026-10-14 11:42:14 +02:00
mvdbeek 582dc2945a Set package versions to 26.2.0rc1 2026-10-14 11:42:14 +02:00
mvdbeek 4906c84e2e Merge branch 'release_26.1' into dev
# Conflicts:
#	client/package.json
#	lib/galaxy/version/__init__.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/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/test_selenium/HISTORY.rst
#	packages/test_selenium/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
2026-08-04 14:47:21 +02:00
mvdbeek 89f7f1f798 Start work on 26.1.2.dev0 2026-08-04 14:47:13 +02:00
mvdbeek 094145bc80 Create version 26.1.1 2026-08-04 14:47:11 +02:00
mvdbeek a97fd0c185 Merge branch 'release_26.1' into dev
# Conflicts:
#	lib/galaxy/version/__init__.py
#	packages/app/setup.cfg
#	packages/auth/setup.cfg
#	packages/config/setup.cfg
#	packages/data/setup.cfg
#	packages/files/setup.cfg
#	packages/job_execution/setup.cfg
#	packages/job_metrics/setup.cfg
#	packages/meta/setup.cfg
#	packages/navigation/setup.cfg
#	packages/objectstore/setup.cfg
#	packages/schema/setup.cfg
#	packages/selenium/setup.cfg
#	packages/test_api/setup.cfg
#	packages/test_base/setup.cfg
#	packages/test_driver/setup.cfg
#	packages/test_selenium/setup.cfg
#	packages/tool_shed/setup.cfg
#	packages/tool_shed_schema/setup.cfg
#	packages/tool_util/setup.cfg
#	packages/tool_util_models/setup.cfg
#	packages/tours/setup.cfg
#	packages/util/setup.cfg
#	packages/web_apps/setup.cfg
#	packages/web_client/setup.cfg
#	packages/web_framework/setup.cfg
#	packages/web_stack/setup.cfg
2026-08-02 20:16:55 +02:00
mvdbeek 115627d926 Start work on 26.1.1.dev0 2026-08-02 20:16:46 +02:00
mvdbeek 88a871b769 Create version 26.1.0 2026-08-02 20:16:41 +02:00
Nicola Soranzo c329529e51 Packages: finish migration from `setup.cfg to pyproject.toml`
Also:
- Drop now unnecessary ``packages/sync_pyprojects.py`` script.
2026-06-08 08:58:40 +01:00
Nicola Soranzo 015ab515a2 Merge branch 'release_26.0' into release_26.1 2026-06-07 23:40:06 +01:00
John Davis b884af499b Move classifiers and keywords from setup.cfg to pyproject.toml
When a [project] table is present in pyproject.toml, setuptools
ignores fields in setup.cfg unless they are listed in the dynamic
array.  This applies to classifiers and keywords: the build was
silently dropping them from the wheel metadata.

Fix: define classifiers and keywords as static values directly in the
[project] section of each package's pyproject.toml, and remove them from
setup.cfg.

Alternate fix: add both to the dynamic list, keeping the definitions in
setup.cfg. However, I think the first is better since that keeps
pyproject.toml as the single source of truth.
2026-06-05 09:32:41 -04:00
John Davis 3e9e1ab6f9 Merge branch 'release_26.0' into release_26.1
# Conflicts:
#	client/package.json
#	lib/galaxy/version/__init__.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/test_selenium/HISTORY.rst
#	packages/test_selenium/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
2026-06-04 23:25:03 -04:00
John Davis 09b9b3da46 Start work on 26.0.2.dev0 2026-06-04 23:24:59 -04:00
John Davis 57b0c3040d Create version 26.0.1 2026-06-04 23:24:54 -04:00
mvdbeekandNicola Soranzo 6b07f5492f [25.1] Backport FastAPI/Starlette upgrade for BadHost (CVE-2026-48710)
Updates the pinned FastAPI/Starlette versions on release_25.1 to match
upstream/dev, closing CVE-2026-48710 ("BadHost"). The vulnerability lets
an attacker inject a path into the HTTP Host header and have
``request.url.path`` reflect that path, bypassing path-based access
control in middleware. Starlette 1.0.1+ rejects Host headers with
invalid characters; we pin starlette==1.1.0 to match dev.

Drops Python 3.9 support, matching upstream/dev (commit eb9fde1dcd).
Starlette dropped 3.9 in 0.50.0, so the BadHost fix (starlette >= 1.0.1)
cannot be installed on 3.9. Bumping the floor to 3.10 is the only way
to ship the security fix; the alternative -- marker-splitting the pins
to keep 3.9 on starlette 0.49.x -- would leave 3.9 users exposed to the
CVE we are trying to close.

Actual exposure on release_25.1 (pre-fix)
-----------------------------------------

Galaxy was running a vulnerable starlette but is **not exploitable for
the headline auth-bypass scenario**. Auth runs through FastAPI
dependencies (``get_user``, ``get_trans``, ``AdminUserRequired``), not
through path-string checks in middleware. ``AccessLoggingMiddleware``
already uses ``scope["path"]``; ``add_galaxy_middleware`` /
``GalaxyCORSMiddleware`` / ``RawContextMiddleware`` /
``SentryAsgiMiddleware`` do not branch on ``request.url.path``.

Lower-severity findings that this upgrade also closes:

- ``lib/galaxy/webapps/base/api.py`` ``get_error_response_for_request``
  picks an error schema with ``"ga4gh"/"drs"/"trs" in
  request.url.path`` -- spoofable Host nudges error payload shape
  (info-disclosure / shape confusion only).
- ``lib/galaxy/webapps/galaxy/api/drs.py`` and
  ``lib/galaxy/webapps/galaxy/services/datasets.py`` derive DRS
  ``service_info`` / ``self_uri`` from ``request.url`` -- spoofable
  Host poisons the advertised DRS identity and client-visible URIs,
  not access.
- ``lib/tool_shed/webapp/api2/tools.py`` -- same shape, TRS service
  info.

Bumping the pin closes the parser flaw at source and downgrades all of
the above to non-issues, so no separate ``request.url.path ->
scope["path"]`` sweep is needed.

Pin bumps (cherry-picks the relevant ranges from PRs #21526, #22206,
#22754):

- fastapi 0.118.0 -> 0.136.3
- starlette 0.48.0 -> 1.1.0
- starlette-context 0.4.0 -> 0.5.1
- python-multipart 0.0.20 -> 0.0.29
- anyio 4.11.0 -> 4.13.0

Required code changes backported from upstream/dev:

- ``lib/galaxy/webapps/openapi/_compat/v2.py``: import
  ``GenerateJsonSchema`` and ``get_flat_models_from_fields`` from
  ``fastapi._compat.v2`` and adopt the new ``get_definitions()``
  implementation for FastAPI 0.128.8+ (PRs #21384, dev commits
  0800c025ce, c8ccc7f44d, b3bfb45884).
- ``lib/galaxy/webapps/openapi/utils.py``: route ``GenerateJsonSchema``
  through ``_compat.v2`` and drop the now-unreachable
  ``get_compat_model_name_map`` fallback (dev commit b3bfb45884).
- ``lib/galaxy/schema/generics.py``: drop ``CustomJsonSchema`` here
  (moved to fast_app.py so it can use the patched ``GenerateJsonSchema``
  from ``_compat.v2``).
- ``lib/galaxy/webapps/galaxy/fast_app.py``: relocate
  ``CustomJsonSchema`` and switch its base to the ``_compat.v2``
  ``GenerateJsonSchema``; replace the @app.middleware("http") X-Frame
  Options handler with a pure ASGI ``XFrameOptionsMiddleware`` class
  (dev commit 67eea395ab) since ``BaseHTTPMiddleware`` semantics
  changed in starlette 1.0.
- ``lib/galaxy/webapps/base/api.py`` and
  ``lib/galaxy/webapps/galaxy/api/datasets.py``: drop the ``method``
  argument of ``FileResponse`` which starlette 1.0 removed (dev commit
  63954cb42e).

Also bumps the minimum FastAPI requirement to ``>=0.133.0`` (first
version compatible with starlette>=1.0.0) and adds an explicit
``starlette>=1.0.1`` floor in ``pyproject.toml`` and the
``packages/web_apps`` / ``packages/tool_shed`` setup.cfg files so
source installs cannot resolve to a vulnerable combo.

Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
2026-05-28 18:56:59 +02:00
Michael R. Crusoe b7f83c8469 python packages: convert to "src" layout
As suggested at https://packaging.python.org/en/latest/guides/packaging-namespace-packages/#native-namespace-packages

Use setuptools-scm to automatically adds all the SCM-managed files to the sdist
instead of manually listing them in packages/*/MANIFEST.in
2026-04-15 15:16:36 +02:00
Michael R. Crusoe dbfcdb8bc9 python packages: convert to pure namespace packages
only directories in `lib/galaxy` & `packages/*/galaxy`
All other files removed or moved to their own module
All references to those files updated, especially galaxy/version.py
2026-04-15 15:16:34 +02:00
Nicola Soranzo 349a5daec1 Merge branch 'release_26.0' into dev 2026-04-10 18:08:40 +01:00
guerler 4211127ac2 Bump dev cycle from 26.0.1.dev0 to 26.0.1.dev1
The 26.0.1.dev0 PyPI packages were already published during the
earlier broken release attempt, so the version string is permanently
burned: PyPI does not allow re-uploading the same version, even for
pre-releases.  Bump the dev counter to .dev1 so the release branch
ends at a version that has not been published yet and future dev
builds from this branch can be uploaded.

This commit only changes the four dev0 version strings introduced by
the previous commit:
  - lib/galaxy/version.py:        VERSION_MINOR = "1.dev0" -> "1.dev1"
  - client/package.json:          "26.0.1.dev0" -> "26.0.1.dev1"
  - packages/*/setup.cfg:         version = 26.0.1.dev0 -> 26.0.1.dev1
  - packages/*/HISTORY.rst:       26.0.1.dev0 header -> 26.0.1.dev1

The pulsar-galaxy-lib>=0.15.0.dev0 dependency pin in
packages/app/setup.cfg and the historical 22.9.0.dev0 changelog
entries in packages/navigation/HISTORY.rst and packages/tours/HISTORY.rst
are deliberately left untouched — they refer to unrelated versions.
2026-04-09 23:59:50 +03:00
guerler 08f930027b Re-apply version bump to 26.0.1.dev0 after v26.0.0 retag
Companion to the previous commit.  After v26.0.0 is retagged onto the
restoration commit and the PyPI publish workflow produces the correct
26.0.0 artifacts, this commit returns the release branch to
26.0.1.dev0 so future development on the 26.0 line continues from a
post-release dev version, matching the state established by
f4478f5d09 ("Start work on 26.0.1.dev0").

This is a fresh commit with the same content as f4478f5d09; it is not
a cherry-pick and does not reuse the original hash or author metadata.

After the v26.0.0 tag has been moved and a successful publish is
verified, the branch HEAD is once again at 26.0.1.dev0 just like
before this two-commit sequence — but now the v26.0.0 tag points at a
commit that actually contains version = 26.0.0.
2026-04-09 23:41:25 +03:00
guerler 854899453b Restore version to 26.0.0 for v26.0.0 retag
The original v26.0.0 tag was retagged from 52e970855b to HEAD because
of bugs in the GitHub Actions release workflow.  Unfortunately HEAD
already contained the post-release version bump from f4478f5d09
("Start work on 26.0.1.dev0"), so PyPI builds from the retagged HEAD
publish wheels labeled 26.0.1.dev0 instead of 26.0.0.

This commit restores the version files to their 26.0.0 state so the
v26.0.0 tag can be moved to point at this commit and the publish
workflow can produce correctly labeled artifacts.

The next commit re-applies the dev0 bump so the release branch ends
back at 26.0.1.dev0 and future development continues normally.

This is purely additive — no history is rewritten and the existing
26.0.1.dev0 commit (f4478f5d09) is left untouched.
2026-04-09 23:40:45 +03:00
guerler 6a23ae0d6e Merge branch 'release_26.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_shed_schema/HISTORY.rst
#	packages/tool_util/HISTORY.rst
#	packages/tool_util_models/HISTORY.rst
#	packages/tours/HISTORY.rst
#	packages/util/HISTORY.rst
#	packages/web_apps/HISTORY.rst
#	packages/web_client/HISTORY.rst
#	packages/web_framework/HISTORY.rst
#	packages/web_stack/HISTORY.rst
2026-04-08 02:01:44 +03:00
guerler f4478f5d09 Start work on 26.0.1.dev0 2026-04-08 02:01:36 +03:00
guerler 52e970855b Create version 26.0.0 2026-04-08 02:01:25 +03:00
mvdbeek 8de15ef52c Merge branch 'release_26.0' into dev 2026-03-09 17:33:09 +01:00
mvdbeek 3124ebcec6 Merge branch 'release_25.1' into release_26.0
# 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
2026-03-09 17:33:06 +01:00
mvdbeek 1134ffb67c Start work on 25.1.3.dev0 2026-03-09 17:33:02 +01:00
mvdbeek 8d2170b52c Create version 25.1.2 2026-03-09 17:32:58 +01:00
mvdbeek 9b03fe65f0 Merge branch 'release_26.0' into dev 2026-03-09 17:27:59 +01:00
Michael R. Crusoe 7f40e45a7f Switch to only MIT license 2026-03-06 19:05:20 +01:00
Nicola Soranzo ce7c321691 Merge pull request #16970 from mr-c/galaxy_mit_license
Switch to only MIT license
2026-02-25 10:52:33 +00:00
Nicola Soranzo 508f6d8135 Disallow gunicorn 25.1.0
The new gunicornc Control Interface breaks workers, see:

https://github.com/benoitc/gunicorn/discussions/3509
https://github.com/galaxyproject/gravity/pull/141
2026-02-23 17:11:50 +00:00
Michael R. Crusoe 4d6519ae77 Switch to only MIT license 2026-02-23 14:35:30 +01:00