opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
73,945 Commits 69 Branches 243 Tags
b7ca5258a3b78ad59cd6b07e19c19191df4be492
Commit Graph
189 Commits
Author SHA1 Message Date
Nicola Soranzo f9384bb0df Disallow pydantic 2.6.0 and 2.6.1 
xref: https://github.com/pydantic/pydantic/issues/8760

Fix the following error when testing with mypy:

```
$ tox -e mypy
Deferral trace:
    cwltool.utils:62
    cwltool.utils:-1
    ...
    galaxy.model:666
    galaxy.model:666
    galaxy.model:666
    galaxy.model:666
lib/galaxy/model/__init__.py: error: INTERNAL ERROR: maximum semantic analysis
iteration count reached
Found 1 error in 1 file (errors prevented further checking)
```
 2024-02-14 00:57:47 +00:00
mvdbeek b278d8a2aa Merge branch 'release_23.2' into dev 2024-02-08 11:35:49 +01:00
John Davis 019c49594f Fix formatting around new version in HISTORY.rst 2024-02-02 10:12:34 -05:00
John Davis ac15c87379 Update package versions to 23.2.dev0 
Update setup.cfg, HISTORY.rst.
Make all dev package versions consistent.
 2024-02-01 22:50:21 -05:00
John Davis 121e38d570 Drop empty bullet points from package HISTORY.rst files 2024-02-01 16:44:49 -05:00
John Davis 568480f923 Merge branch 'release_23.2' into dev_merge_23.2 2024-01-24 16:28:01 +00:00
mvdbeek 7e9c02b75c Use python-isal for fast zip deflate compression in rocrate export 2024-01-23 11:16:26 +01:00
Ubuntu 6860c9a0fb Add support for Python 3.12 2024-01-21 11:57:59 +00:00
mvdbeek e63c3ba9d4 Update fastapi and pydantic dependencies 2024-01-08 11:33:34 +01:00
mvdbeek 5afce686b0 Merge branch 'release_23.2' into dev 2024-01-04 16:15:31 +01:00
mvdbeek 7fc0b15be7 Merge branch 'release_23.1' into release_23.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/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_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-01-04 16:15:26 +01:00
mvdbeek 20e560c2e2 Start work on 23.1.5.dev0 2024-01-04 16:15:18 +01:00
mvdbeek 5dccc48db7 Create version 23.1.4 2024-01-04 16:15:11 +01:00
mvdbeek ca6f9b3586 Merge branch 'release_23.2' into dev 2023-12-01 11:54:53 +01:00
mvdbeek 87c98787a4 Merge branch 'release_23.1' into release_23.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/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_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
 2023-12-01 11:54:51 +01:00
mvdbeek 316f8c1a2c Start work on 23.1.4.dev0 2023-12-01 11:54:46 +01:00
mvdbeek d7cc988979 Create version 23.1.3 2023-12-01 11:54:43 +01:00
mvdbeek dbe1e7464f Merge branch 'release_23.2' into dev 2023-11-29 19:20:17 +01:00
mvdbeek 64a813e763 Merge branch 'release_23.1' into release_23.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/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_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
 2023-11-29 19:20:15 +01:00
mvdbeek cb1bb4a6ab Start work on 23.1.3.dev0 2023-11-29 19:20:10 +01:00
mvdbeek 3642185621 Create version 23.1.2 2023-11-29 19:20:07 +01:00
Michael R. Crusoe 8bb13b39a8 packages: synchronize pins with pyproject.toml 2023-11-26 18:34:12 +00:00
Michael R. Crusoe c00967cca4 Python 3.8 as new minimum version 
Fixes: https://github.com/galaxyproject/galaxy/issues/16394

Also upgrade code to Python 3.8 syntax with:

```
ack --type=python -f | grep -v '^lib/galaxy/schema/bco/\|^lib/galaxy/schema/drs/\|lib/tool_shed_client/schema/trs.*.py\|^tools/\|^.venv/\|^.tox/' | grep -v '^lib/galaxy/files/sources/\|^lib/galaxy/job_metrics/\|^lib/galaxy/objectstore/\|^lib/galaxy/tool_util/\|^lib/galaxy/util/' | xargs pyupgrade --py38-plus
```
 2023-11-26 18:34:09 +00:00
mvdbeek 0d74680762 Merge branch 'release_23.1' 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/selenium/HISTORY.rst
#	packages/test_api/HISTORY.rst
#	packages/test_base/HISTORY.rst
#	packages/test_driver/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
 2023-10-23 21:35:31 +02:00
mvdbeek 3dd88a4357 Start work on 23.1.2.dev0 2023-10-23 21:35:28 +02:00
mvdbeek e77b17df06 Create version 23.1.1 2023-10-23 21:35:24 +02:00
mvdbeek 5e2d094f62 Merge branch 'release_23.1' into dev 
# 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/navigation/HISTORY.rst
#	packages/objectstore/HISTORY.rst
#	packages/selenium/HISTORY.rst
#	packages/test_api/HISTORY.rst
#	packages/test_base/HISTORY.rst
#	packages/test_driver/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
 2023-10-23 18:01:54 +02:00
mvdbeek 5aeff97113 Merge branch 'release_23.0' into release_23.1 
# 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/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_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
 2023-10-23 18:01:52 +02:00
mvdbeek e88541e645 Start work on 23.0.7.dev0 2023-10-23 18:01:40 +02:00
mvdbeek bce8be24fe Create version 23.0.6 2023-10-23 18:01:36 +02:00
John Chilton 59cff45fb1 Decompose tool shed + schema package. 
This commit creates two new packages - below a description of these packages and why they are being created.

galaxy-schema: This package contains the pydantic models that power the API. The purpose of packaging them is to ensure they can be reused by clients with minimal external dependencies. Reusing the schema in client code would very quickly provide rapid documentation and validation and static checking for Python clients using the Galaxy API.

galaxy-tool-shed: This package contains the tool shed server code. This has been a long term project to allow the tool shed to be spun out but maintain real galaxy dependencies and maintain testing. More discussions around this project can be found as part of https://github.com/galaxyproject/galaxy/pull/8830.
 2023-09-26 13:46:55 -04:00
mvdbeek 521405136a Merge branch 'release_23.1' into dev 2023-07-29 12:28:41 +02:00
mvdbeek c314336705 Merge branch 'release_23.0' into release_23.1 
# 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/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_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
 2023-07-29 12:28:39 +02:00
mvdbeek 2fbbfd8417 Start work on 23.0.6.dev0 2023-07-29 12:28:35 +02:00
mvdbeek af730bc6b5 Create version 23.0.5 2023-07-29 12:28:32 +02:00
Nicola Soranzo 45e020e760 Merge branch 'release_23.1' into dev 2023-07-24 17:04:54 +01:00
Nicola Soranzo 0a73e1c512 Merge branch 'release_23.0' into release_23.1 2023-07-24 15:16:11 +01:00
Nicola Soranzo 741ecf6f44 Pin pysam to >=0.21.0 
This reverts commit 353c08cbb9 .

pysam 0.20.0 doesn't build for Python 3.11 on macOS, so we need to
temporarily add the unnecessary Cython runtime dependency that
pysam 0.21 brings in.
 2023-07-21 00:58:33 +01:00
Nate Coraor 8fee25f084 Merge branch 'release_23.1' into dev 2023-06-30 17:14:03 -04:00
Nate Coraor ea07ddba98 Merge branch 'release_23.0' into release_23.1 
# 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/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_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
 2023-06-30 17:14:03 -04:00
Nate Coraor 25b52a97f7 Start work on 23.0.5.dev0 2023-06-30 17:14:00 -04:00
Nate Coraor 03d9eb63b8 Create version 23.0.4 2023-06-30 17:13:57 -04:00
Nate Coraor c18ed28896 Merge remote-tracking branch 'upstream/release_23.1' into dev 2023-06-30 15:57:32 -04:00
Nate Coraor 2ca678482f Merge remote-tracking branch 'upstream/release_23.0' into release_23.1 2023-06-30 15:56:50 -04:00
Nate Coraor ab1e0485d7 Pin pydantic in packages to <2 2023-06-30 14:51:18 -04:00
mvdbeek bb65b07584 Merge branch 'release_23.1' into dev 2023-06-26 09:32:44 +02:00
mvdbeek 0b1a41bd86 Merge branch 'release_23.0' into release_23.1 
# 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/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_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
 2023-06-26 09:32:42 +02:00
mvdbeek 1ef440e92c Start work on 23.0.4.dev0 2023-06-26 09:32:37 +02:00
mvdbeek b4adbb4ec5 Create version 23.0.3 2023-06-26 09:32:32 +02:00
Marius van den Beek acc7136045 Merge pull request #15300 from SergeyYakubov/oidc_tokens 
OIDC tokens
 2023-06-21 19:39:19 +02:00