added ruff

Author: Zohair-coder

.devcontainer/devcontainer.json

@@ -12,10 +12,10 @@
 		"vscode": {
 			"extensions": [
 				"ms-python.python",
-				"ms-python.black-formatter"
+				"charliermarsh.ruff"
 			],
 			"settings": {
-				"editor.defaultFormatter": "ms-python.black-formatter",
+				"editor.defaultFormatter": "charliermarsh.ruff",
 				"editor.formatOnSave": true
 			}
 		}

.github/workflows/functional_test.yml

@@ -11,11 +11,21 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Check code formatting with Black
-      uses: psf/black@stable
+    - name: Install Python
+      uses: actions/setup-python@v5
       with:
-        options: "--check --verbose"
-        src: "./src"
+        python-version: "3.11"
+    
+    - name: Install linter/formatter dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install ruff
+
+    - name: Run Linter
+      run: ruff check --output-format=github src
+    
+    - name: Run Formatter
+      run: ruff format --check src
 
     - name: Set up Docker Compose
       uses: docker/setup-buildx-action@v3

src/db.py

@@ -99,31 +99,29 @@ def bulk_insert_instructors(cur: cursor, course: dict) -> list[int]:
     instructor_data = []
     instructor_names = []
     for instructor in course["instructors"]:
-        instructor_data.append(
+        instructor_data.append((
+            instructor["name"],
             (
-                instructor["name"],
-                (
-                    instructor["rating"]["legacyId"]
-                    if instructor.get("rating", None) is not None
-                    else None
-                ),
-                (
-                    instructor["rating"]["avgDifficulty"]
-                    if instructor.get("rating", None) is not None
-                    else None
-                ),
-                (
-                    instructor["rating"]["avgRating"]
-                    if instructor.get("rating", None) is not None
-                    else None
-                ),
-                (
-                    instructor["rating"]["numRatings"]
-                    if instructor.get("rating", None) is not None
-                    else None
-                ),
-            )
-        )
+                instructor["rating"]["legacyId"]
+                if instructor.get("rating", None) is not None
+                else None
+            ),
+            (
+                instructor["rating"]["avgDifficulty"]
+                if instructor.get("rating", None) is not None
+                else None
+            ),
+            (
+                instructor["rating"]["avgRating"]
+                if instructor.get("rating", None) is not None
+                else None
+            ),
+            (
+                instructor["rating"]["numRatings"]
+                if instructor.get("rating", None) is not None
+                else None
+            ),
+        ))
 
         instructor_names.append(instructor["name"])
 
@@ -155,24 +153,22 @@ def bulk_insert_instructors(cur: cursor, course: dict) -> list[int]:
 def bulk_insert_courses(cur: cursor, courses_data: list[dict]):
     courses = []
     for course in courses_data:
-        courses.append(
-            (
-                course["crn"],
-                course["subject_code"],
-                course["course_number"],
-                course["instruction_type"],
-                course["instruction_method"],
-                course["section"],
-                course["enroll"],
-                course["max_enroll"],
-                course["course_title"],
-                course["credits"],
-                course["prereqs"],
-                course["start_time"],
-                course["end_time"],
-                course["days"],
-            )
-        )
+        courses.append((
+            course["crn"],
+            course["subject_code"],
+            course["course_number"],
+            course["instruction_type"],
+            course["instruction_method"],
+            course["section"],
+            course["enroll"],
+            course["max_enroll"],
+            course["course_title"],
+            course["credits"],
+            course["prereqs"],
+            course["start_time"],
+            course["end_time"],
+            course["days"],
+        ))
 
     cur.executemany(
         """

src/main.py

@@ -36,7 +36,6 @@ def main(args: argparse.Namespace):
 
 
 if __name__ == "__main__":
-
     parser = argparse.ArgumentParser(
         description="Scrape data from Term Master Schedule and save it to a data.json file."
     )
@@ -67,7 +66,7 @@ def main(args: argparse.Namespace):
         if not os.path.exists("performance"):
             os.makedirs("performance")
         cProfile.run("main(args)", "performance/profile_output.pstat")
-    except Exception as e:
+    except Exception:
         trace = traceback.format_exc()
         print(trace)
 

src/parse.py

@@ -7,7 +7,6 @@
 def parse_subject_page(
     html, data: dict, include_ratings: bool = False, ratings_cache: dict = {}
 ):
-
     soup = BeautifulSoup(html, "html.parser")
     table_rows = soup.find_all("tr", class_=["odd", "even"])
 
@@ -82,7 +81,6 @@ def get_instructors(
         name = instructor.strip()
 
         if include_ratings:
-
             # Search for first word and last word in name first
             # If that doesn't work, try first two words
             # If that still doesn't work, don't include rating
@@ -98,19 +96,15 @@ def get_instructors(
 
             rating_obj = ratings_cache[name]
 
-            instructors.append(
-                {
-                    "name": name,
-                    "rating": rating_obj,
-                }
-            )
+            instructors.append({
+                "name": name,
+                "rating": rating_obj,
+            })
 
         else:
-            instructors.append(
-                {
-                    "name": name,
-                }
-            )
+            instructors.append({
+                "name": name,
+            })
 
     return instructors
 
@@ -142,7 +136,6 @@ def fix_encoding_issue(text: str) -> str:
 
 
 def parse_days(d: str):
-
     if d == "TBD":
         return None
 

src/scrape.py

@@ -62,7 +62,6 @@ def scrape_all_subjects(session: Session, data: dict, html: str, include_ratings
     for subject_page_link in college_page_soup.find_all(
         "a", href=lambda href: href and href.startswith("/webtms_du/courseList")
     ):
-
         try:
             response = send_request(
                 session, config.tms_base_url + subject_page_link["href"]