lint and format

Author: Gui-FernandesBR

Makefile

@@ -11,7 +11,7 @@ ruff-lint:
 
 pylint:
 	@echo Running pylint check...
-	@pylint .
+	@pylint examples/ rocketserializer/ tests/
 	@echo Pylint check completed.
 
 lint: ruff-lint pylint

destroy-the-bank.py

@@ -47,6 +47,6 @@ def destroy_the_bank(file):
     for file in ork_files:
         try:
             destroy_the_bank(file)
-        except Exception as e:
+        except Exception:
             # Log any unexpected exceptions
             logging.exception(f"An unexpected error occurred in file: {file}")

examples/EPFL--BellaLui--2020/simulation.ipynb

@@ -27,19 +27,17 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "import datetime\n",
+    "\n",
     "from rocketpy import (\n",
     "    Environment,\n",
-    "    SolidMotor,\n",
-    "    Rocket,\n",
     "    Flight,\n",
-    "    TrapezoidalFins,\n",
-    "    EllipticalFins,\n",
-    "    RailButtons,\n",
     "    NoseCone,\n",
+    "    Rocket,\n",
+    "    SolidMotor,\n",
     "    Tail,\n",
-    "    Parachute,\n",
-    ")\n",
-    "import datetime"
+    "    TrapezoidalFins,\n",
+    ")"
    ]
   },
   {
@@ -510,7 +508,11 @@
    ]
   }
  ],
- "metadata": {},
+ "metadata": {
+  "language_info": {
+   "name": "python"
+  }
+ },
  "nbformat": 4,
  "nbformat_minor": 5
 }

examples/NDRT--Rocket--2020/simulation.ipynb

@@ -27,19 +27,18 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "import datetime\n",
+    "\n",
     "from rocketpy import (\n",
     "    Environment,\n",
-    "    SolidMotor,\n",
-    "    Rocket,\n",
     "    Flight,\n",
-    "    TrapezoidalFins,\n",
-    "    EllipticalFins,\n",
-    "    RailButtons,\n",
     "    NoseCone,\n",
-    "    Tail,\n",
     "    Parachute,\n",
-    ")\n",
-    "import datetime"
+    "    Rocket,\n",
+    "    SolidMotor,\n",
+    "    Tail,\n",
+    "    TrapezoidalFins,\n",
+    ")"
    ]
   },
   {
@@ -541,7 +540,11 @@
    ]
   }
  ],
- "metadata": {},
+ "metadata": {
+  "language_info": {
+   "name": "python"
+  }
+ },
  "nbformat": 4,
  "nbformat_minor": 5
 }

examples/ProjetoJupiter--Valetudo--2019/simulation.ipynb

@@ -31,24 +31,22 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 24,
+   "execution_count": null,
    "id": "20ba7738",
    "metadata": {},
    "outputs": [],
    "source": [
+    "import datetime\n",
+    "\n",
     "from rocketpy import (\n",
     "    Environment,\n",
-    "    SolidMotor,\n",
-    "    Rocket,\n",
     "    Flight,\n",
-    "    TrapezoidalFins,\n",
-    "    EllipticalFins,\n",
-    "    RailButtons,\n",
     "    NoseCone,\n",
-    "    Tail,\n",
     "    Parachute,\n",
-    ")\n",
-    "import datetime"
+    "    Rocket,\n",
+    "    SolidMotor,\n",
+    "    TrapezoidalFins,\n",
+    ")"
    ]
   },
   {

rocketserializer/__init__.py

@@ -1 +1,3 @@
 from .ork_extractor import ork_extractor
+
+__all__ = ["ork_extractor"]

rocketserializer/nb_builder.py

@@ -329,7 +329,6 @@ def build_fins(self, nb: nbf.v4.new_notebook) -> nbf.v4.new_notebook:
             text = "trapezoidal_fins = {}\n"
             nb["cells"].append(nbf.v4.new_code_cell(text))
             for i in range(len(self.parameters["trapezoidal_fins"])):
-
                 trapezoidal_fins_i = self.parameters["trapezoidal_fins"][str(i)]
 
                 number = trapezoidal_fins_i["number"]
@@ -365,7 +364,6 @@ def build_fins(self, nb: nbf.v4.new_notebook) -> nbf.v4.new_notebook:
             text = "elliptical_fins = {}\n"
             nb["cells"].append(nbf.v4.new_code_cell(text))
             for i in range(len(self.parameters["elliptical_fins"])):
-
                 elliptical_fins_i = self.parameters["elliptical_fins"][str(i)]
 
                 number = elliptical_fins_i["number"]
@@ -410,7 +408,6 @@ def build_tails(self, nb: nbf.v4.new_notebook) -> nbf.v4.new_notebook:
         text = "tails = {}\n"
         nb["cells"].append(nbf.v4.new_code_cell(text))
         for i in range(len(self.parameters["tails"])):
-
             tail_i = self.parameters["tails"][str(i)]
 
             top_radius = tail_i["top_radius"]
@@ -467,7 +464,6 @@ def build_parachute(self, nb: nbf.v4.new_notebook) -> nbf.v4.new_notebook:
         text = "parachutes = {}\n"
         nb["cells"].append(nbf.v4.new_code_cell(text))
         for i in range(len(self.parameters["parachutes"])):
-
             parachute_i = self.parameters["parachutes"][str(i)]
             cd_s = parachute_i["cd"] * parachute_i["area"]
             deploy_event = parachute_i["deploy_event"]

rocketserializer/openrocket_runtime.py

@@ -106,7 +106,11 @@ def ensure_java_compatibility(jar_path: Path):
     default_jvm_major = None
     try:
         default_jvm_major = _extract_java_major(jpype.getDefaultJVMPath())
-    except Exception:
+    except (
+        jpype.JVMNotFoundException,
+        jpype.JVMNotSupportedException,
+        OSError,
+    ):
         default_jvm_major = None
 
     if default_jvm_major and default_jvm_major >= required_major:
@@ -156,7 +160,7 @@ def _resolve_packages(self):
             legacy = jpype.JPackage("net").sf.openrocket
             _ = legacy.startup.Application
             return legacy, legacy
-        except Exception:
+        except (AttributeError, TypeError, RuntimeError):
             modern = jpype.JPackage("info").openrocket
             return modern.core, modern.swing
 
@@ -168,10 +172,10 @@ def _block_loader(gui_module, field_name):
             loader = field.get(gui_module)
             field.setAccessible(False)
             loader.blockUntilLoaded()
-        except Exception:
+        except (AttributeError, TypeError, RuntimeError, jpype.JException):
             # New OpenRocket versions can change internals; loading still works
             # without explicitly waiting in most cases.
-            return
+            pass
 
     def __enter__(self):
         ensure_java_compatibility(self.jar_path)
@@ -222,7 +226,7 @@ def __exit__(self, ex_type, ex, tb):
                 try:
                     for window in jpype.java.awt.Window.getWindows():
                         window.dispose()
-                except Exception:
+                except (AttributeError, TypeError, RuntimeError, jpype.JException):
                     pass
                 jpype.shutdownJVM()
         finally:

tests/acceptance/test_ork_extractor.py

@@ -16,7 +16,7 @@
 )
 def test_ork_extractor(expected_results_file, fixture, request):
     # load the expected results
-    with open(expected_results_file, "r") as f:
+    with open(expected_results_file, "r", encoding="utf-8") as f:
         expected_results = json.load(f)
 
     # get the settings from the fixture

tests/conftest.py

@@ -12,50 +12,55 @@
 ROOT_DIR = Path(__file__).resolve().parents[1]
 
 
-def get_settings(filepath, output, ork):
-    bs, _ = parse_ork_file(filepath)
+def get_settings(ork_filepath, output_dir, ork_document):
+    bs, _ = parse_ork_file(ork_filepath)
 
-    output.mkdir(parents=True, exist_ok=True)
+    output_dir.mkdir(parents=True, exist_ok=True)
 
     settings = ork_extractor(
         bs=bs,
-        filepath=str(filepath),
-        output_folder=str(output),
-        ork=ork,
+        filepath=str(ork_filepath),
+        output_folder=str(output_dir),
+        ork=ork_document,
     )
     return settings
 
 
 with OpenRocketSession(select_latest_openrocket_jar(ROOT_DIR), "OFF") as session:
-
     # Valetudo 2019
-    filepath = ROOT_DIR / "examples" / "ProjetoJupiter--Valetudo--2019" / "rocket.ork"
-    filepath = extract_ork_from_zip(filepath, filepath.parent)
-    output = ROOT_DIR / "tests" / "acceptance" / "ProjetoJupiter--Valetudo--2019"
-    ork = session.load_doc(str(filepath))
-    settings1 = get_settings(filepath, output, ork)
+    valetudo_filepath = (
+        ROOT_DIR / "examples" / "ProjetoJupiter--Valetudo--2019" / "rocket.ork"
+    )
+    valetudo_filepath = extract_ork_from_zip(
+        valetudo_filepath, valetudo_filepath.parent
+    )
+    valetudo_output_dir = (
+        ROOT_DIR / "tests" / "acceptance" / "ProjetoJupiter--Valetudo--2019"
+    )
+    valetudo_doc = session.load_doc(str(valetudo_filepath))
+    settings1 = get_settings(valetudo_filepath, valetudo_output_dir, valetudo_doc)
 
     @pytest.fixture()
     def valetudo_settings():
         return settings1
 
     # NDRT 2020
-    filepath = ROOT_DIR / "examples" / "NDRT--Rocket--2020" / "rocket.ork"
-    filepath = extract_ork_from_zip(filepath, filepath.parent)
-    output = ROOT_DIR / "tests" / "acceptance" / "NDRT--Rocket--2020"
-    ork = session.load_doc(str(filepath))
-    settings2 = get_settings(filepath, output, ork)
+    ndrt_filepath = ROOT_DIR / "examples" / "NDRT--Rocket--2020" / "rocket.ork"
+    ndrt_filepath = extract_ork_from_zip(ndrt_filepath, ndrt_filepath.parent)
+    ndrt_output_dir = ROOT_DIR / "tests" / "acceptance" / "NDRT--Rocket--2020"
+    ndrt_doc = session.load_doc(str(ndrt_filepath))
+    settings2 = get_settings(ndrt_filepath, ndrt_output_dir, ndrt_doc)
 
     @pytest.fixture()
     def ndrt_settings():
         return settings2
 
     # Bella Lui 2020
-    filepath = ROOT_DIR / "examples" / "EPFL--BellaLui--2020" / "rocket.ork"
-    filepath = extract_ork_from_zip(filepath, filepath.parent)
-    output = ROOT_DIR / "tests" / "acceptance" / "EPFL--BellaLui--2020"
-    ork = session.load_doc(str(filepath))
-    settings3 = get_settings(filepath, output, ork)
+    epfl_filepath = ROOT_DIR / "examples" / "EPFL--BellaLui--2020" / "rocket.ork"
+    epfl_filepath = extract_ork_from_zip(epfl_filepath, epfl_filepath.parent)
+    epfl_output_dir = ROOT_DIR / "tests" / "acceptance" / "EPFL--BellaLui--2020"
+    epfl_doc = session.load_doc(str(epfl_filepath))
+    settings3 = get_settings(epfl_filepath, epfl_output_dir, epfl_doc)
 
     @pytest.fixture()
     def epfl_settings():