remove six dependencies

Author: jlwalke2

README.md

@@ -52,8 +52,7 @@ sasctl folders list
 sasctl requires the following Python packages be installed.
 If not already present, these packages will be downloaded and installed automatically.  
 - requests
-- six
-- futures (Python 2.7 only)
+- pyyaml
 
 The following additional packages are recommended for full functionality:
 - swat

doc/index.rst

@@ -31,8 +31,7 @@ Prerequisites
 If not already present, these packages will be downloaded and install automatically.
 
 - requests
-- six
-- futures (Python 2.7 only)
+- pyyaml
 
 The following additional packages are recommended for full functionality:
 

setup.py

@@ -46,7 +46,6 @@ def get_file(filename):
         'pandas',
         'scikit-learn',
         'requests',
-        'six >= 1.11',
         'pyyaml',
         'packaging'
     ],

src/sasctl/_services/concepts.py

@@ -11,29 +11,30 @@
 # Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-import six
-
 from .service import Service
 from ..core import uri_as_str
 
+
 class Concepts(Service):
     """Assigns concepts to natural language text documents according to a
     prebuilt or user-defined model.
     """
 
     _SERVICE_ROOT = '/concepts'
 
-    def assign_concepts(self,
-                        documents,
-                        caslib=None,
-                        id_column=None,
-                        text_column=None,
-                        description=None,
-                        model=None,
-                        output_postfix=None,
-                        match_type=None,
-                        enable_facts=False,
-                        language='en'):
+    def assign_concepts(
+        self,
+        documents,
+        caslib=None,
+        id_column=None,
+        text_column=None,
+        description=None,
+        model=None,
+        output_postfix=None,
+        match_type=None,
+        enable_facts=False,
+        language='en',
+    ):
         """Performs sentiment analysis on the input data.
 
         Creates a setiment analysis task that executes asynchronously.  There
@@ -84,28 +85,30 @@ def assign_concepts(self,
         if documents is None:
             raise TypeError('`documents` cannot be None.')
 
-        if isinstance(documents, (dict, six.string_types)):
+        if isinstance(documents, (dict, str)):
             data = {
                 'inputUri': uri_as_str(documents),
                 'documentIdVariable': id_column,
                 'textVariable': text_column,
-                'version': 1
+                'version': 1,
             }
         else:
             data = {
                 'caslibUri': uri_as_str(caslib),
                 'documents': documents,
-                'version': 1
+                'version': 1,
             }
 
-        data.update({
-            'description': description,
-            'language': language,
-            'modelUri': uri_as_str(model),
-            'outputTableNamePostfix': output_postfix,
-            'matchType': match_type,
-            'enableFacts': enable_facts
-        })
+        data.update(
+            {
+                'description': description,
+                'language': language,
+                'modelUri': uri_as_str(model),
+                'outputTableNamePostfix': output_postfix,
+                'matchType': match_type,
+                'enableFacts': enable_facts,
+            }
+        )
 
         # Optional fields are not ignored if None. Explicitly remove before sending
         for k in list(data.keys()):
@@ -118,15 +121,13 @@ def assign_concepts(self,
         if 'documents' in data:
             url += '#data'
             headers = {
-                'Content-Type':
-                    'application/vnd.sas.text.concepts.job.request.documents+json',
-                'Accept': 'application/vnd.sas.text.concepts.job+json'
+                'Content-Type': 'application/vnd.sas.text.concepts.job.request.documents+json',
+                'Accept': 'application/vnd.sas.text.concepts.job+json',
             }
         else:
             headers = {
-                'Content-Type':
-                    'application/vnd.sas.text.concepts.job.request+json',
-                'Accept': 'application/vnd.sas.text.concepts.job+json'
+                'Content-Type': 'application/vnd.sas.text.concepts.job.request+json',
+                'Accept': 'application/vnd.sas.text.concepts.job+json',
             }
 
         return self.post(url, json=data, headers=headers)

src/sasctl/_services/files.py

@@ -5,7 +5,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import os
-import six
 
 from .folders import Folders
 from .service import Service
@@ -29,8 +28,9 @@ class Files(Service):
 
     _SERVICE_ROOT = '/files'
 
-    list_files, get_file, update_file, \
-    delete_file = Service._crud_funcs('/files', 'file')
+    list_files, get_file, update_file, delete_file = Service._crud_funcs(
+        '/files', 'file'
+    )
 
     @sasctl_command('files', 'create')
     def create_file(self, file, folder=None, filename=None, expiration=None):
@@ -53,14 +53,16 @@ def create_file(self, file, folder=None, filename=None, expiration=None):
             A dictionary containing the file attributes.
 
         """
-        if isinstance(file, six.string_types):
+        if isinstance(file, str):
             filename = filename or os.path.splitext(os.path.split(file)[1])[0]
 
             with open(file, 'rb') as f:
                 file = f.read()
         else:
             if filename is None:
-                raise ValueError('`filename` must be specified if `file` is not a path.')
+                raise ValueError(
+                    '`filename` must be specified if `file` is not a path.'
+                )
 
             file = file.read()
 
@@ -78,8 +80,9 @@ def create_file(self, file, folder=None, filename=None, expiration=None):
             pass
             # TODO: add 'expirationTimeStamp' to params.  Need to determine correct format
 
-        return self.post('/files#multipartUpload',
-                         files={filename: file}, params=params)
+        return self.post(
+            '/files#multipartUpload', files={filename: file}, params=params
+        )
 
     @sasctl_command('files', 'content')
     def get_file_content(self, file):

src/sasctl/_services/microanalytic_score.py

@@ -10,8 +10,6 @@
 from collections import OrderedDict
 from math import isnan
 
-import six
-
 from .service import Service
 
 
@@ -46,8 +44,9 @@ def is_uuid(cls, id_):
         # MAS id.
         return re.match('^[_a-z][_a-z0-9]+$', id_) is not None
 
-    list_modules, get_module, update_module, \
-        delete_module = Service._crud_funcs('/modules', 'module')
+    list_modules, get_module, update_module, delete_module = Service._crud_funcs(
+        '/modules', 'module'
+    )
 
     def get_module_step(self, module, step):
         """Details of a single step in a given module.
@@ -129,8 +128,7 @@ def execute_module_step(self, module, step, return_dict=True, **kwargs):
             elif type_name == 'int64':
                 kwargs[k] = int(kwargs[k])
 
-        body = {'inputs': [{'name': k, 'value': v}
-                           for k, v in six.iteritems(kwargs)]}
+        body = {'inputs': [{'name': k, 'value': v} for k, v in kwargs.items()]}
 
         # Convert NaN to None (null) before calling MAS
         for i in body['inputs']:
@@ -163,8 +161,14 @@ def execute_module_step(self, module, step, return_dict=True, **kwargs):
             return outputs[0]
         return outputs
 
-    def create_module(self, name=None, description=None, source=None,
-                      language='python', scope='public'):
+    def create_module(
+        self,
+        name=None,
+        description=None,
+        source=None,
+        language='python',
+        scope='public',
+    ):
         """Create a new module in MAS.
 
         Parameters
@@ -189,14 +193,15 @@ def create_module(self, name=None, description=None, source=None,
         elif language == 'ds2':
             t = 'text/vnd.sas.source.ds2'
         else:
-            raise ValueError('Unrecognized source code language `%s`.'
-                             % language)
+            raise ValueError('Unrecognized source code language `%s`.' % language)
 
-        data = {'id': name,
-                'type': t,
-                'description': description,
-                'source': source,
-                'scope': scope}
+        data = {
+            'id': name,
+            'type': t,
+            'description': description,
+            'source': source,
+            'scope': scope,
+        }
 
         r = self.post('/modules', json=data)
         return r
@@ -240,8 +245,7 @@ def define_steps(self, module):
             # Default all params to None to allow method(DataFrame) execution
             input_params = [a for a in arguments] + ['**kwargs']
             method_name = '_%s_%s' % (module.id, step.id)
-            signature = 'def %s(%s):' \
-                        % (method_name, ', '.join(input_params))
+            signature = 'def %s(%s):' % (method_name, ', '.join(input_params))
 
             # If the module step takes arguments, then we perform a number
             # of additional checks to make the allowed input as wide as possible
@@ -266,20 +270,22 @@ def define_steps(self, module):
                     '    is_numpy = False',
                     'if is_pandas:',
                     '    assert len(first_input.shape) == 1',
-                    '    for k in first_input.keys():'
+                    '    for k in first_input.keys():',
                 ]
 
                 for arg in arguments:
                     arg_checks.append("        if k.lower() == '%s':" % arg.lower())
                     arg_checks.append("            %s = first_input[k]" % arg)
                     arg_checks.append("            continue")
 
-                arg_checks.extend([
-                    'elif is_numpy:',
-                    '    if len(first_input.shape) > 1:',
-                    '        assert first_input.shape[0] == 1',
-                    '    first_input = first_input.ravel()'
-                ])
+                arg_checks.extend(
+                    [
+                        'elif is_numpy:',
+                        '    if len(first_input.shape) > 1:',
+                        '        assert first_input.shape[0] == 1',
+                        '    first_input = first_input.ravel()',
+                    ]
+                )
 
                 for i, arg in enumerate(arguments):
                     arg_checks.append('    %s = first_input[%d]' % (arg, i))
@@ -307,31 +313,38 @@ def define_steps(self, module):
 
             # Full method source code
             # Drops 'rc' and 'msg' from return values
-            code = (signature,
-                    type_string,
-                    '    """Execute step \'%s\' of module \'%s\'."""' % (step, module),
-                    '\n'.join('    %s' % a for a in arg_checks),
-                    '    r = execute_module_step(%s)' % ', '.join(['module', 'step'] + call_params),
-                    '    r.pop("rc", None)',
-                    '    r.pop("msg", None)',
-                    '    if len(r) == 1:',
-                    '        return r.popitem()[1]',
-                    '    return tuple(v for v in r.values())'
-                    )
+            code = (
+                signature,
+                type_string,
+                '    """Execute step \'%s\' of module \'%s\'."""' % (step, module),
+                '\n'.join('    %s' % a for a in arg_checks),
+                '    r = execute_module_step(%s)'
+                % ', '.join(['module', 'step'] + call_params),
+                '    r.pop("rc", None)',
+                '    r.pop("msg", None)',
+                '    if len(r) == 1:',
+                '        return r.popitem()[1]',
+                '    return tuple(v for v in r.values())',
+            )
 
             code = '\n'.join(code)
-            self.log.debug("Generated code for step '%s' of module '%s':\n%s",
-                           id_, module, code)
+            self.log.debug(
+                "Generated code for step '%s' of module '%s':\n%s", id_, module, code
+            )
             compiled = compile(code, '<string>', 'exec')
 
             env = globals().copy()
-            env.update({'execute_module_step': self.execute_module_step,
-                        'module': module,
-                        'step': step})
-
-            func = types.FunctionType(compiled.co_consts[0],
-                                      env,
-                                      argdefs=tuple(None for x in arguments))
+            env.update(
+                {
+                    'execute_module_step': self.execute_module_step,
+                    'module': module,
+                    'step': step,
+                }
+            )
+
+            func = types.FunctionType(
+                compiled.co_consts[0], env, argdefs=tuple(None for x in arguments)
+            )
 
             setattr(module, step.id, func)