From 810409458064e598e2f90ad530c325cfb51e2f52 Mon Sep 17 00:00:00 2001
From: Felix Fischer <f.fischer@ifas.rwth-aachen.de>
Date: Thu, 2 Nov 2023 13:47:22 +0100
Subject: [PATCH] allow pyright to fail
---
.gitlab-ci.yml | 2 +-
src/scientific_plots/default_plots.py | 13 +++++--------
src/scientific_plots/plot_settings.py | 6 ++++--
src/scientific_plots/two_d_plot.py | 2 ++
4 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 008f958..018a8f4 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 2d3b771..5153bb1 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 b418b1e..95eca75 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 8580efe..3ad755d 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] = []
--
GitLab