Use hatch to project and ruff as linter

vsdsantos · vsdsantos · commit f122f0f7607d · 2025-12-06T14:27:56.000+01:00
diff --git a/notebooks/CompositeThermo.ipynb b/notebooks/CompositeThermo.ipynb
@@ -164,7 +164,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from nastran.thermo.analysis.steady_state import SteadyStateThermoAnalysisModel, ThermoSubcase\n",
+    "from nastran.thermo.analysis.steady_state import SteadyStateThermoAnalysisModel\n",
     "\n",
     "params = {\n",
     "    'LGDISP': 1, # uses Large Displacement formulations\n",
diff --git a/notebooks/MetallicThermo.ipynb b/notebooks/MetallicThermo.ipynb
@@ -144,7 +144,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from nastran.thermo.analysis.steady_state import SteadyStateThermoAnalysisModel, ThermoSubcase\n",
+    "from nastran.thermo.analysis.steady_state import SteadyStateThermoAnalysisModel\n",
     "\n",
     "params = {\n",
     "    'LGDISP': 1, # uses Large Displacement formulations\n",
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,43 @@
 [build-system]
-requires = [
-    "setuptools>=42",
-    "wheel"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "nastran-aeroelasticity"
+dynamic = ["version"]
+description = "Some usefull routines for aeroelastic analysis with NASTRAN"
+readme = "README.md"
+license = "MIT"
+requires-python = ">=3.7"
+authors = [
+    { name = "Victor Santos", email = "victorsantos@ufmg.br" },
 ]
-build-backend = "setuptools.build_meta"
+classifiers = [
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3",
+]
+dependencies = [
+    "matplotlib>=3.1.3",
+    "numpy>=1.18.1",
+    "pandas>=1.3",
+    "pyNastran>=1.3.2",
+]
+
+[project.urls]
+"Bug Tracker" = "https://github.com/zuckberj/nastran-aero-flutter/issues"
+Homepage = "https://github.com/zuckberj/nastran-aero-flutter"
+
+[tool.hatch.version]
+path = "src/nastran/__init__.py"
+
+[tool.hatch.build.targets.wheel]
+packages = [
+    " src/nastran",
+]
+
+[tool.hatch.build.targets.sdist]
+include = [
+    "/ src",
+]
+
diff --git a/requirements.txt b/requirements.txt
diff --git a/setup.cfg b/setup.cfg
diff --git a/src/nastran/__init__.py b/src/nastran/__init__.py
@@ -0,0 +1 @@
+__version__="0.2.1"
diff --git a/src/nastran/aero/analysis/flutter.py b/src/nastran/aero/analysis/flutter.py
@@ -1,6 +1,6 @@
 
 from typing import Dict
-from pyNastran.bdf.bdf import BDF, CaseControlDeck
+from pyNastran.bdf.bdf import BDF
 
 from nastran.analysis import AnalysisModel, Subcase
 
diff --git a/src/nastran/aero/superpanels.py b/src/nastran/aero/superpanels.py
@@ -1,7 +1,6 @@
 
 from typing import Any, Dict
 
-from numpy.lib.utils import deprecate
 from nastran.geometry.panels import RectangularPlate
 from nastran.aero.panels import AeroPanel, AeroPanel1, AeroPanel5
 
diff --git a/src/nastran/analysis.py b/src/nastran/analysis.py
@@ -1,4 +1,4 @@
-from abc import ABC, abstractmethod
+from abc import ABC
 from typing import Dict, Type
 from numpy.lib.utils import deprecate
 
@@ -187,7 +187,7 @@ def _write_global_analysis_cards(self):
 
     def _write_params(self):
         # params
-        if self.params == None:
+        if self.params is None:
             print('WARNING: No PARAMS defined')
         else:
             for key, param in self.params.items():
diff --git a/src/nastran/post/f06/common.py b/src/nastran/post/f06/common.py
@@ -1,6 +1,4 @@
-from pandas.core.frame import DataFrame
 
-import pandas as pd
 import numpy as np
 import re
 import calendar
@@ -19,7 +17,7 @@ class F06Page:
 
     def __init__(self, raw_lines=None, meta=None):
         self.raw_lines = raw_lines
-        self.meta = {} if meta == None else meta
+        self.meta = {} if meta is None else meta
         self.parse_page_metadata_header()
     
     def parse_page_metadata_header(self):
@@ -48,8 +46,8 @@ def find_tabular_line_range(lines, shift):
     k = len(lines)
     j = shift # linha após as labels de dados
     while j < k: # primeiro char na linha final da pagina é 1
-        l = lines[j]
-        if _check_skip_lines(l) or l.strip() == '':
+        item = lines[j]
+        if _check_skip_lines(item) or item.strip() == '':
             break
         j += 1
     return (shift, j)        
diff --git a/src/nastran/post/f06/eigval.py b/src/nastran/post/f06/eigval.py
@@ -1,7 +1,6 @@
 import pandas as pd
-import numpy as np
 
-from nastran.post.f06.common import extract_tabulated_data, parse_text_value, find_tabular_line_range, parse_label_subcase, F06Page
+from nastran.post.f06.common import extract_tabulated_data, find_tabular_line_range, parse_label_subcase, F06Page
 
 REALIGVAL_SUBCASE_LINE = 2
 REALIGVAL_TABULAR_LINE = 7
@@ -22,7 +21,7 @@ class RealEigValF06Page(F06Page):
     def __init__(self, df=None, info=None, raw_lines=None, meta=None):
         super().__init__(raw_lines, meta)
         self.df = df
-        self.info = {} if info == None else info
+        self.info = {} if info is None else info
 
     def __repr__(self):
         return self.__str__()
@@ -93,7 +92,7 @@ class ModalEffectiveMassFractionF06Page(F06Page):
     def __init__(self, df=None, info=None, continuation=False, rawlines=None, meta=None):
         super().__init__(rawlines, meta)
         self.df = df
-        self.info = {} if info == None else info
+        self.info = {} if info is None else info
         self.continuation = continuation
     
     @classmethod
diff --git a/src/nastran/post/f06/flutter.py b/src/nastran/post/f06/flutter.py
@@ -1,14 +1,11 @@
-from typing import Union
 
 from copy import copy
 
-from pandas.core.frame import DataFrame
 
 from nastran.post.f06.common import extract_tabulated_data, parse_text_value, find_tabular_line_range, parse_label_subcase, F06Page
 
 import numpy as np
 import pandas as pd
-import matplotlib.pyplot as plt
 
 import re
 
@@ -46,7 +43,7 @@ class FlutterF06Page(F06Page):
     def __init__(self, df=None, info=None, raw_lines=None, meta=None):
         super().__init__(raw_lines, meta)
         self.df = df
-        self.info = {} if info == None else info
+        self.info = {} if info is None else info
 
     def __repr__(self):
         return self.__str__()
diff --git a/src/nastran/post/f06/modal.py b/src/nastran/post/f06/modal.py
@@ -37,10 +37,10 @@ def read_modal_f06(filename: str):
             raw_content = []
             j = i+3 # linha após as labels de dados
             while raw_lines[j][0] != '1': # primeiro char na linha final da pagina é 1
-                l = raw_lines[j]
-                if l.strip() == '':
+                item = raw_lines[j]
+                if item.strip() == '':
                     break
-                raw_content.append(l)
+                raw_content.append(item)
                 j += 1
 
             parsed_data = _parse_content(raw_content)
diff --git a/src/nastran/post/plots.py b/src/nastran/post/plots.py
@@ -5,7 +5,7 @@
 def plot_complex(df: DataFrame, modes=None):
     fig = plt.figure()
     for point, df in df.groupby(level="POINT"):
-        if modes != None and point not in modes:
+        if modes is not None and point not in modes:
             continue
         plt.plot(df.REALEIGVAL, df.IMAGEIGVAL, label="Mode {}".format(int(point)), markevery=4)
     fig.legend()
@@ -15,7 +15,7 @@ def plot_complex(df: DataFrame, modes=None):
 def plot_v_f(df: DataFrame, modes=None):
     fig = plt.figure()
     for point, df in df.groupby(level="POINT"):
-        if modes != None and (point not in modes):
+        if modes is not None and (point not in modes):
             continue
         plt.plot(df.VELOCITY, df.FREQUENCY, label="Mode {}".format(int(point)), markevery=4)
     fig.legend()
@@ -25,7 +25,7 @@ def plot_v_f(df: DataFrame, modes=None):
 def plot_v_g(df: DataFrame, modes=None):
     fig = plt.figure()
     for point, df in df.groupby(level="POINT"):
-        if modes != None and (point not in modes):
+        if modes is not None and (point not in modes):
             continue
         plt.plot(df.VELOCITY, df.DAMPING, markevery=4)
     fig.legend()
@@ -37,7 +37,7 @@ def plot_vf_vg(df: DataFrame, modes=None):
 
     for point, df in df.groupby(level="POINT"):
 
-        if modes != None and (point not in modes):
+        if modes is not None and (point not in modes):
             continue
 
         axs[0].plot(df.VELOCITY, df.FREQUENCY, label="Mode {}".format(int(point)), markevery=4)
diff --git a/src/nastran/structures/bc.py b/src/nastran/structures/bc.py
@@ -27,7 +27,7 @@ def get_bc_ids(self):
 }
 
 def generate_bc_cases(labels_lst):
-    return { i: generate_bc_case(l) for i, l in enumerate(labels_lst) }
+    return { i: generate_bc_case(item) for i, item in enumerate(labels_lst) }
 
 def generate_bc_case(labels):
     """
@@ -53,8 +53,8 @@ def create_spcs_and_subcases(analysis: AnalysisModel, cases, nodes, subcase_clas
         }
         analysis.create_subcase_from_dict(subcase_class, spc.conid, sub_config)
 
-def create_global_case(analysis: AnalysisModel, spc):
-    analysis.set_global_case_from_dict(subcase_class, i, sub_config)
+# def create_global_case(analysis: AnalysisModel, spc):
+#     analysis.set_global_case_from_dict(subcase_class, i, sub_config)
 
 def create_spcs(analysis: AnalysisModel, spcs_dict, nodes):
     for i, spcs in spcs_dict.items():
diff --git a/src/nastran/structures/composite.py b/src/nastran/structures/composite.py
@@ -2,7 +2,6 @@
 from typing import List
 import re
 from pyNastran.bdf.cards.properties.shell import PCOMP
-from pyNastran.bdf.cards.materials import MAT8, MAT5, MAT2
 
 from nastran.structures.material import OrthotropicMaterial
 
@@ -59,8 +58,8 @@ def parse_ply_config(pid, mat, thick, ply_config):
     sheets = []
     lists = re.findall(r'\[(.*?)\]', ply_config)
     mods = re.findall(r'\]([\dsS]*)', ply_config)
-    for l, mod in zip(lists, mods):
-        thetas = re.findall(r'([+-]?[0-9]?[0-9])', l)
+    for item, mod in zip(lists, mods):
+        thetas = re.findall(r'([+-]?[0-9]?[0-9])', item)
         mult = mod.upper().replace('S','')
         if len(mult) > 0 and mult.isnumeric():
             thetas = thetas*int(mult)
diff --git a/src/nastran/structures/material.py b/src/nastran/structures/material.py
@@ -1,13 +1,13 @@
 
-from pyNastran.bdf.cards.materials import MAT8, MAT5, MAT2, MAT1
+from pyNastran.bdf.cards.materials import MAT8, MAT1
 
 class IsotropicMaterial:
     
     def __init__(self, mid, E, nu, G, rho, alpha=None) -> None:
         self.mid = int(mid)
         self.E = float(E)
         self.nu = float(nu)
-        self.G = G if G == None else float(G)
+        self.G = G if G is None else float(G)
         self.rho = float(rho)
         self.alpha = float(alpha) if alpha else None
 
diff --git a/src/nastran/structures/panel.py b/src/nastran/structures/panel.py
@@ -1,13 +1,10 @@
 
-from typing import List
 from pyNastran.bdf.bdf import BDF
 
 from nastran.geometry.panels import RectangularPlate
-from nastran.structures.composite import Ply, OrthotropicMaterial, Sheet
+from nastran.structures.composite import Ply
 from pyNastran.bdf.cards.properties.shell import PSHELL
-from nastran.utils import IdUtility
 
-import numpy as np
 
 
 class StructuralPlate(RectangularPlate):
diff --git a/src/nastran/thermo/analysis/steady_state.py b/src/nastran/thermo/analysis/steady_state.py
@@ -1,6 +1,6 @@
 
 from typing import Dict
-from pyNastran.bdf.bdf import BDF, CaseControlDeck
+from pyNastran.bdf.bdf import BDF
 from nastran.aero.superpanels import SuperAeroPanel5
 
 from nastran.analysis import AnalysisModel, Subcase
diff --git a/tests/test_post.py b/tests/test_post.py
@@ -1,7 +1,7 @@
 import pytest
 
 from nastran.post.f06 import read_f06
-from nastran.post.flutter import join_flutter_pages, flutter_pages_to_df, get_critical_roots, FlutterF06Page
+from nastran.post.f06.flutter import join_flutter_pages, flutter_pages_to_df, get_critical_roots, FlutterF06Page
 
 
 @pytest.fixture
@@ -30,12 +30,12 @@ def flutter_pages_df_critic(flutter_pages_df):
 
 
 def test_read_f06(flutter_f06):
-    assert flutter_f06.pages != None
+    assert flutter_f06.pages is not None
     assert len(flutter_f06.pages) == 70
 
 
 def test_flutter_results1(flutter_pages):
-    assert all(map(lambda p: type(p) == FlutterF06Page, flutter_pages))
+    assert all(map(lambda p: type(p) is FlutterF06Page, flutter_pages))
     assert len(flutter_pages) == 30
 
 
