Merge pull request #140 from cisagov/dependabot/pip/prompt-toolkit-3.…

…0.43 Bump prompt-toolkit from 3.0.28 to 3.0.43
cisagov · Jan 8, 2024 · 5fe3b6b · 5fe3b6b
2 parents d533605 + 3cc374a
commit 5fe3b6b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -166,9 +166,6 @@ jobs:
           # library.  The reason is identical to what is discussed here:
           # https://bugzilla.mozilla.org/show_bug.cgi?id=1857492
           # - "3.12"
-        include:
-          - os: ubuntu-20.04
-            python-version: "3.6"
     steps:
       - id: harden-runner
         name: Harden the runner
@@ -279,9 +276,6 @@ jobs:
           # library.  The reason is identical to what is discussed here:
           # https://bugzilla.mozilla.org/show_bug.cgi?id=1857492
           # - "3.12"
-        include:
-          - os: ubuntu-20.04
-            python-version: "3.6"
     steps:
       - id: harden-runner
         name: Harden the runner
@@ -360,9 +354,6 @@ jobs:
           # library.  The reason is identical to what is discussed here:
           # https://bugzilla.mozilla.org/show_bug.cgi?id=1857492
           # - "3.12"
-        include:
-          - os: ubuntu-20.04
-            python-version: "3.6"
     steps:
       - id: harden-runner
         name: Harden the runner

diff --git a/setup.py b/setup.py
@@ -75,7 +75,6 @@ def get_version(version_file):
         # that you indicate whether you support Python 2, Python 3 or both.
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3 :: Only",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
@@ -88,7 +87,7 @@ def get_version(version_file):
         # "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: Implementation :: CPython",
     ],
-    python_requires=">=3.6",
+    python_requires=">=3.7",
     # What does your project relate to?
     keywords="gophish automation",
     packages=find_packages(where="src"),
@@ -100,7 +99,7 @@ def get_version(version_file):
         "docopt >= 0.6.2",
         "gophish >= 0.2.5",
         "httpagentparser",
-        "prompt-toolkit == 3.0.28",
+        "prompt-toolkit == 3.0.43",
         "pytz >= 2019.1",
         "schema",
         "setuptools >= 24.2.0",

diff --git a/src/assessment/builder.py b/src/assessment/builder.py
@@ -593,12 +593,12 @@ def build_pages(id_):
         temp_page.capture_passwords = False
 
         if auto_forward == "yes":
-            setattr(temp_page, "name", f"{id_}-{page_num+1}-AutoForward")
+            setattr(temp_page, "name", f"{id_}-{page_num + 1}-AutoForward")
             temp_page.html = AUTO_FORWARD
             temp_page.redirect_url = get_input("    URL to Redirect to:")
 
         else:
-            temp_page.name = f"{id_}-{page_num+1}-Landing"
+            temp_page.name = f"{id_}-{page_num + 1}-Landing"
             forward = yes_no_prompt("    Will this page forward after action? (yes/no)")
             if forward == "yes":
                 temp_page.redirect_url = get_input("    URL to Redirect to:")

diff --git a/src/assessment/reschedule.py b/src/assessment/reschedule.py
@@ -38,7 +38,7 @@ def display_assessment_dates(assessment):
     print("--------    ------              ---")
     for campaign in assessment.campaigns:
         print(
-            f"  {campaign.name[len(campaign.name) -1 ]}        {campaign.launch_date}    {campaign.complete_date}"
+            f"  {campaign.name[len(campaign.name) - 1]}        {campaign.launch_date}    {campaign.complete_date}"
         )
 
     print()