Merge pull request #2 from UCSB-VRL/charvi/upgrade_python_version

Merge : Charvi/upgrade python version

Author: connor11son

.github/workflows/lint.yml

@@ -0,0 +1,8 @@
+name: Lint Code
+on: [push, pull_request]
+jobs:
+  ruff:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: chartboost/ruff-action@v1

.gitignore

@@ -0,0 +1,3 @@
+**/__pycache__/**
+*.bak
+**/.ruff_cache/**

pyproject.toml

@@ -0,0 +1,7 @@
+[tool.ruff]
+# Follow Flake8's behavior
+lint.select = ["E", "F", "W", "C90"]  # Enables Flake8-compatible rules
+lint.ignore = []                      # Add rules to ignore
+line-length = 79                 
+exclude = ["venv", ".git", "__pycache__", "**/tests/**"] 
+lint.mccabe.max-complexity = 25  # Set your desired threshold

setup.py

@@ -12,9 +12,6 @@
     keywords='API Bisque',
     url='https://github.com/UCSB-VRL/bisqueUCSB',
     install_requires=[
-        'six',
-        'lxml',
-        'requests==2.10.0',
-        'requests-toolbelt',
-    ],
+          'six', 'lxml', 'requests==2.32.3', 'requests-toolbelt',
+      ],
 )

src/bqapi/RequestsMonkeyPatch/__init__.py

@@ -1 +1 @@
-#empty
+#empty

src/bqapi/RequestsMonkeyPatch/monkeypatch.py

@@ -2,4 +2,5 @@ def monkeypatch_method(cls):
     def decorator(func):
         setattr(cls, func.__name__, func)
         return func
+
     return decorator

src/bqapi/RequestsMonkeyPatch/requests_patch.py

@@ -1,35 +1,36 @@
 """
-    A patch to format_header_param in urllib3
+A patch to format_header_param in urllib3
 
-    If a value has unicode the header will be returned
-    as 'name="value"; name*=utf-8''value' else
-    'name="value"'
+If a value has unicode the header will be returned
+as 'name="value"; name*=utf-8''value' else
+'name="value"'
 """
 
-
 import email.utils
-#import mimetypes
+
+# import mimetypes
 import warnings
 
 import requests
 import requests.packages.urllib3 as urllib3
-from requests.packages.urllib3.packages import six
+import six
 from .monkeypatch import monkeypatch_method
 
 
+REQUESTS_V = [int(s) for s in requests.__version__.split(".")]
 
-REQUESTS_V = [int(s) for s in requests.__version__.split('.')]
-
-if REQUESTS_V < [2, 4, 0] or  REQUESTS_V > [2, 19, 0]:
+print(REQUESTS_V)
+if REQUESTS_V < [2, 4, 0] or REQUESTS_V > [2, 32, 3]:
     warnings.warn("""\
-We need to patch requests 2.4.0 up to 2.19.0, make sure your version of requests \
-needs this patch, greater than 2.4.3 we do not know if this patch applys."""
-                  )
-    raise ImportError('Requests 2.4.0 to 2.10.0 is required!')
-#elif requests_v > [3, 0, 0]:
+We need to patch requests 2.4.0 up to 2.32.3, make sure your version of
+requests needs this patch, greater than 2.4.3 we do not know if this
+patch applys.""")
+    raise ImportError("Requests 2.4.0 to 2.32.3 is required!")
+# elif requests_v > [3, 0, 0]:
 #    #does not require this patch
 #    pass
 else:
+
     @monkeypatch_method(urllib3.fields)
     def format_header_param(name, value):
         """
@@ -47,18 +48,20 @@ def format_header_param(name, value):
         if not any(ch in value for ch in '"\\\r\n'):
             result = '%s="%s"' % (name, value)
             try:
-                result.encode('ascii')
+                result.encode("ascii")
             except UnicodeEncodeError:
                 pass
             else:
                 return result
 
         value_encode = value
-        if not six.PY3: # Python 2:
-            value_encode = value.encode('utf-8')
+        if not six.PY3:  # Python 2:
+            value_encode = value.encode("utf-8")
 
         value = '%s="%s"; %s*=%s' % (
-            name, value,
-            name, email.utils.encode_rfc2231(value_encode, 'utf-8')
+            name,
+            value,
+            name,
+            email.utils.encode_rfc2231(value_encode, "utf-8"),
         )
         return value

src/bqapi/__init__.py

@@ -1,6 +1,5 @@
-#
-
-from .comm import *
-from .types import *
-
+from comm import BQSession
+import comm
+import types
 
+__all__ = ["comm", "types", "BQSession"]

src/bqapi/blockable_module.py

@@ -7,54 +7,58 @@
 import logging
 
 
+# logging.basicConfig(filename='BlockableModule.log',level=logging.DEBUG) #!!!
+log = logging.getLogger("bqapi.blockable_module")
 
-#logging.basicConfig(filename='BlockableModule.log',level=logging.DEBUG)   #!!!
-log = logging.getLogger('bqapi.blockable_module')
 
 class BlockableModule(object):
     """Base class for module that can run over blocks of parameters"""
-    
-    def main(self, mex_url=None, auth_token=None, bq=None, **kw):        
+
+    def main(self, mex_url=None, auth_token=None, bq=None, **kw):
         #  Allow for testing by passing an alreay initialized session
         if bq is None:
             bq = BQSession().init_mex(mex_url, auth_token)
-            
+
         # check for list parameters
         params = bq.get_mex_inputs()
-        if isinstance(params, dict) or not isinstance(params, collections.Iterable):
+        if isinstance(params, dict) or not isinstance(
+            params, collections.Iterable
+        ):
             params = [params]
         # pass values directly as args
         for single_params in params:
             for param_name in single_params:
-                if 'value' in single_params[param_name]:
-                    single_params[param_name] = single_params[param_name].get('value')
-        
+                if "value" in single_params[param_name]:
+                    single_params[param_name] = single_params[param_name].get(
+                        "value"
+                    )
+
         # TODO: measure block startup time
         self.start_block(bq, params)
-                    
+
         for kw in params:
             # TODO: measure single item time
             # TODO: run in parallel
-            if 'mex_url' in kw:
+            if "mex_url" in kw:
                 # set (innermost) single item mex
-                sub_bq = BQSession().init_mex(kw['mex_url'], auth_token)
+                sub_bq = BQSession().init_mex(kw["mex_url"], auth_token)
             else:
                 sub_bq = bq
             self.process_single(sub_bq, **kw)
-            if 'mex_url' in kw:
+            if "mex_url" in kw:
                 sub_bq.close()
-        
+
         # TODO: measure block teardown time
         self.end_block(bq)
-        
+
         sys.exit(0)
-        #bq.close()
-    
+        # bq.close()
+
     def start_block(self, bq, all_kw):
         pass
-    
+
     def end_block(self, bq):
         pass
-            
+
     def process_single(self, bq, **kw):
         pass