Skip to content

Require galaxy-tool-util instead of galaxy-lib #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mvdbeek merged 1 commit into from
Jul 18, 2019
Merged

Require galaxy-tool-util instead of galaxy-lib #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ six>=1.9.0
PyYAML
bioblend>=0.10.0
Jinja2
galaxy-lib>=18.5.7
galaxy-tool-util>=19.9.0.dev5
futures ; python_version < '3'
4 changes: 2 additions & 2 deletions scripts/test_wheel.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ set -e

VERSION=$1

# Ensure working directory is galaxy-lib project.
# Ensure working directory is ephemeris project.
SCRIPTS_DIRECTORY="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
PROJECT_DIRECTORY="${SCRIPTS_DIRECTORY}/.."
DIST_DIRECTORY="${PROJECT_DIRECTORY}/dist"
WHEEL_FILE="${DIST_DIRECTORY}/galaxy-lib-$VERSION-py2.py3-none-any.whl"
WHEEL_FILE="${DIST_DIRECTORY}/ephemeris-$VERSION-py2.py3-none-any.whl"
DEV_REQUIREMENTS="${PROJECT_DIRECTORY}/dev-requirements.txt"

cd $PROJECT_DIRECTORY
Expand Down
5 changes: 4 additions & 1 deletion src/ephemeris/shed_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@
import yaml
from bioblend.galaxy.client import ConnectionError
from bioblend.galaxy.toolshed import ToolShedClient
from galaxy.tools.verify.interactor import GalaxyInteractorApi, verify_tool
from galaxy.tool_util.verify.interactor import (
GalaxyInteractorApi,
verify_tool,
)

from . import get_galaxy_connection, load_yaml_file
from .ephemeris_log import disable_external_library_logging, setup_global_logger
Expand Down
⚡