From f2facb1d7dccb204079b0eb665758c48316690c9 Mon Sep 17 00:00:00 2001 From: gfrn Date: Thu, 1 Sep 2022 09:12:14 -0300 Subject: [PATCH] Further linting --- .flake8 | 3 ++- .pre-commit-config.yaml | 2 +- pyproject.toml | 12 ++++++------ src/pydrs/base.py | 29 +++++++++++++++++++---------- src/pydrs/consts/common.py | 7 ------- src/pydrs/consts/fac.py | 7 ------- src/pydrs/consts/fap.py | 7 ------- src/pydrs/consts/fbp.py | 7 ------- 8 files changed, 28 insertions(+), 46 deletions(-) diff --git a/.flake8 b/.flake8 index 862cf49..27947b0 100644 --- a/.flake8 +++ b/.flake8 @@ -3,4 +3,5 @@ max-line-length = 88 max-complexity = 18 ignore = E203, # See https://github.com/PyCQA/pycodestyle/issues/373 - E266, E501, W503, E241, E722, W504 + E501, + F601 #E266, E501, W503, E241, E722, W504 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b9ddaa0..d5183d5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -24,7 +24,7 @@ repos: args: ["--config", ".black", "-v"] - repo: https://gitlab.com/pycqa/flake8 - rev: 4.0.1 + rev: 5.0.4 hooks: - id: flake8 additional_dependencies: diff --git a/pyproject.toml b/pyproject.toml index ae21eb5..56b5d37 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,13 +41,13 @@ where = ["src"] [project.optional-dependencies] dev = [ - "bandit==1.7.0", + "bandit==1.7.4", "black==22.8.0", - "flake8==4.0.1", - "flake8-bandit==2.1.2", - "flake8-bugbear==21.9.2", - "flake8-implicit-str-concat==0.2.0", - "mypy==0.812", + "flake8==5.0.4", + "flake8-bandit==4.1.1", + "flake8-bugbear==22.8.23", + "flake8-implicit-str-concat==0.3.0", + "mypy==0.971", "mypy-extensions==0.4.3", "pyflakes==2.4.0", "types-setuptools", diff --git a/src/pydrs/base.py b/src/pydrs/base.py index b3358ba..751db15 100644 --- a/src/pydrs/base.py +++ b/src/pydrs/base.py @@ -544,7 +544,7 @@ def set_param_bank(self, param_file: str) -> list: ps_param_list[param][n], param_hex.encode("latin-1"), ] - except: + except Exception: break return ps_param_list # self.save_param_bank() @@ -565,7 +565,7 @@ def read_csv_param_bank(self, param_csv_file: str): for n in range(64): try: param_values.append(float(csv_param_list[param][n])) - except: + except Exception: break csv_param_list[param] = param_values @@ -574,7 +574,7 @@ def read_csv_param_bank(self, param_csv_file: str): @print_deprecated def get_param_bank( self, - list_param: list = common.params.keys(), + list_param: list = None, timeout: float = 0.5, print_modules: bool = True, return_floathex: bool = False, @@ -593,6 +593,9 @@ def get_param_bank( return_floathex Include hexadecimal representation of floats in returned value """ + if list_param is None: + list_param = common.params.keys() + timeout_old = self.timeout param_bank = {} @@ -645,8 +648,11 @@ def set_dsp_coeffs( self, dsp_class: int, dsp_id: int, - coeffs_list: list = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + coeffs_list: list = None, ) -> bytes: + if coeffs_list is None: + coeffs_list = [0] * 12 + coeffs_list_full = format_list_size(coeffs_list, NUM_MAX_COEFFS_DSP) payload_size = size_to_hex(1 + 2 + 2 + 4 * NUM_MAX_COEFFS_DSP) hex_dsp_class = double_to_hex(dsp_class) @@ -1281,7 +1287,7 @@ def recv_samples_buffer(self) -> list: try: for k in range(7, len(recv_msg) - 1, 4): val.extend(struct.unpack("f", recv_msg[k : k + 4])) - except: + except Exception: pass return val @@ -1688,7 +1694,7 @@ def read_vars_fac_dcdc(self, n=1, dt=0.5, iib=1): prettier_print(vars_dict) time.sleep(dt) - except: + except Exception: pass @print_deprecated @@ -1738,7 +1744,7 @@ def read_vars_fac_dcdc_ema(self, n=1, dt=0.5, iib=0): prettier_print(vars_dict) time.sleep(dt) return vars_dict - except: + except Exception: pass def _read_fac_2s_acdc_module(self, iib: bool) -> dict: @@ -2364,7 +2370,7 @@ def check_param_bank(self, param_file: str): try: print(str(param[0]) + "[" + str(n) + "]: " + str(param[n + 1])) print(self.set_param(str(param[0]), n, float(param[n + 1]))) - except: + except Exception: break # TODO: Fix siriuspy dependency @@ -2440,7 +2446,7 @@ def set_prbs_sampling_freq(self, freq, type_memory): @print_deprecated def get_dsp_modules_bank( self, - list_dsp_classes=[1, 2, 3, 4, 5, 6], + list_dsp_classes=None, print_modules=True, return_floathex=False, ) -> dict: @@ -2461,6 +2467,9 @@ def get_dsp_modules_bank( dict Dict containing DSP modules parameter bank """ + if list_dsp_classes is None: + list_dsp_classes = [1, 2, 3, 4, 5, 6] + dsp_modules_bank = {} for dsp_class in list_dsp_classes: dsp_modules_bank[dsp_classes_names[dsp_class]] = { @@ -2995,7 +3004,7 @@ def test_bid_board(self, password): else: print("\n Placa BID reprovada!\n") - except: + except Exception: print(" Placa BID reprovada!\n") def upload_parameters_bid(self, password): diff --git a/src/pydrs/consts/common.py b/src/pydrs/consts/common.py index 84dd23d..4331445 100644 --- a/src/pydrs/consts/common.py +++ b/src/pydrs/consts/common.py @@ -1,10 +1,3 @@ -"""""" """""" """""" """""" """""" """""" """""" """""" """""" """""" """""" """'' -====================================================================== - Listas de Entidades BSMP - A posição da entidade na lista corresponde ao seu ID BSMP -====================================================================== -""" """""" """""" """""" """""" """""" """""" """""" """""" """""" """""" """""" "" - ps_models = [ "Empty", "FBP", diff --git a/src/pydrs/consts/fac.py b/src/pydrs/consts/fac.py index a1a6013..ddde371 100644 --- a/src/pydrs/consts/fac.py +++ b/src/pydrs/consts/fac.py @@ -1,10 +1,3 @@ -"""""" """""" """""" """""" """""" """""" """""" """""" """""" """""" """""" """'' -====================================================================== - Listas de Entidades BSMP - A posição da entidade na lista corresponde ao seu ID BSMP -====================================================================== -""" """""" """""" """""" """""" """""" """""" """""" """""" """""" """""" """""" "" - # FAC ACDC list_acdc_soft_interlocks = [] diff --git a/src/pydrs/consts/fap.py b/src/pydrs/consts/fap.py index 7fa9249..8d5a892 100644 --- a/src/pydrs/consts/fap.py +++ b/src/pydrs/consts/fap.py @@ -1,10 +1,3 @@ -"""""" """""" """""" """""" """""" """""" """""" """""" """""" """""" """""" """'' -====================================================================== - Listas de Entidades BSMP - A posição da entidade na lista corresponde ao seu ID BSMP -====================================================================== -""" """""" """""" """""" """""" """""" """""" """""" """""" """""" """""" """""" "" - # FAP list_soft_interlocks = [ "DCCT 1 Fault", diff --git a/src/pydrs/consts/fbp.py b/src/pydrs/consts/fbp.py index 0b777ac..71cd441 100644 --- a/src/pydrs/consts/fbp.py +++ b/src/pydrs/consts/fbp.py @@ -1,10 +1,3 @@ -"""""" """""" """""" """""" """""" """""" """""" """""" """""" """""" """""" """'' -====================================================================== - Listas de Entidades BSMP - A posição da entidade na lista corresponde ao seu ID BSMP -====================================================================== -""" """""" """""" """""" """""" """""" """""" """""" """""" """""" """""" """""" "" - # FBP soft_interlocks = ["Heat-Sink Overtemperature"]