Skip to content

Commit

Permalink
Fix packages' dependencies and MANIFEST.in files
Browse files Browse the repository at this point in the history
Also:
- Add missing `graphene` and `graphql-core` dependencies to
  `pyproject.toml` (already installed as other dependencies' deps,
  but explicitly imported by ToolShed code).
- Move `test_tool_validation.py` unit tests to the galaxy-tool-shed
  package.
  • Loading branch information
nsoranzo committed Jun 2, 2024
1 parent b2076ee commit 1174bbe
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 8 deletions.
2 changes: 0 additions & 2 deletions packages/test_driver/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ install_requires =
galaxy-util
galaxy-web-apps
pytest
graphene-sqlalchemy==3.0.0rc1 # these are only needed by tool shed - which we've split out but the test driver loads
starlette-graphene3
packages = find:
python_requires = >=3.8

Expand Down
1 change: 1 addition & 0 deletions packages/tool_shed/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
include *.rst *.txt LICENSE */py.typed
graft tool_shed/webapp/templates/
25 changes: 25 additions & 0 deletions packages/tool_shed/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,33 @@ version = 23.2.dev0
[options]
include_package_data = True
install_requires =
galaxy-app
galaxy-auth
galaxy-config
galaxy-data
galaxy-util
galaxy-web-framework
galaxy-web-stack
galaxy-web-apps
a2wsgi
alembic
fastapi>=0.101.0
graphene
graphene-sqlalchemy>=3.0.0rc1
graphql-core
Mako
MarkupSafe
mercurial
Paste
pydantic>=2,!=2.6.0,!=2.6.1
Routes
SQLAlchemy>=2.0,<2.1
starlette
starlette-context
starlette-graphene3
typing-extensions
WebOb
Whoosh
packages = find:
python_requires = >=3.8

Expand Down
2 changes: 0 additions & 2 deletions packages/web_apps/MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,3 @@ prune galaxy/webapps/base/static/plugins/
exclude galaxy/webapps/base/static/style/base.css
exclude galaxy/webapps/base/static/welcome.html
graft galaxy/webapps/base/templates/
include tool_shed/webapp/model/migrate/migrate.cfg
graft tool_shed/webapp/templates/

This file was deleted.

2 changes: 0 additions & 2 deletions packages/web_apps/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ install_requires =
importlib-resources;python_version<'3.9'
Mako
MarkupSafe
mercurial
Paste
pydantic>=2,!=2.6.0,!=2.6.1
PyJWT
Expand All @@ -67,7 +66,6 @@ install_requires =
uvicorn
uvloop
WebOb
Whoosh
packages = find:
python_requires = >=3.8

Expand Down
4 changes: 3 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ fastapi-slim = ">=0.111.0"
fs = "*"
future = ">=1.0.0" # Python 3.12 support
galaxy_sequence_utils = "*"
graphene-sqlalchemy = "3.0.0rc1" # need a beta release to be compat. with starlette plugin
graphene = "*"
graphene-sqlalchemy = ">=3.0.0rc1" # need a beta release to be compat. with starlette plugin
graphql-core = "*"
gravity = ">=1.0.4"
gunicorn = "*"
gxformat2 = "*"
Expand Down
File renamed without changes.

0 comments on commit 1174bbe

Please sign in to comment.