Merge pull request #17 from lsst/tickets/DM-22234-ctrl_orca

DM-22234: Remove Python 2 support

.gitignore

@@ -1,3 +1,4 @@
+.coverage
 .sconsign.dblite
 config.log
 .sconf_temp

bin.src/filewaiter.py

@@ -22,7 +22,6 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-from __future__ import print_function
 import os
 import os.path
 import sys

bin.src/orca.py

@@ -22,9 +22,6 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-
-from __future__ import with_statement
-from __future__ import print_function
 import os
 import os.path
 import optparse

etc/condor/scripts/generateDag.py

@@ -22,8 +22,6 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-from __future__ import print_function
-from builtins import str
 import argparse
 import sys
 import shlex

python/lsst/ctrl/orca/CondorJobs.py

@@ -22,18 +22,14 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-
-from __future__ import print_function
-from builtins import str
-from builtins import object
 import os
 import subprocess
 import re
 import time
 import lsst.log as log
 
 
-class CondorJobs(object):
+class CondorJobs:
     """Handles interaction with HTCondor
     This class is highly dependent on the output of the condor commands
     condor_submit and condor_q

python/lsst/ctrl/orca/CondorWorkflowConfigurator.py

@@ -20,7 +20,6 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-from builtins import str
 import stat
 import sys
 import os

python/lsst/ctrl/orca/CondorWorkflowLauncher.py

@@ -20,7 +20,6 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-from __future__ import print_function
 import os
 import lsst.log as log
 from lsst.ctrl.orca.WorkflowLauncher import WorkflowLauncher

python/lsst/ctrl/orca/CondorWorkflowMonitor.py

@@ -20,8 +20,6 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-from __future__ import with_statement
-from __future__ import print_function
 import threading
 import time
 import lsst.log as log

python/lsst/ctrl/orca/DatabaseConfigurator.py

@@ -1,4 +1,3 @@
-from builtins import object
 #
 # LSST Data Management System
 # Copyright 2008-2017 LSST Corporation.
@@ -29,7 +28,7 @@
 #
 
 
-class DatabaseConfigurator(object):
+class DatabaseConfigurator:
     """Configures a database for use.
 
     Parameters

python/lsst/ctrl/orca/Directories.py

@@ -22,16 +22,14 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-
-from builtins import object
 import lsst.pex.exceptions as pexExcept
 
 import lsst.daf.base as dafBase
 
 import os
 
 
-class Directories(object):
+class Directories:
     """Determine the various directory roots that can be used by a pipeline
        This class takes a "dir" config and a run identifier and converts the
        values into a set of directory paths that a pipeline is allowed to use.

python/lsst/ctrl/orca/EnvString.py

@@ -1,4 +1,3 @@
-from builtins import object
 #
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.
@@ -25,7 +24,7 @@
 import os
 
 
-class EnvString(object):
+class EnvString:
     def resolve(strVal):
         """Replace environment variables within a string
 

python/lsst/ctrl/orca/FileWaiter.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.
@@ -22,14 +20,11 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-
-from __future__ import print_function
-from builtins import object
 import os
 import lsst.log as log
 
 
-class FileWaiter(object):
+class FileWaiter:
     # @brief initializer
     """Waits for files to come into existence on a remote resource
     Parameters

python/lsst/ctrl/orca/NamedClassFactory.py

@@ -20,10 +20,8 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-from builtins import object
 
-
-class NamedClassFactory(object):
+class NamedClassFactory:
     """Create a new "name" class object
 
     Parameters

python/lsst/ctrl/orca/PegasusJobs.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #
 # LSST Data Management System
 # Copyright 2017 LSST Corporation.
@@ -22,8 +20,6 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-
-from __future__ import print_function
 import subprocess
 import re
 import lsst.log as log

python/lsst/ctrl/orca/PegasusWorkflowLauncher.py

@@ -20,7 +20,6 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-from __future__ import print_function
 import os
 import lsst.log as log
 from lsst.ctrl.orca.WorkflowLauncher import WorkflowLauncher

python/lsst/ctrl/orca/ProductionRunConfigurator.py

@@ -20,16 +20,14 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-from __future__ import print_function
-from builtins import object
 from lsst.ctrl.orca.NamedClassFactory import NamedClassFactory
 from lsst.ctrl.orca.WorkflowManager import WorkflowManager
 from lsst.ctrl.orca.config.ProductionConfig import ProductionConfig
 from lsst.ctrl.orca.exceptions import MultiIssueConfigurationError
 import lsst.log as log
 
 
-class ProductionRunConfigurator(object):
+class ProductionRunConfigurator:
     """Create a basic production run.
 
     Parameters

python/lsst/ctrl/orca/ProductionRunManager.py

@@ -20,11 +20,6 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-from __future__ import with_statement
-from __future__ import print_function
-from __future__ import absolute_import
-from builtins import object
-
 import os
 import os.path
 import socket
@@ -53,7 +48,7 @@ def __init__(self, *args, **kwargs):
     return CustomHandler
 
 
-class ProductionRunManager(object):
+class ProductionRunManager:
     """In charge of launching, monitoring, managing, and stopping a production run
 
     Parameters

python/lsst/ctrl/orca/StatusListener.py

@@ -20,11 +20,10 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-from builtins import object
 import lsst.log as log
 
 
-class StatusListener(object):
+class StatusListener:
     """Used receive messages about changes in a workflow
     """
 

python/lsst/ctrl/orca/TemplateWriter.py

@@ -1,5 +1,3 @@
-from builtins import str
-from builtins import object
 #
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.
@@ -30,7 +28,7 @@
 #
 
 
-class TemplateWriter(object):
+class TemplateWriter:
     """Takes templates and subtitutes the values for the given keys,
        writing a new file generated from the template.
     """

python/lsst/ctrl/orca/WorkflowConfigurator.py

@@ -1,6 +1,3 @@
-from __future__ import print_function
-from builtins import range
-from builtins import object
 #
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.
@@ -33,7 +30,7 @@
 #
 
 
-class WorkflowConfigurator(object):
+class WorkflowConfigurator:
     """Abstract class for configuring a workflow
 
     Parameters
@@ -55,7 +52,7 @@ class WorkflowConfigurator(object):
     """
 
     # configuration group
-    class ConfigGroup(object):
+    class ConfigGroup:
         """Configuration group
 
         Parameters

python/lsst/ctrl/orca/WorkflowLauncher.py

@@ -1,4 +1,3 @@
-from builtins import object
 #
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.
@@ -32,7 +31,7 @@
 #
 
 
-class WorkflowLauncher(object):
+class WorkflowLauncher:
     ##
     # @brief
     #

python/lsst/ctrl/orca/WorkflowManager.py

@@ -20,8 +20,6 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-from __future__ import print_function
-from builtins import object
 from lsst.ctrl.orca.NamedClassFactory import NamedClassFactory
 from lsst.ctrl.orca.multithreading import SharedData
 from lsst.ctrl.orca.exceptions import MultiIssueConfigurationError
@@ -32,7 +30,7 @@
 #
 
 
-class WorkflowManager(object):
+class WorkflowManager:
     """Manage lifecycle of this workflow.
 
     Parameters

python/lsst/ctrl/orca/WorkflowMonitor.py

@@ -20,13 +20,11 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-
-from builtins import object
 import lsst.log as log
 from lsst.ctrl.orca.multithreading import SharedData
 
 
-class WorkflowMonitor(object):
+class WorkflowMonitor:
     """In charge of monitoring and/or controlling the progress of a running workflow.
     """
 

python/lsst/ctrl/orca/config/CondorWorkflowConfig.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 import lsst.pex.config as pexConfig
 
 # condor data configuration

python/lsst/ctrl/orca/config/DatabaseConfig.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-# import sys
 import lsst.pex.config as pexConfig
 # from . import FakeTypeMap as fake
 # from . import WorkflowConfig as work

python/lsst/ctrl/orca/config/MonitorConfig.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 import lsst.pex.config as pexConfig
 
 # workflow monitor configuration

python/lsst/ctrl/orca/config/PipelineConfig.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 import lsst.pex.config as pexConfig
 from lsst.ctrl.orca.config.DirectoryConfig import DirectoryConfig
 

python/lsst/ctrl/orca/config/TaskConfig.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 import lsst.pex.config as pexConfig
 
 # script template

python/lsst/ctrl/orca/exceptions.py

@@ -1,4 +1,3 @@
-from builtins import str
 #
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.

python/lsst/ctrl/orca/multithreading/SharedData.py

@@ -21,13 +21,10 @@
 #
 
 #
-from __future__ import with_statement
-from builtins import str
-from builtins import object
 import threading
 
 
-class SharedData(object):
+class SharedData:
     """A lock-protected container for data that can be shared amongst threads.
 
     Parameters

python/lsst/ctrl/orca/multithreading/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 #
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.

tests/test_exceptions.py

@@ -23,7 +23,6 @@
 """
 Tests of orca exceptions
 """
-from builtins import str
 import unittest
 import lsst.utils.tests
 

tests/test_sharedData.py

@@ -23,8 +23,6 @@
 """
 Tests of the SharedData class
 """
-from __future__ import with_statement
-from builtins import str
 
 import unittest
 import threading

ups/ctrl_orca.table

@@ -1,4 +1,3 @@
-setupRequired(python_future)
 setupRequired(utils)
 setupRequired(pex_config)
 setupRequired(daf_persistence)