Fixed pre-commit hooks

SurajDadral · Dec 15, 2024 · 68ddd38 · 68ddd38
1 parent e784c02
commit 68ddd38
Show file tree

Hide file tree

Showing 21 changed files with 354 additions and 102 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,16 +8,16 @@ exclude: >
   )$
 minimum_pre_commit_version: 1.13.0
 repos:
-  - repo: https://github.com/ambv/black
-    rev: 20.8b1
+  - repo: https://github.com/psf/black
+    rev: 23.9.1
     hooks:
       - id: black
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v2.2.1
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
-  - repo: https://gitlab.com/pycqa/flake8
+  - repo: https://github.com/pycqa/flake8
     rev: 3.7.7
     hooks:
       - id: flake8

diff --git a/BeamReinforcement/HookExtensionEditDialog.py b/BeamReinforcement/HookExtensionEditDialog.py
@@ -57,14 +57,19 @@ def setupUi(self):
                 self.addSet()
                 if self.HookExtensionTuple[layer - 1][i] is None:
                     self.HookExtensionInputFieldList[layer - 1][i].setText(
-                        FreeCAD.Units.Quantity(40.0, FreeCAD.Units.Length).UserString
+                        FreeCAD.Units.Quantity(
+                            40.0, FreeCAD.Units.Length
+                        ).UserString
                     )
                     self.HookExtensionInputFieldList[layer - 1][i].setEnabled(
                         False
                     )
                 else:
                     self.HookExtensionInputFieldList[layer - 1][i].setText(
-                        FreeCAD.Units.Quantity(self.HookExtensionTuple[layer - 1][i], FreeCAD.Units.Length).UserString
+                        FreeCAD.Units.Quantity(
+                            self.HookExtensionTuple[layer - 1][i],
+                            FreeCAD.Units.Length,
+                        ).UserString
                     )
                     self.HookExtensionInputFieldList[layer - 1][i].setEnabled(
                         True
@@ -102,7 +107,9 @@ def addSet(self):
         hook_extension = ui.createWidget("Gui::InputField")
         hook_extension.setProperty("unit", "mm")
         hook_extension.setProperty("minimum", 10)
-        hook_extension.setText(FreeCAD.Units.Quantity(40.0, FreeCAD.Units.Length).UserString)
+        hook_extension.setText(
+            FreeCAD.Units.Quantity(40.0, FreeCAD.Units.Length).UserString
+        )
         h_layout.addWidget(set_label)
         h_layout.addWidget(hook_extension)
         v_layout = self.form.verticalLayout

diff --git a/BeamReinforcement/LayerSpacingEditDialog.py b/BeamReinforcement/LayerSpacingEditDialog.py
@@ -53,7 +53,9 @@ def setupUi(self):
         for layer in range(1, layers_count + 1):
             self.addLayer()
             self.LayerSpacingInputFieldList[layer - 1].setText(
-                FreeCAD.Units.Quantity(self.LayerSpacingTuple[layer - 1], FreeCAD.Units.Length).UserString
+                FreeCAD.Units.Quantity(
+                    self.LayerSpacingTuple[layer - 1], FreeCAD.Units.Length
+                ).UserString
             )
 
     def connectSignalSlots(self):
@@ -68,7 +70,9 @@ def addLayer(self):
         ui = FreeCADGui.UiLoader()
         layer_spacing = ui.createWidget("Gui::InputField")
         layer_spacing.setProperty("unit", "mm")
-        layer_spacing.setText(FreeCAD.Units.Quantity(30.0, FreeCAD.Units.Length).UserString)
+        layer_spacing.setText(
+            FreeCAD.Units.Quantity(30.0, FreeCAD.Units.Length).UserString
+        )
         self.LayerSpacingInputFieldList.append(layer_spacing)
 
         layout = self.form.formLayout

diff --git a/BeamReinforcement/NumberDiameterOffset.py b/BeamReinforcement/NumberDiameterOffset.py
@@ -74,18 +74,20 @@ def setupUi(self):
                     ][0]
                 )
                 diameter.setText(
-                    FreeCAD.Units.Quantity(     
+                    FreeCAD.Units.Quantity(
                         number_diameter_offset_dict["layer" + str(layer + 1)][
                             sets - 1
-                        ][1]
-                    , FreeCAD.Units.Length).UserString
+                        ][1],
+                        FreeCAD.Units.Length,
+                    ).UserString
                 )
                 offset.setText(
                     FreeCAD.Units.Quantity(
                         number_diameter_offset_dict["layer" + str(layer + 1)][
                             sets - 1
-                        ][2]
-                    , FreeCAD.Units.Length).UserString
+                        ][2],
+                        FreeCAD.Units.Length,
+                    ).UserString
                 )
 
     def connectSignalSlots(self):
@@ -125,15 +127,19 @@ def addSetButtonClicked(self, button):
             )
         )
         diameter.setProperty("unit", "mm")
-        diameter.setText(FreeCAD.Units.Quantity(16.0, FreeCAD.Units.Length).UserString)
+        diameter.setText(
+            FreeCAD.Units.Quantity(16.0, FreeCAD.Units.Length).UserString
+        )
         offset = ui.createWidget("Gui::InputField")
         offset.setSizePolicy(
             QtWidgets.QSizePolicy(
                 QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed
             )
         )
         offset.setProperty("unit", "mm")
-        offset.setText(FreeCAD.Units.Quantity(20.0, FreeCAD.Units.Length).UserString)
+        offset.setText(
+            FreeCAD.Units.Quantity(20.0, FreeCAD.Units.Length).UserString
+        )
         h_layout.addWidget(set_label)
         h_layout.addWidget(number)
         h_layout.addWidget(diameter)

diff --git a/BeamReinforcement/ShearRebars_HookExtensionEditDialog.py b/BeamReinforcement/ShearRebars_HookExtensionEditDialog.py
@@ -52,11 +52,17 @@ def setupUi(self):
         for i in range(0, sets):
             self.addSet()
             if self.HookExtensionTuple[i] is None:
-                self.HookExtensionInputFieldList[i].setText(FreeCAD.Units.Quantity(40.0, FreeCAD.Units.Length).UserString)
+                self.HookExtensionInputFieldList[i].setText(
+                    FreeCAD.Units.Quantity(
+                        40.0, FreeCAD.Units.Length
+                    ).UserString
+                )
                 self.HookExtensionInputFieldList[i].setEnabled(False)
             else:
                 self.HookExtensionInputFieldList[i].setText(
-                    FreeCAD.Units.Quantity(self.HookExtensionTuple[i], FreeCAD.Units.Length).UserString
+                    FreeCAD.Units.Quantity(
+                        self.HookExtensionTuple[i], FreeCAD.Units.Length
+                    ).UserString
                 )
                 self.HookExtensionInputFieldList[i].setEnabled(True)
 
@@ -73,7 +79,9 @@ def addSet(self):
         hook_extension = ui.createWidget("Gui::InputField")
         hook_extension.setProperty("unit", "mm")
         hook_extension.setProperty("minimum", 10)
-        hook_extension.setText(FreeCAD.Units.Quantity(40.0, FreeCAD.Units.Length).UserString)
+        hook_extension.setText(
+            FreeCAD.Units.Quantity(40.0, FreeCAD.Units.Length).UserString
+        )
         form_layout = self.form.formLayout
         index = sets
         form_layout.insertRow(index, "Set " + str(sets + 1), hook_extension)

diff --git a/BeamReinforcement/ShearRebars_NumberDiameterOffset.py b/BeamReinforcement/ShearRebars_NumberDiameterOffset.py
@@ -61,8 +61,16 @@ def setupUi(self):
                     "set" + str(i + 1)
                 ]
                 number.setValue(number_diameter_offset_tuple[i][0])
-                diameter.setText(FreeCAD.Units.Quantity(number_diameter_offset_tuple[i][1], FreeCAD.Units.Length).UserString)
-                offset.setText(FreeCAD.Units.Quantity(number_diameter_offset_tuple[i][2], FreeCAD.Units.Length).UserString)
+                diameter.setText(
+                    FreeCAD.Units.Quantity(
+                        number_diameter_offset_tuple[i][1], FreeCAD.Units.Length
+                    ).UserString
+                )
+                offset.setText(
+                    FreeCAD.Units.Quantity(
+                        number_diameter_offset_tuple[i][2], FreeCAD.Units.Length
+                    ).UserString
+                )
 
     def connectSignalSlots(self):
         """This function is used to connect different slots in UI to appropriate
@@ -99,15 +107,19 @@ def addSetButtonClicked(self):
             )
         )
         diameter.setProperty("unit", "mm")
-        diameter.setText(FreeCAD.Units.Quantity(16.0, FreeCAD.Units.Length).UserString)
+        diameter.setText(
+            FreeCAD.Units.Quantity(16.0, FreeCAD.Units.Length).UserString
+        )
         offset = ui.createWidget("Gui::InputField")
         offset.setSizePolicy(
             QtWidgets.QSizePolicy(
                 QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed
             )
         )
         offset.setProperty("unit", "mm")
-        offset.setText(FreeCAD.Units.Quantity(20.0, FreeCAD.Units.Length).UserString)
+        offset.setText(
+            FreeCAD.Units.Quantity(20.0, FreeCAD.Units.Length).UserString
+        )
         h_layout.addWidget(set_label)
         h_layout.addWidget(number)
         h_layout.addWidget(diameter)

diff --git a/BentShapeRebar.py b/BentShapeRebar.py
@@ -682,13 +682,41 @@ def editBentShapeRebar(
 def editDialog(vobj):
     FreeCADGui.Control.closeDialog()
     obj = _BentShapeRebarTaskPanel(vobj.Object)
-    obj.form.frontCover.setText(FreeCAD.Units.Quantity(vobj.Object.FrontCover, FreeCAD.Units.Length).UserString)
-    obj.form.l_sideCover.setText(FreeCAD.Units.Quantity(vobj.Object.LeftCover, FreeCAD.Units.Length).UserString)
-    obj.form.r_sideCover.setText(FreeCAD.Units.Quantity(vobj.Object.RightCover, FreeCAD.Units.Length).UserString)
-    obj.form.bottomCover.setText(FreeCAD.Units.Quantity(vobj.Object.BottomCover, FreeCAD.Units.Length).UserString)
-    obj.form.diameter.setText(FreeCAD.Units.Quantity(vobj.Object.Diameter, FreeCAD.Units.Length).UserString)
-    obj.form.topCover.setText(FreeCAD.Units.Quantity(vobj.Object.TopCover, FreeCAD.Units.Length).UserString)
-    obj.form.bentLength.setText(FreeCAD.Units.Quantity(vobj.Object.BentLength, FreeCAD.Units.Length).UserString)
+    obj.form.frontCover.setText(
+        FreeCAD.Units.Quantity(
+            vobj.Object.FrontCover, FreeCAD.Units.Length
+        ).UserString
+    )
+    obj.form.l_sideCover.setText(
+        FreeCAD.Units.Quantity(
+            vobj.Object.LeftCover, FreeCAD.Units.Length
+        ).UserString
+    )
+    obj.form.r_sideCover.setText(
+        FreeCAD.Units.Quantity(
+            vobj.Object.RightCover, FreeCAD.Units.Length
+        ).UserString
+    )
+    obj.form.bottomCover.setText(
+        FreeCAD.Units.Quantity(
+            vobj.Object.BottomCover, FreeCAD.Units.Length
+        ).UserString
+    )
+    obj.form.diameter.setText(
+        FreeCAD.Units.Quantity(
+            vobj.Object.Diameter, FreeCAD.Units.Length
+        ).UserString
+    )
+    obj.form.topCover.setText(
+        FreeCAD.Units.Quantity(
+            vobj.Object.TopCover, FreeCAD.Units.Length
+        ).UserString
+    )
+    obj.form.bentLength.setText(
+        FreeCAD.Units.Quantity(
+            vobj.Object.BentLength, FreeCAD.Units.Length
+        ).UserString
+    )
     obj.form.bentAngle.setValue(vobj.Object.BentAngle)
     obj.form.rounding.setValue(vobj.Object.Rounding)
     obj.form.orientationValue.setCurrentIndex(
@@ -701,7 +729,11 @@ def editDialog(vobj):
         obj.form.spacing_radio.setChecked(True)
         obj.form.amount.setDisabled(True)
         obj.form.spacing.setEnabled(True)
-        obj.form.spacing.setText(FreeCAD.Units.Quantity(vobj.Object.TrueSpacing, FreeCAD.Units.Length).UserString)
+        obj.form.spacing.setText(
+            FreeCAD.Units.Quantity(
+                vobj.Object.TrueSpacing, FreeCAD.Units.Length
+            ).UserString
+        )
     # obj.form.PickSelectedFace.setVisible(False)
     FreeCADGui.Control.showDialog(obj)
 

diff --git a/BillOfMaterial/BOMPreferences.py b/BillOfMaterial/BOMPreferences.py
@@ -352,7 +352,7 @@ def getDiaWeightMap(self) -> Dict[float, FreeCAD.Units.Quantity]:
         dia_weight_map = {}
         for dia in self.dia_weight_map.GetFloats():
             weight = self.dia_weight_map.GetFloat(dia)
-            weight = FreeCAD.Units.Quantity(str(weight * 10 ** 3) + "kg/m")
+            weight = FreeCAD.Units.Quantity(str(weight * 10**3) + "kg/m")
             dia_weight_map[int(dia)] = weight
         return dia_weight_map
 

diff --git a/ColumnReinforcement/MainColumnReinforcement.py b/ColumnReinforcement/MainColumnReinforcement.py
@@ -132,14 +132,26 @@ def setDefaultValues(self):
         self.form.ties_configuration.setCurrentIndex(
             self.form.ties_configuration.findText("SingleTie")
         )
-        self.ties_widget.ties_leftCover.setText(FreeCAD.Units.Quantity(40.00, "mm").UserString)
-        self.ties_widget.ties_rightCover.setText(FreeCAD.Units.Quantity(40.00, "mm").UserString)
-        self.ties_widget.ties_topCover.setText(FreeCAD.Units.Quantity(40.00, "mm").UserString)
-        self.ties_widget.ties_bottomCover.setText(FreeCAD.Units.Quantity(40.00, "mm").UserString)
+        self.ties_widget.ties_leftCover.setText(
+            FreeCAD.Units.Quantity(40.00, "mm").UserString
+        )
+        self.ties_widget.ties_rightCover.setText(
+            FreeCAD.Units.Quantity(40.00, "mm").UserString
+        )
+        self.ties_widget.ties_topCover.setText(
+            FreeCAD.Units.Quantity(40.00, "mm").UserString
+        )
+        self.ties_widget.ties_bottomCover.setText(
+            FreeCAD.Units.Quantity(40.00, "mm").UserString
+        )
         self.ties_widget.ties_allCoversEqual.setChecked(True)
         self.tiesAllCoversEqualClicked()
-        self.ties_widget.ties_offset.setText(FreeCAD.Units.Quantity(100.00, "mm").UserString)
-        self.ties_widget.ties_diameter.setText(FreeCAD.Units.Quantity(8.00, "mm").UserString)
+        self.ties_widget.ties_offset.setText(
+            FreeCAD.Units.Quantity(100.00, "mm").UserString
+        )
+        self.ties_widget.ties_diameter.setText(
+            FreeCAD.Units.Quantity(8.00, "mm").UserString
+        )
         self.ties_widget.ties_bentAngle.setCurrentIndex(
             self.ties_widget.ties_bentAngle.findText("135")
         )
@@ -149,7 +161,9 @@ def setDefaultValues(self):
         self.ties_widget.ties_number.setEnabled(True)
         self.ties_widget.ties_spacing.setEnabled(False)
         self.ties_widget.ties_number.setValue(5)
-        self.ties_widget.ties_spacing.setText(FreeCAD.Units.Quantity(100.00, "mm").UserString)
+        self.ties_widget.ties_spacing.setText(
+            FreeCAD.Units.Quantity(100.00, "mm").UserString
+        )
         # Set Main Rebars data
         self.main_rebars_widget.main_rebars_type.setCurrentIndex(
             self.main_rebars_widget.main_rebars_type.findText("StraightRebar")
@@ -164,11 +178,19 @@ def setDefaultValues(self):
                 "x-axis"
             )
         )
-        self.main_rebars_widget.main_rebars_hookExtension.setText(FreeCAD.Units.Quantity(40.00, "mm").UserString)
+        self.main_rebars_widget.main_rebars_hookExtension.setText(
+            FreeCAD.Units.Quantity(40.00, "mm").UserString
+        )
         self.main_rebars_widget.main_rebars_rounding.setValue(2)
-        self.main_rebars_widget.main_rebars_topOffset.setText(FreeCAD.Units.Quantity(0.00, "mm").UserString)
-        self.main_rebars_widget.main_rebars_bottomOffset.setText(FreeCAD.Units.Quantity(0.00, "mm").UserString)
-        self.main_rebars_widget.main_rebars_diameter.setText(FreeCAD.Units.Quantity(20.00, "mm").UserString)
+        self.main_rebars_widget.main_rebars_topOffset.setText(
+            FreeCAD.Units.Quantity(0.00, "mm").UserString
+        )
+        self.main_rebars_widget.main_rebars_bottomOffset.setText(
+            FreeCAD.Units.Quantity(0.00, "mm").UserString
+        )
+        self.main_rebars_widget.main_rebars_diameter.setText(
+            FreeCAD.Units.Quantity(20.00, "mm").UserString
+        )
         # Set Secondary Xdir Rebars Data
         self.sec_xdir_rebars_widget.xdir_rebars_type.setCurrentIndex(
             self.sec_xdir_rebars_widget.xdir_rebars_type.findText(
@@ -184,8 +206,12 @@ def setDefaultValues(self):
             FreeCAD.Units.Quantity(40.00, "mm").UserString
         )
         self.sec_xdir_rebars_widget.xdir_rebars_rounding.setValue(1)
-        self.sec_xdir_rebars_widget.xdir_rebars_topOffset.setText(FreeCAD.Units.Quantity(0.00, "mm").UserString)
-        self.sec_xdir_rebars_widget.xdir_rebars_bottomOffset.setText(FreeCAD.Units.Quantity(0.00, "mm").UserString)
+        self.sec_xdir_rebars_widget.xdir_rebars_topOffset.setText(
+            FreeCAD.Units.Quantity(0.00, "mm").UserString
+        )
+        self.sec_xdir_rebars_widget.xdir_rebars_bottomOffset.setText(
+            FreeCAD.Units.Quantity(0.00, "mm").UserString
+        )
         self.sec_xdir_rebars_widget.numberDiameter.setText(
             "2#20mm+1#16mm+2#20mm"
         )
@@ -204,22 +230,40 @@ def setDefaultValues(self):
             FreeCAD.Units.Quantity(40.00, "mm").UserString
         )
         self.sec_ydir_rebars_widget.ydir_rebars_rounding.setValue(1)
-        self.sec_ydir_rebars_widget.ydir_rebars_topOffset.setText(FreeCAD.Units.Quantity(0.00, "mm").UserString)
-        self.sec_ydir_rebars_widget.ydir_rebars_bottomOffset.setText(FreeCAD.Units.Quantity(0.00, "mm").UserString)
+        self.sec_ydir_rebars_widget.ydir_rebars_topOffset.setText(
+            FreeCAD.Units.Quantity(0.00, "mm").UserString
+        )
+        self.sec_ydir_rebars_widget.ydir_rebars_bottomOffset.setText(
+            FreeCAD.Units.Quantity(0.00, "mm").UserString
+        )
         self.sec_ydir_rebars_widget.numberDiameter.setText(
             "1#20mm+1#16mm+1#20mm"
         )
         # Set circular column data
-        self.circular_column_widget.sideCover.setText(FreeCAD.Units.Quantity(20.00, "mm").UserString)
-        self.circular_column_widget.helical_rebars_topOffset.setText(FreeCAD.Units.Quantity(40.00, "mm").UserString)
+        self.circular_column_widget.sideCover.setText(
+            FreeCAD.Units.Quantity(20.00, "mm").UserString
+        )
+        self.circular_column_widget.helical_rebars_topOffset.setText(
+            FreeCAD.Units.Quantity(40.00, "mm").UserString
+        )
         self.circular_column_widget.helical_rebars_bottomOffset.setText(
             FreeCAD.Units.Quantity(40.00, "mm").UserString
         )
-        self.circular_column_widget.pitch.setText(FreeCAD.Units.Quantity(50.00, "mm").UserString)
-        self.circular_column_widget.helical_rebars_diameter.setText(FreeCAD.Units.Quantity(8.00, "mm").UserString)
-        self.circular_column_widget.main_rebars_topOffset.setText(FreeCAD.Units.Quantity(20.00, "mm").UserString)
-        self.circular_column_widget.main_rebars_bottomOffset.setText(FreeCAD.Units.Quantity(20.00, "mm").UserString)
-        self.circular_column_widget.main_rebars_diameter.setText(FreeCAD.Units.Quantity(16.00, "mm").UserString)
+        self.circular_column_widget.pitch.setText(
+            FreeCAD.Units.Quantity(50.00, "mm").UserString
+        )
+        self.circular_column_widget.helical_rebars_diameter.setText(
+            FreeCAD.Units.Quantity(8.00, "mm").UserString
+        )
+        self.circular_column_widget.main_rebars_topOffset.setText(
+            FreeCAD.Units.Quantity(20.00, "mm").UserString
+        )
+        self.circular_column_widget.main_rebars_bottomOffset.setText(
+            FreeCAD.Units.Quantity(20.00, "mm").UserString
+        )
+        self.circular_column_widget.main_rebars_diameter.setText(
+            FreeCAD.Units.Quantity(16.00, "mm").UserString
+        )
         self.circular_column_widget.main_rebars_number_radio.setChecked(True)
         self.circular_column_widget.main_rebars_angle_radio.setChecked(False)
         self.circular_column_widget.main_rebars_number.setEnabled(True)