Merge remote-tracking branch 'origin/master'

romainsacchi · Aug 29, 2024 · 7969a29 · 7969a29
2 parents 14dd905 + 1c653b5
commit 7969a29
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 18 deletions.
diff --git a/carculator_bus/model.py b/carculator_bus/model.py
@@ -195,9 +195,11 @@ def set_all(self):
                             parameter=["average passengers"],
                             powertrain=pt,
                             year=y,
-                            value="reference"
-                            if "reference" in self.array.coords["value"]
-                            else 0,
+                            value=(
+                                "reference"
+                                if "reference" in self.array.coords["value"]
+                                else 0
+                            ),
                             size=s,
                         ).values,
                         1,
@@ -209,9 +211,11 @@ def set_all(self):
                             parameter="is_compliant",
                             powertrain=pt,
                             year=y,
-                            value="reference"
-                            if "reference" in self.array.coords["value"]
-                            else 0,
+                            value=(
+                                "reference"
+                                if "reference" in self.array.coords["value"]
+                                else 0
+                            ),
                             size=s,
                         ).values,
                         val,
@@ -224,9 +228,11 @@ def set_all(self):
                             parameter="has_schedule_issue",
                             powertrain=pt,
                             year=y,
-                            value="reference"
-                            if "reference" in self.array.coords["value"]
-                            else 0,
+                            value=(
+                                "reference"
+                                if "reference" in self.array.coords["value"]
+                                else 0
+                            ),
                             size=s,
                         ).values,
                         "O",
@@ -239,9 +245,11 @@ def set_all(self):
                             parameter="is_too_heavy",
                             powertrain=pt,
                             year=y,
-                            value="reference"
-                            if "reference" in self.array.coords["value"]
-                            else 0,
+                            value=(
+                                "reference"
+                                if "reference" in self.array.coords["value"]
+                                else 0
+                            ),
                             size=s,
                         ).values,
                         "X",
@@ -254,9 +262,11 @@ def set_all(self):
                             parameter="is_available",
                             powertrain=pt,
                             year=y,
-                            value="reference"
-                            if "reference" in self.array.coords["value"]
-                            else 0,
+                            value=(
+                                "reference"
+                                if "reference" in self.array.coords["value"]
+                                else 0
+                            ),
                             size=s,
                         ).values,
                         val,

diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
-carculator_utils==1.2.0.dev3
-prettytable
+carculator_utils>=1.2.0.dev5
+prettytable
diff --git a/setup.py b/setup.py
@@ -42,7 +42,7 @@ def package_files(directory):
     },
     python_requires=">=3.10",
     install_requires=[
-        "carculator_utils==1.2.0.dev3",
+        "carculator_utils>=1.2.0.dev5",
         "prettytable",
     ],
     url="https://github.com/romainsacchi/carculator_bus",