Commit Graph
54 Commits
Author SHA1 Message Date
Matthias Bernt db7395b423 Create version 24.1.4 2024-12-11 10:47:48 +01:00
Nate Coraor ccf4353f09 Merge pull request #19052 from natefoo/unpin-data-pkg-social-auth-core
[24.1] Unpin social-auth-core in galaxy-data package
2024-10-25 09:37:38 -04: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
Nate CoraorandNicola Soranzo fb4e1d0e61 Update packages/data/setup.cfg
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
2024-10-24 08:36:46 -04:00
Nate Coraor 7e4e62eac9 Unpin social-auth-core in galaxy-data package 2024-10-23 17:48:14 -04:00
Matthias Bernt c80ce1d431 Start work on 24.1.3.dev0 2024-09-25 15:02:09 +02:00
Matthias Bernt b34611f422 Create version 24.1.2 2024-09-25 15:01:59 +02:00
John Davis 922e2c8f4e Start work on 24.1.2.dev0 2024-07-02 16:02:13 -04:00
John Davis 940a87c8bf Create version 24.1.1 2024-07-02 16:02:06 -04:00
Nicola Soranzo 88d3849960 Pin pydantic to >=2.7.4
Pydantic <2.7.4 is broken on Python>=3.12.4 , see
https://github.com/pydantic/pydantic/issues/9609 .
Fixed upstream in https://github.com/pydantic/pydantic/pull/9639 .

Fix the following traceback in startup test on Python 3.12:

```
Traceback (most recent call last):
  File "/home/runner/work/galaxy/galaxy/galaxy root/.venv/bin/galaxyctl", line 10, in <module>
    sys.exit(galaxyctl())
             ^^^^^^^^^^^
  File "/home/runner/work/galaxy/galaxy/galaxy root/.venv/lib/python3.12/site-packages/click/core.py", line 1157, in __call__
    return self.main(*args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/runner/work/galaxy/galaxy/galaxy root/.venv/lib/python3.12/site-packages/click/core.py", line 1078, in main
    rv = self.invoke(ctx)
         ^^^^^^^^^^^^^^^^
  File "/home/runner/work/galaxy/galaxy/galaxy root/.venv/lib/python3.12/site-packages/click/core.py", line 1682, in invoke
    cmd_name, cmd, args = self.resolve_command(ctx, args)
                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/runner/work/galaxy/galaxy/galaxy root/.venv/lib/python3.12/site-packages/click/core.py", line 1729, in resolve_command
    cmd = self.get_command(ctx, cmd_name)
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/runner/work/galaxy/galaxy/galaxy root/.venv/lib/python3.12/site-packages/gravity/cli.py", line 59, in get_command
    return name_to_command(name)
           ^^^^^^^^^^^^^^^^^^^^^
  File "/home/runner/work/galaxy/galaxy/galaxy root/.venv/lib/python3.12/site-packages/gravity/cli.py", line 45, in name_to_command
    mod = __import__(mod_name, None, None, ["cli"])
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/runner/work/galaxy/galaxy/galaxy root/.venv/lib/python3.12/site-packages/gravity/commands/cmd_stop.py", line 4, in <module>
    from gravity import process_manager
  File "/home/runner/work/galaxy/galaxy/galaxy root/.venv/lib/python3.12/site-packages/gravity/process_manager/__init__.py", line 14, in <module>
    from gravity.config_manager import ConfigManager
  File "/home/runner/work/galaxy/galaxy/galaxy root/.venv/lib/python3.12/site-packages/gravity/config_manager.py", line 18, in <module>
    from gravity.state import ConfigFile, service_for_service_type
  File "/home/runner/work/galaxy/galaxy/galaxy root/.venv/lib/python3.12/site-packages/gravity/state.py", line 42, in <module>
    class ConfigFile(BaseModel):
  File "/home/runner/work/galaxy/galaxy/galaxy root/.venv/lib/python3.12/site-packages/pydantic/v1/main.py", line 286, in __new__
    cls.__try_update_forward_refs__()
  File "/home/runner/work/galaxy/galaxy/galaxy root/.venv/lib/python3.12/site-packages/pydantic/v1/main.py", line 807, in __try_update_forward_refs__
    update_model_forward_refs(cls, cls.__fields__.values(), cls.__config__.json_encoders, localns, (NameError,))
  File "/home/runner/work/galaxy/galaxy/galaxy root/.venv/lib/python3.12/site-packages/pydantic/v1/typing.py", line 554, in update_model_forward_refs
    update_field_forward_refs(f, globalns=globalns, localns=localns)
  File "/home/runner/work/galaxy/galaxy/galaxy root/.venv/lib/python3.12/site-packages/pydantic/v1/typing.py", line 520, in update_field_forward_refs
    field.type_ = evaluate_forwardref(field.type_, globalns, localns or None)
                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/runner/work/galaxy/galaxy/galaxy root/.venv/lib/python3.12/site-packages/pydantic/v1/typing.py", line 66, in evaluate_forwardref
    return cast(Any, type_)._evaluate(globalns, localns, set())
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
TypeError: ForwardRef._evaluate() missing 1 required keyword-only argument: 'recursive_guard'
```

Example: https://github.com/galaxyproject/galaxy/actions/runs/9581802216/job/26419972297
2024-06-19 19:30:46 +01:00
John Davis 2d9f78f4d3 Add script 2024-05-02 14:12:35 -04:00
Nicola Soranzo dcb6f061f6 Don't install Galaxy packages in editable mode when testing them
When enabling the `warn_unused_ignores = True` option of mypy, this
was making the `test_galaxy_packages` tests fail with:

```
mypy .
Traceback (most recent call last):
  File "/tmp/gxpkgtestenvu3fgDr/bin/mypy", line 8, in <module>
    sys.exit(console_entry())
  File "/tmp/gxpkgtestenvu3fgDr/lib/python3.10/site-packages/mypy/__main__.py", line 15, in console_entry
    main()
  File "mypy/main.py", line 100, in main
  File "mypy/main.py", line 182, in run_build
  File "mypy/build.py", line 192, in build
  File "mypy/build.py", line 266, in _build
  File "mypy/build.py", line 2942, in dispatch
  File "mypy/build.py", line 3333, in process_graph
  File "mypy/build.py", line 3414, in process_fresh_modules
  File "mypy/build.py", line 2110, in fix_cross_refs
  File "mypy/fixup.py", line 52, in fixup_module
  File "mypy/fixup.py", line 127, in visit_symbol_table
  File "mypy/lookup.py", line 49, in lookup_fully_qualified
AssertionError: Cannot find component 'util' for 'galaxy.util'
make: *** [Makefile:96: mypy] Error 1
```

Moreover, installing packages in editable mode was hiding some issues
with how files from other packages were accessed.
2024-04-16 01:12:57 +01:00
John Davis fa344f7b4e Upgrade SQLAlchemy to 2.0
This conflicts with dependency requirements for sqlalchemy-graphene
(used only in toolshed, new WIP client)
2024-04-02 10:08:52 -04:00
Nicola Soranzo 1a3edae577 Add missing package requirements 2024-02-29 18:22:42 +00:00
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 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 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
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
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
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 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 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 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
mvdbeek 414abff510 Start work on 23.0.3.dev0 2023-06-13 17:58:19 +02:00
mvdbeek a7f0a365be Create version 23.0.2 2023-06-13 17:58:13 +02:00
Matthias Bernt a5f75e7ead Merge branch 'release_23.0' into dev 2023-06-08 15:54:42 +02:00
Matthias Bernt aa9cc5b9e8 Start work on 23.1.dev0 2023-06-08 15:54:32 +02:00
Matthias Bernt f722e122f7 Create version 23.0.1 2023-06-08 15:54:28 +02:00
Yakubov, Sergey c468a56655 Merge branch 'dev' into oidc_tokens 2023-05-11 13:49:05 -04:00
Greg Watson a83017a506 Add dependency to data package. 2023-05-04 20:48:15 -04:00
Yakubov, Sergey 15051d41d0 add msal package dependency (for auth via azure ad) 2023-02-02 10:03:38 -05:00
Nicola Soranzo 4ca163b9ca Add support for Python 3.11
- Update Python dependencies that didn't have a cp311 wheel: h5py and
  psycopg2-binary.
- For packages for which there is no recent version that works on all
  Python versions supported by Galaxy (numpy and scipy), replace old
  requirement with multiple Python-version-specific requirements.
2023-02-02 01:18:25 +00:00
Nicola Soranzo a850a47419 Update pysam depedency to 0.20.0
Fix `pysam.index()` calls which now use samtools 1.16 where
`samtools index input output` doesn't work any more if `output` is the path
of an already existing file, but `samtools index -o output input` works
fine.

Also:
- Pre-create the (empty) index file for mock test datasets as a unit test
  reproducer of the above issue.
- Fix `test_cram` unit test that wasn't checking the return value of
  `CRAM.set_index_file()`, which was in fact returning False because
  `test-data/2.cram` was not sorted (updated now).
2023-01-01 03:37:53 +00:00
Nicola Soranzo ee7d51f2f5 Merge branch 'release_22.05' into dev 2022-12-09 11:36:00 +00:00
Nicola Soranzo 1eceea2a45 Add/remove/pin/unpin Python requirements 2022-12-09 02:01:26 +00:00
Nicola Soranzo f5deb24dbb Use dnspython to check specifically for an "MX" DNS record
when validating the domain name of the email address for a new user.

Fix https://github.com/galaxyproject/galaxy/issues/14829 .
2022-11-03 12:08:35 +01:00
Nicola Soranzo 5c43d2961f Use dnspython to check specifically for an "MX" DNS record
when validating the domain name of the email address for a new user.

Fix https://github.com/galaxyproject/galaxy/issues/14829 .
2022-10-27 11:17:14 +01:00
davelopezandNicola Soranzo 5dc7dae7c1 Use pydantic[email] instead of email-validator
Co-authored-by: Nicola Soranzo <nicola.soranzo@earlham.ac.uk>
2022-10-14 12:20:24 +02:00
John Chilton 61b9e57c7f Implement Workflow Invocation -> BCO export. 2022-10-14 12:20:24 +02:00