Flake8 linter fixes + updating PR lint rules

.github/workflows/lint.yml

@@ -25,5 +25,5 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -r linters-requirements.txt 
-    - name: Lint using built-in script
-      run: bash shell/lint.sh
+    - name: Lint with OpenFL-specific rules
+      run: bash shell/lint.sh

.github/workflows/ubuntu.yml

@@ -16,14 +16,12 @@ jobs:
       uses: actions/setup-python@v3
       with:
         python-version: "3.8"
-    - name: Install dependencies
+    - name: Install linters
       run: |
         python -m pip install --upgrade pip
         pip install -r linters-requirements.txt 
-        pip install .
-    - name: Lint with flake8
-      run: |
-        flake8 --show-source
+    - name: Lint with OpenFL-specific rules
+      run: bash shell/lint.sh
 
   pytest-coverage: # from pytest_coverage.yml
     needs: lint

openfl-workspace/keras_cnn_mnist/src/tfmnist_inmemory.py

@@ -28,10 +28,10 @@ def __init__(self, data_path, batch_size, **kwargs):
         # collaborator list.
         try:
             int(data_path)
-        except:
+        except ValueError:
             raise ValueError(
-                "Expected `%s` to be representable as `int`, as it refers to the data shard " +
-                "number used by the collaborator.",
+                "Expected `%s` to be representable as `int`, as it refers to the data shard "
+                + "number used by the collaborator.",
                 data_path
             )
 

openfl-workspace/keras_cnn_with_compression/src/tfmnist_inmemory.py

@@ -28,10 +28,10 @@ def __init__(self, data_path, batch_size, **kwargs):
         # collaborator list.
         try:
             int(data_path)
-        except:
+        except ValueError:
             raise ValueError(
-                "Expected `%s` to be representable as `int`, as it refers to the data shard " +
-                "number used by the collaborator.",
+                "Expected `%s` to be representable as `int`, as it refers to the data shard "
+                + "number used by the collaborator.",
                 data_path
             )
 

openfl-workspace/torch_cnn_histology/src/dataloader.py

@@ -39,10 +39,10 @@ def __init__(self, data_path, batch_size, **kwargs):
 
         try:
             int(data_path)
-        except:
+        except ValueError:
             raise ValueError(
-                "Expected `%s` to be representable as `int`, as it refers to the data shard " +
-                "number used by the collaborator.",
+                "Expected `%s` to be representable as `int`, as it refers to the data shard "
+                + "number used by the collaborator.",
                 data_path
             )
 

openfl-workspace/torch_cnn_mnist/src/dataloader.py

@@ -28,10 +28,10 @@ def __init__(self, data_path, batch_size, **kwargs):
 
         try:
             int(data_path)
-        except:
+        except ValueError:
             raise ValueError(
-                "Expected `%s` to be representable as `int`, as it refers to the data shard " +
-                "number used by the collaborator.",
+                "Expected `%s` to be representable as `int`, as it refers to the data shard "
+                + "number used by the collaborator.",
                 data_path
             )
 

openfl-workspace/torch_cnn_mnist_eden_compression/src/ptmnist_inmemory.py

@@ -29,10 +29,10 @@ def __init__(self, data_path, batch_size, **kwargs):
 
         try:
             int(data_path)
-        except:
+        except ValueError:
             raise ValueError(
-                "Expected `%s` to be representable as `int`, as it refers to the data shard " +
-                "number used by the collaborator.",
+                "Expected `%s` to be representable as `int`, as it refers to the data shard "
+                + "number used by the collaborator.",
                 data_path
             )
 

openfl-workspace/torch_cnn_mnist_fed_eval/src/ptmnist_inmemory.py

@@ -29,10 +29,10 @@ def __init__(self, data_path, batch_size, **kwargs):
 
         try:
             int(data_path)
-        except:
+        except ValueError:
             raise ValueError(
-                "Expected `%s` to be representable as `int`, as it refers to the data shard " +
-                "number used by the collaborator.",
+                "Expected `%s` to be representable as `int`, as it refers to the data shard "
+                + "number used by the collaborator.",
                 data_path
             )
 

openfl-workspace/torch_cnn_mnist_straggler_check/src/ptmnist_inmemory.py

@@ -28,10 +28,10 @@ def __init__(self, data_path, batch_size, **kwargs):
         # of collaborator list.
         try:
             int(data_path)
-        except:
+        except ValueError:
             raise ValueError(
-                "Expected `%s` to be representable as `int`, as it refers to the data shard " +
-                "number used by the collaborator.",
+                "Expected `%s` to be representable as `int`, as it refers to the data shard "
+                + "number used by the collaborator.",
                 data_path
             )
 

openfl-workspace/torch_unet_kvasir/src/data_loader.py

@@ -124,10 +124,10 @@ def __init__(self, data_path, batch_size, **kwargs):
 
         try:
             int(data_path)
-        except:
+        except ValueError:
             raise ValueError(
-                "Expected `%s` to be representable as `int`, as it refers to the data shard " +
-                "number used by the collaborator.",
+                "Expected `%s` to be representable as `int`, as it refers to the data shard "
+                + "number used by the collaborator.",
                 data_path
             )