Refactor galaxy.jobs.datasets into galaxy.job_execution.datasets.

Needed for metadata evaluation stuff (at least in testing) and removes some circular dependencies in the form of stuff in galaxy.tools depending on stuff in galaxy.jobs.

lib/galaxy/jobs/__init__.py

@@ -26,6 +26,12 @@ import galaxy
 from galaxy import model, util
 from galaxy.datatypes import sniff
 from galaxy.exceptions import ObjectInvalid, ObjectNotFound
+from galaxy.job_execution.datasets import (
+    DatasetPath,
+    NullDatasetPathRewriter,
+    OutputsToWorkingDirectoryPathRewriter,
+    TaskPathRewriter
+)
 from galaxy.job_execution.output_collect import collect_extra_files
 from galaxy.jobs.actions.post import ActionBox
 from galaxy.jobs.mapper import JobMappingException, JobRunnerMapper
@@ -39,8 +45,6 @@ from galaxy.util.bunch import Bunch
 from galaxy.util.expressions import ExpressionContext
 from galaxy.util.xml_macros import load
 from galaxy.web.stack.handlers import ConfiguresHandlers
-from .datasets import (DatasetPath, NullDatasetPathRewriter,
-    OutputsToWorkingDirectoryPathRewriter, TaskPathRewriter)
 
 log = logging.getLogger(__name__)
 

lib/galaxy/tools/actions/metadata.py

@@ -2,7 +2,7 @@ import logging
 import os
 from json import dumps
 
-from galaxy.jobs.datasets import DatasetPath
+from galaxy.job_execution.datasets import DatasetPath
 from galaxy.metadata import get_metadata_compute_strategy
 from galaxy.util.odict import odict
 from . import ToolAction

lib/galaxy/tools/evaluation.py

@@ -7,7 +7,7 @@ import tempfile
 from six import string_types
 
 from galaxy import model
-from galaxy.jobs.datasets import dataset_path_rewrites
+from galaxy.job_execution.datasets import dataset_path_rewrites
 from galaxy.model.none_like import NoneDataset
 from galaxy.tools import global_tool_errors
 from galaxy.tools.parameters import (

packages/job_execution/tests/test_datasets.py

@@ -0,0 +1 @@
+../../../test/unit/jobs/test_datasets.py

test/unit/jobs/test_datasets.py

@@ -1,4 +1,4 @@
-from galaxy.jobs.datasets import DatasetPath
+from galaxy.job_execution.datasets import DatasetPath
 
 
 def test_dataset_path():

test/unit/tools/test_evaluation.py

@@ -2,8 +2,8 @@ import os
 from unittest import TestCase
 from xml.etree.ElementTree import XML
 
+from galaxy.job_execution.datasets import DatasetPath
 from galaxy.jobs import SimpleComputeEnvironment
-from galaxy.jobs.datasets import DatasetPath
 from galaxy.model import (
     Dataset,
     History,

test/unit/tools/test_metadata.py

@@ -3,7 +3,7 @@ import subprocess
 import unittest
 
 from galaxy import model
-from galaxy.jobs.datasets import DatasetPath
+from galaxy.job_execution.datasets import DatasetPath
 from galaxy.metadata import get_metadata_compute_strategy
 from galaxy.objectstore import ObjectStorePopulator
 from .. import tools_support

test/unit/tools/test_wrappers.py

@@ -3,7 +3,7 @@ import tempfile
 from xml.etree.ElementTree import XML
 
 from galaxy.datatypes.metadata import MetadataSpecCollection
-from galaxy.jobs.datasets import DatasetPath
+from galaxy.job_execution.datasets import DatasetPath
 from galaxy.tools.parameters.basic import (
     DrillDownSelectToolParameter,
     IntegerToolParameter,