diff --git a/cron/parse_builds.py b/cron/parse_builds.py index e728315be13..2e4149fce57 100644 --- a/cron/parse_builds.py +++ b/cron/parse_builds.py @@ -6,10 +6,10 @@ build description """ from __future__ import print_function -import requests import sys import xml.etree.ElementTree as ElementTree +import requests def getbuilds(url): try: diff --git a/cron/parse_builds_3_sites.py b/cron/parse_builds_3_sites.py index 464064f4736..7d3af104420 100644 --- a/cron/parse_builds_3_sites.py +++ b/cron/parse_builds_3_sites.py @@ -4,9 +4,10 @@ Connects to sites and determines which builds are available at each. """ from __future__ import print_function -import requests import xml.etree.ElementTree as ElementTree +import requests + sites = ['http://genome.ucsc.edu/cgi-bin/', 'http://archaea.ucsc.edu/cgi-bin/', 'http://genome-test.cse.ucsc.edu/cgi-bin/'] diff --git a/lib/galaxy/jobs/deferred/pacific_biosciences_smrt_portal.py b/lib/galaxy/jobs/deferred/pacific_biosciences_smrt_portal.py index 0adf41e5e02..297b56e90b9 100644 --- a/lib/galaxy/jobs/deferred/pacific_biosciences_smrt_portal.py +++ b/lib/galaxy/jobs/deferred/pacific_biosciences_smrt_portal.py @@ -3,11 +3,12 @@ Module for managing jobs in Pacific Bioscience's SMRT Portal and automatically t produced by SMRT Portal. """ import logging -import requests from string import Template from .data_transfer import DataTransfer +import requests + log = logging.getLogger(__name__) __all__ = ('SMRTPortalPlugin', ) diff --git a/lib/galaxy/tools/data/__init__.py b/lib/galaxy/tools/data/__init__.py index 98013c5201e..f1fde0b7f40 100644 --- a/lib/galaxy/tools/data/__init__.py +++ b/lib/galaxy/tools/data/__init__.py @@ -11,7 +11,6 @@ import logging import os import os.path import re -import requests import string import time from glob import glob @@ -21,6 +20,8 @@ from galaxy import util from galaxy.util.dictifiable import Dictifiable from galaxy.util.odict import odict +import requests + log = logging.getLogger(__name__) DEFAULT_TABLE_TYPE = 'tabular' diff --git a/lib/galaxy/tools/imp_exp/unpack_tar_gz_archive.py b/lib/galaxy/tools/imp_exp/unpack_tar_gz_archive.py index 31e5c922a6d..c8562f959d4 100644 --- a/lib/galaxy/tools/imp_exp/unpack_tar_gz_archive.py +++ b/lib/galaxy/tools/imp_exp/unpack_tar_gz_archive.py @@ -10,12 +10,13 @@ from __future__ import print_function import math import optparse import os -import requests import sys import tarfile import tempfile from base64 import b64decode +import requests + # Set max size of archive/file that will be handled to be 100 GB. This is # arbitrary and should be adjusted as needed. MAX_SIZE = 100 * math.pow(2, 30) diff --git a/lib/tool_shed/capsule/capsule_manager.py b/lib/tool_shed/capsule/capsule_manager.py index dcd192ce2f4..c07d1d5de95 100644 --- a/lib/tool_shed/capsule/capsule_manager.py +++ b/lib/tool_shed/capsule/capsule_manager.py @@ -1,7 +1,6 @@ import contextlib import logging import os -import requests import shutil import tarfile import tempfile @@ -21,6 +20,8 @@ from tool_shed.metadata import repository_metadata_manager from tool_shed.util import (basic_util, commit_util, common_util, encoding_util, hg_util, metadata_util, repository_util, shed_util_common as suc, xml_util) +import requests + log = logging.getLogger(__name__)