fix linter workflow (facebookresearch#256)

Summary:
Pull Request resolved: facebookresearch#256

our linter is finding some "vulnerabilities" which are intentional - e.g. the bidirectional unicode character which we use as part of our text attacks. skipping

Reviewed By: joelicohk

Differential Revision: D68521953

fbshipit-source-id: 207972838b7b02871580641fa8d810ab14b32924

Author: jbitton

.github/workflows/lint_python.yml

@@ -10,12 +10,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
-      - run: pip install bandit click==8.0.4 black==22.3.0 codespell flake8 isort pyre-check pytest pyupgrade safety
-      - run: bandit --recursive --skip B101,B301,B303,B311,B324,B403 .
+      - run: pip install bandit click==8.0.4 black==22.3.0 codespell flake8 isort pyre-check pytest pyupgrade
+      - run: bandit --recursive --skip B101,B301,B303,B311,B324,B403,B613 .
       - run: black --check .
       - run: codespell --ignore-words-list="tha" --skip="*/text_tests,*assets/text/*,*examples/*,*/text/augmenters/utils.py"
       - run: flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
       - run: flake8 . --count --exit-zero --max-complexity=15 --max-line-length=90 --show-source --statistics
       - run: isort --check-only --profile black . || true
       - run: shopt -s globstar && pyupgrade --py36-plus **/*.py || true
-      - run: safety check

.github/workflows/test_python.yml

@@ -14,7 +14,7 @@ jobs:
           python-version: '3.9'
       - run: sudo apt-get update
       - run: sudo apt-get install --fix-missing ffmpeg python3-soundfile
-      - run: pip install pyre-check pytest torchvision
+      - run: pip install pyre-check pytest
       - run: pip install -e .[all]
       - run: pyre --source-directory "." --noninteractive check || true
       - run: pytest --durations=10 .

augly/image/functional.py

@@ -1655,7 +1655,7 @@ def overlay_wrap_text(
 
     @param metadata : List to store metadata about the function execution
 
-    @returns: Image with text overlayed
+    @returns: Image with text overlaid
     """
     rand = random.Random(random_seed)
 
@@ -2067,7 +2067,7 @@ def random_noise(
     """
     assert type(mean) in [float, int], "Mean must be an integer or a float"
     assert type(var) in [float, int], "Variance must be an integer or a float"
-    assert type(seed) == int, "Seed must be an integer"
+    assert type(seed) is int, "Seed must be an integer"
 
     image = imutils.validate_and_load_image(image)
 
@@ -2147,8 +2147,8 @@ def resize(
 
     @returns: the augmented PIL Image
     """
-    assert width is None or type(width) == int, "Width must be an integer"
-    assert height is None or type(height) == int, "Height must be an integer"
+    assert width is None or type(width) is int, "Width must be an integer"
+    assert height is None or type(height) is int, "Height must be an integer"
 
     image = imutils.validate_and_load_image(image)
 

augly/image/helpers.py

@@ -58,7 +58,7 @@ def fit_text_in_bbox(
 
     @param rand: Random number generator
 
-    @returns: x and y coordinates to start writing, text split into lines, line heigh, and font style
+    @returns: x and y coordinates to start writing, text split into lines, line height, and font style
     """
     x_min = int(img_width * 0.05)  # reserves 5% on the left
     x_max = int(img_width * 0.5)  # starts writing at the center of the image
@@ -77,7 +77,7 @@ def fit_text_in_bbox(
         _, _, _, line_height = font.getbbox("hg")
 
         y_min = int(img_height * 0.05)  # reserves 5% on the top
-        y_max = int(img_height * 0.9)  # reseves 10% to the bottom
+        y_max = int(img_height * 0.9)  # reserves 10% to the bottom
         y_max -= (
             len(lines) * line_height
         )  # adjust max y-coordinate for text height and number of lines

augly/image/requirements.txt

@@ -1,3 +1,2 @@
 numpy>=1.19.5
 Pillow>=9.0.0
-torch>=1.9.0

augly/image/transforms.py

@@ -58,7 +58,7 @@ def __call__(
         @returns: Augmented PIL Image
         """
         assert isinstance(image, Image.Image), "Image passed in must be a PIL Image"
-        assert type(force) == bool, "Expected type bool for variable `force`"
+        assert type(force) is bool, "Expected type bool for variable `force`"
 
         if not force and random.random() > self.p:
             return image
@@ -1525,7 +1525,7 @@ def __init__(
 
         @param p: the probability of the transform being applied; default value is 1.0
 
-        @returns: Image with text overlayed
+        @returns: Image with text overlaid
         """
         super().__init__(p)
         self.text, self.color = text, color

augly/tests/audio_tests/functional_unit_test.py

@@ -7,9 +7,8 @@
 
 import unittest
 
-from aml.augly.tests.audio_tests.base_unit_test import BaseAudioUnitTest
-
 from augly import audio as audaugs
+from augly.tests.audio_tests.base_unit_test import BaseAudioUnitTest
 
 
 class FunctionalAudioUnitTest(BaseAudioUnitTest):

augly/tests/audio_tests/transforms_unit_test.py

@@ -10,8 +10,8 @@
 import unittest
 
 import numpy as np
-from aml.augly.tests.audio_tests.base_unit_test import BaseAudioUnitTest
 from augly import audio as audaugs
+from augly.tests.audio_tests.base_unit_test import BaseAudioUnitTest
 from augly.utils import AUDIO_METADATA_PATH
 
 

augly/tests/image_tests/pytorch_test.py

@@ -9,10 +9,9 @@
 import random
 import unittest
 
-from aml.augly.tests.video_tests.base_unit_test import BaseVideoUnitTest
-
 from augly import audio as audaugs, video as vidaugs
 from augly.tests.base_configs import VideoAugConfig
+from augly.tests.video_tests.base_unit_test import BaseVideoUnitTest
 from augly.utils import VIDEO_METADATA_PATH
 from augly.utils.ffmpeg import get_conditional_for_skipping_video_tests
 

augly/tests/video_tests/transforms/composite_test.py

@@ -8,9 +8,8 @@
 import json
 import unittest
 
-from aml.augly.tests.video_tests.base_unit_test import BaseVideoUnitTest
-
 from augly import video as vidaugs
+from augly.tests.video_tests.base_unit_test import BaseVideoUnitTest
 from augly.utils import VIDEO_METADATA_PATH
 
 

augly/tests/video_tests/transforms/cv2_test.py

@@ -8,10 +8,9 @@
 import json
 import unittest
 
-from aml.augly.tests.video_tests.base_unit_test import BaseVideoUnitTest
-
 from augly import video as vidaugs
 from augly.tests.base_configs import VideoAugConfig
+from augly.tests.video_tests.base_unit_test import BaseVideoUnitTest
 from augly.utils import VIDEO_METADATA_PATH
 
 

augly/tests/video_tests/transforms/ffmpeg_test.py

@@ -8,10 +8,9 @@
 import json
 import unittest
 
-from aml.augly.tests.video_tests.base_unit_test import BaseVideoUnitTest
-
 from augly import video as vidaugs
 from augly.tests.base_configs import VideoAugConfig
+from augly.tests.video_tests.base_unit_test import BaseVideoUnitTest
 from augly.utils import VIDEO_METADATA_PATH
 from augly.utils.ffmpeg import get_conditional_for_skipping_video_tests
 

augly/tests/video_tests/transforms/image_based_test.py

@@ -58,7 +58,7 @@ def __init__(
             fontscales[0] > 0 and fontscales[1] > fontscales[0]
         ), "Fontscale ranges must be greater than zero and the second value must be greater than the first"  # noqa: B950
         assert thickness is None or (
-            type(thickness) == int and thickness > 0
+            type(thickness) is int and thickness > 0
         ), "Invalid thickness provided: must be set to None or be an integer greater than zero"  # noqa: B950
 
         super().__init__(1, random_movement, topleft, bottomright, **kwargs)