diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 008f958b8ac61f6209c21adfc24891bad6e69b74..018a8f4208db02b987a0b01dd46ab9e38a7fed93 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,6 +32,7 @@ secret_detection: pyright: stage: static analysis + allow_failure: true needs: [flake8] before_script: - *python @@ -92,7 +93,6 @@ mypy: - mypy src/scientific_plots - mypy src/ - python-tests: stage: testing script: diff --git a/src/scientific_plots/default_plots.py b/src/scientific_plots/default_plots.py index 2d3b7717cc9709362ba8b64045f0a227fcf0620e..5153bb1a9ceecd811919fc1ec73717e523c9ac3e 100644 --- a/src/scientific_plots/default_plots.py +++ b/src/scientific_plots/default_plots.py @@ -185,15 +185,12 @@ def plot_fit(X: In, Y: In, n_fit = 1000 - _fit_function: Callable[[float], float] - if args is not None: - - @wraps(fit_function) - def _fit_function(x: float) -> float: - """This is the function, which has been fitted""" + @wraps(fit_function) + def _fit_function(x: float) -> float: + """This is the function, which has been fitted""" + if args is not None: return fit_function(x, *args) - else: - _fit_function = fit_function + return fit_function(x) plt.plot(X, Y, label="data") X_fit = [ diff --git a/src/scientific_plots/plot_settings.py b/src/scientific_plots/plot_settings.py index b418b1ef321f85fe84601e195960230d866c63dd..95eca75fca74f84d7708f30ba60e41a8c771e620 100644 --- a/src/scientific_plots/plot_settings.py +++ b/src/scientific_plots/plot_settings.py @@ -228,8 +228,8 @@ def read_data_plot(filename: Union[str, Path])\ data: dict[str, tuple[Vector, Vector]] = {} with open(filename, "r", newline="", encoding="utf-8") as file_: reader = csv.reader(file_) - title: str - x_data: Vector + title: str = "" + x_data: Optional[Vector] = None for i, row in enumerate(reader): if i % 3 == 0: title = row[0] @@ -238,6 +238,8 @@ def read_data_plot(filename: Union[str, Path])\ else: y_data: Vector y_data = np.array(row, dtype=float) + assert x_data is not None + assert title data[title] = (x_data, y_data) return data diff --git a/src/scientific_plots/two_d_plot.py b/src/scientific_plots/two_d_plot.py index 8580efe9211dd6416466a1a0662dc68c81235efd..3ad755d736ccfa42f13830cb1d1fd186787bcb57 100644 --- a/src/scientific_plots/two_d_plot.py +++ b/src/scientific_plots/two_d_plot.py @@ -96,6 +96,8 @@ def get_leakage(data: Iterable[Any], var: str = "density", @return list of the same dimension for the leakage""" if surface_file is None: surface_path = join(SURFACEFOLDER, "c_q.dat") + else: + surface_path = surface_file leakage_bin = join(".", "subroutines", "bin", "test_leakage") Y: list[float] = [] X: list[float] = []