Commit Graph
215 Commits
Author SHA1 Message Date
Nicola Soranzo 7dc9be43bf Explicitly add playwright to dev dependencies 2023-10-20 11:14:28 +01:00
John Chilton 7dc0b1378b WIP: modern tool shed frontend 2023-09-27 14:30:42 -04:00
John Chilton 06667470b6 Modernized framework to replace tool shed functional tests.
Goals:

- Replace direct database access with pydantic typed API requests.
- Replace Twill with playwright.
- Eliminate access to the Galaxy UI in the tests - the tests should assume API access from the installing party.

pytest-playwright requires small bits of #13909.

This is a worthy project that could let us remove a bunch of deprecated stuff from the Galaxy admin controllers and a bunch of mako stuff that is unused and could be used to test PRs like #14609 (which prompted me to do this) but I'm anxious about growing emotionally attached to code I want to remove and I'm worried about losing track of which helpers are required for Planemo/Emphemeris/Galaxy and which helpers are just being used to test the tool shed.
2023-09-26 13:46:59 -04:00
John Chilton dd58bfcfe6 Implement the GA4GH TRS API in the new tool shed. 2023-09-26 13:46:59 -04:00
John Chilton 8852f0733b Progress toward exercising less of the tool shed upload API.
So we can kill it.
2023-09-26 13:46:56 -04:00
Nicola Soranzo 585e07c42b Pin sphinx-rtd-theme to <2 to revert update to pre-release version
Due to a bug in poetry ( https://github.com/python-poetry/poetry/issues/8194 ),
the 2.0.0rc2 pre-release of sphinx-rtd-theme was selected to allow
the update of docutils to 0.19, instead of sticking with the current
version for both.
This breaks the doc build with this error:

```
writing output... [  0%] admin/apache

Theme error:
An error happened in rendering the page admin/apache.
Reason: AttributeError("'str' object has no attribute 'attributes'")
```
2023-09-20 09:32:47 +01:00
Nicola Soranzo 39e5c11d54 Prevent downgrade of isa-rwval 2023-09-20 00:58:42 +01:00
mvdbeek 0f2ef4dc0c Merge branch 'release_23.1' into dev 2023-09-14 13:43:50 +02:00
mvdbeek 63442d1d72 Fix regex validation for global inline flags
Fixes https://github.com/galaxyproject/galaxy/issues/16676
2023-09-13 12:00:57 +02:00
Dannon 9d7bc54a87 Merge pull request #16636 from mvdbeek/replace_pkg_resource_parsing
Switch out conditional requirement parser
2023-09-06 11:09:56 +10:00
Nicola Soranzo d93cddd5af Use poetry to generate the pinned typecheck requirements 2023-09-02 21:59:32 +01:00
Nicola Soranzo bd2e8a4f13 Explicitly add PyPI as default package source for poetry
Fix the following warning:

Warning: In a future version of Poetry, PyPI will be disabled
automatically if at least one custom primary source is configured.
In order to avoid a breaking change and make your pyproject.toml
forward compatible, add PyPI explicitly via 'poetry source add pypi'.
By the way, this has the advantage that you can set the priority of
PyPI as with any other source.
2023-09-02 21:59:31 +01:00
mvdbeek c1fab91e3a Switch out conditional requirement parser
Fixes
```
Traceback (most recent call last):
  File "/storage/srv/galaxy/server/.venv/lib64/python3.9/site-packages/pkg_resources/_vendor/packaging/requirements.py", line 35, in __init__
    parsed = _parse_requirement(requirement_string)
  File "/storage/srv/galaxy/server/.venv/lib64/python3.9/site-packages/pkg_resources/_vendor/packaging/_parser.py", line 64, in parse_requirement
    return _parse_requirement(Tokenizer(source, rules=DEFAULT_RULES))
  File "/storage/srv/galaxy/server/.venv/lib64/python3.9/site-packages/pkg_resources/_vendor/packaging/_parser.py", line 73, in _parse_requirement
    name_token = tokenizer.expect(
  File "/storage/srv/galaxy/server/.venv/lib64/python3.9/site-packages/pkg_resources/_vendor/packaging/_tokenizer.py", line 140, in expect
    raise self.raise_syntax_error(f"Expected {expected}")
  File "/storage/srv/galaxy/server/.venv/lib64/python3.9/site-packages/pkg_resources/_vendor/packaging/_tokenizer.py", line 165, in raise_syntax_error
    raise ParserSyntaxError(
pkg_resources.extern.packaging._tokenizer.ParserSyntaxError: Expected package name at the start of dependency specifier
    "git+https://github.com/jakobmerljak/pyarcrest.git@dev"
    ^

The above exception was the direct cause of the following exception:

Traceback (most recent call last):
  File "<string>", line 1, in <module>
  File "/storage/srv/galaxy/server/lib/galaxy/dependencies/__init__.py", line 312, in optional
    conditional = ConditionalDependencies(config_file)
  File "/storage/srv/galaxy/server/lib/galaxy/dependencies/__init__.py", line 45, in __init__
    self.get_conditional_requirements()
  File "/storage/srv/galaxy/server/lib/galaxy/dependencies/__init__.py", line 176, in get_conditional_requirements
    for req in pkg_resources.parse_requirements(open(crfile).readlines()):
  File "/storage/srv/galaxy/server/.venv/lib64/python3.9/site-packages/pkg_resources/__init__.py", line 3174, in __init__
    super(Requirement, self).__init__(requirement_string)
  File "/storage/srv/galaxy/server/.venv/lib64/python3.9/site-packages/pkg_resources/_vendor/packaging/requirements.py", line 37, in __init__
    raise InvalidRequirement(str(e)) from e
pkg_resources.extern.packaging.requirements.InvalidRequirement: Expected package name at the start of dependency specifier
    "git+https://github.com/jakobmerljak/pyarcrest.git@dev"
    ^

```

for advanced package specifiers that might be used during development.
2023-09-01 13:35:21 +02:00
Nicola Soranzo f030fe1476 Pin pyparsing to <3.1 for matplotlib
This was not inferred automatically because Poetry is run under
Python 3.7 and we have a different matplotlib requirement under
Python 3.8 .
2023-07-12 19:34:07 +01: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 492b2ee64b Pin fastapi to <0.99 2023-06-30 15:20:22 -04:00
Nate Coraor 10fe1c885f Also pin pydantic in pyproject.toml 2023-06-30 14:55:58 -04: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 bb969c7505 Replace bootstrap_history.py with galaxy-release-util 2023-06-13 20:42:35 +02:00
mvdbeek 67c7181a6a Merge branch 'release_23.0' into dev 2023-06-13 17:30:22 +02:00
mvdbeek 787b8040c8 Use galaxy-release-util to upload python packages 2023-06-13 15:49:37 +02:00
mvdbeek 01a1755027 Merge branch 'release_23.0' into dev 2023-06-08 18:36:41 +02:00
mvdbeek 547512123b Add build and twine to dev dependencies 2023-06-08 17:34:24 +02:00
Nicola Soranzo 87e66de706 Move axe-selenium-python to dev dependencies
Follow-up on https://github.com/galaxyproject/galaxy/pull/16122 and
https://github.com/galaxyproject/galaxy/pull/16153 .

Run `make update-dependencies' .
2023-05-30 18:38:36 +01:00
John Chilton f9e00f597a axe testing 2023-05-24 12:54:25 -04:00
Nicola Soranzo f82ea20ccb Replace `keep-runtime-typing` ruff config option
which was removed in ruff 0.0.269 .
2023-05-21 18:50:23 +01:00
John Chilton fef73a4f2e Merge pull request #14906 from jmchilton/reset_metadata_testing
Fix resetting metadata on many repositories at once via the shed API
2023-05-18 09:55:07 -04:00
John Chilton 8cc7d3c5f3 Merge pull request #16082 from nsoranzo/osx_startup_py3.11
Fix and test startup with Python 3.11 on macOS
2023-05-15 09:07:14 -04:00
Nicola Soranzo ab99721900 Merge branch 'release_23.0' into dev 2023-05-14 14:40:28 +01:00
John Chilton 748abc3710 reset repository metadata testing 2023-05-12 13:21:15 -04:00
Nicola Soranzo 87ab4b5729 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-05-12 17:42:22 +01:00
Yakubov, Sergey c468a56655 Merge branch 'dev' into oidc_tokens 2023-05-11 13:49:05 -04:00
Marius van den Beek 58b3a9d482 Merge pull request #15942 from galaxybot/dev_auto_update_dependencies
Update Python dependencies
2023-05-08 11:35:31 +02:00
Nicola Soranzo 353c08cbb9 Disallow pysam 0.21.0
which mistakenly added Cython to its runtime dependencies.
Will be fixed by https://github.com/pysam-developers/pysam/pull/1186 .
2023-05-07 22:40:57 +01:00
Nicola Soranzo c11fb070a7 Vendorise `packaging.versions.LegacyVersion`
Fix https://github.com/galaxyproject/galaxy/issues/15898 .
2023-05-07 17:30:59 +01:00
Greg Watson 8dc38e6e4c Add support for visualizing HDF5 datasets. This contribution is split into two parts: the visualization plugin and backend changes. The client code integrates the h5web visualizer into Galaxy (https://h5web.panosc.eu). The backend changes add the ability to access the contents of a dataset without needing to read the whole dataset, which is essential for large files. It is based on the h5grove API (https://github.com/silx-kit/h5grove). 2023-05-04 20:48:15 -04:00
mvdbeek d2271e5e04 Replace httpbin service with pytest-httpserver
httpbin isn't doing too well, this should be more robust.
2023-05-04 17:38:19 +02:00
Yakubov, Sergey 6d8f608ba9 Merge branch 'dev' into oidc_tokens 2023-05-03 15:59:08 -04:00
Nicola Soranzo 378bb29f39 Unpin black and isort dev requirements
Currently nothing will change because:
- Newer black requires packaging>=22.0
- Newer isort requires Python>=3.8
2023-05-03 17:57:07 +01:00
John Davis a3e789c1a7 Drop alembic_util 2023-04-13 18:54:32 -04:00
Yakubov, Sergey d40fb56b98 Merge branch 'dev' into oidc_tokens 2023-03-27 10:41:56 -04:00
Nicola Soranzo 0f70c68fd9 Migrate to MyST-Parser for Markdown docs
replacing deprecated recommonmark.

Fix https://github.com/galaxyproject/galaxy/issues/13005 .

Also:
- Drop not very useful ``doc/source/dev/file_upload.md`` .
- Small doc and link fixes.
2023-03-27 15:01:27 +01:00
John ChiltonandNicola Soranzo a8f3f00374 Apply suggestions from code review
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
2023-03-10 10:05:40 -05:00
John Chilton 44e8429201 Does this fix kombu? 2023-03-10 10:05:38 -05:00
John ChiltonandNicola Soranzo 2f2dae29f7 Apply suggestions from code review
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
2023-03-08 13:06:11 -05:00
John Chilton a0a2690670 Does this fix kombu? 2023-03-07 15:46:56 -05:00
mvdbeek 756d047e1c Merge branch 'release_23.0' into dev 2023-03-06 18:08:05 +01:00
mvdbeek 026b906616 Merge branch 'release_22.05' into release_23.0 2023-03-03 16:40:49 +01:00
mvdbeek b856b35d4f Add conda-package-streaming to pyproject.toml 2023-03-03 13:13:27 +01:00
Nicola Soranzo 35d8f6a04a Unpin Beaker requirement
This was initially pinned in https://github.com/galaxyproject/galaxy/pull/11192
but I cannot recall why exactly.
2023-03-01 12:29:28 +00:00