Updates 241111 (#12)

* Update Python to 3.13 and replace Black/Flake8 with Ruff

Upgraded Python version to 3.13 across pre-commit, pyproject.toml, and GitHub workflows. Replaced Black and Flake8 with Ruff and Ruff-format for linting and formatting in the pre-commit configuration. Updated GitHub workflows and dependencies to support Python 3.13.

* Trigger Build

* Remove unnecessary blank lines and fix docstrings

This commit eliminates redundant blank lines and corrects the formatting of docstrings in various files for consistency. These changes help in maintaining clean and readable code, improving overall code quality without altering functionality.

.github/workflows/main.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.13"
           cache: 'pip'
 
       - name: Install dependencies
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.13"
           cache: 'pip'
 
       - name: Install dependencies
@@ -55,7 +55,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.13"
           cache: 'pip'
 
       - name: Install dependencies
@@ -74,7 +74,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.13"
           cache: 'pip'
 
       - name: Install dependencies
@@ -94,7 +94,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.13"
           cache: 'pip'
 
       - name: Install dependencies
@@ -125,7 +125,7 @@ jobs:
       matrix:
         db: [ sqlite, mariadb ]
         django-version: [ "~=5.0" ]
-        python-version: [ "3.12" ]
+        python-version: ["3.12", "3.13" ]
 
     services:
       mariadb:
@@ -187,7 +187,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.13"
 
       - name: Install dependencies
         run: |
@@ -227,7 +227,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.13"
       - name: Install dependencies
         run: |
           pip install git+https://${{ secrets.ORGANIZATIONAL_REPO_TOKEN }}@github.com/pivotal-energy-solutions/tensor-infrastructure@master#egg=infrastructure

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 default_language_version:
-  python: python3.10
+  python: python3.13
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.0.1
@@ -20,13 +20,12 @@ repos:
       - id: mixed-line-ending
         exclude: .idea/.*
       - id: check-json
-  -   repo: https://github.com/ambv/black
-      rev: 23.3.0
-      hooks:
-      - id: black
-        language_version: python3.10
-  -   repo: https://github.com/pycqa/flake8
-      rev: 5.0.4
-      hooks:
-      - id: flake8
-        language_version: python3.10
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.7.3
+    hooks:
+      # Run the linter.
+      - id: ruff
+        args: [ --fix ]
+      # Run the formatter.
+      - id: ruff-format

appsearch/ormutils.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 """ormutils.py: ORM Utils"""
+
 from functools import reduce
 
 from django.core.exceptions import FieldDoesNotExist

appsearch/registry.py

@@ -361,9 +361,9 @@ def get_searchable_field_choices(self, include_types=False):  # noqa: E731
             choices = map(lambda c: c + (self.get_field_classification(c[0]),), choices)
 
         # Perform a sha hash on the ORM path to get something unique and obscured for the frontend
-        encode_value = lambda pair: (  # noqa: E731
-            (sha((",".join(pair[0])).encode("utf-8")).hexdigest(),) + tuple(pair[1:])
-        )
+        def encode_value(pair):
+            return (sha(",".join(pair[0]).encode("utf-8")).hexdigest(),) + tuple(pair[1:])
+
         return map(encode_value, choices)
 
     def reverse_field_hash(self, hash):

appsearch/tests.py

@@ -5,6 +5,7 @@
 
 Replace this with more appropriate tests for your application.
 """
+
 import re
 from urllib.parse import urlencode
 

demo_app/company/search.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 """search.py: Django company"""
 
-
 from appsearch.registry import ModelSearch, search
 
 from .models import Company

demo_app/users/search.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
-"""search.py: Django """
-
+"""search.py: Django"""
 
 import logging
 

demo_app/users/views.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
-"""views.py.py: """
-
+"""views.py.py:"""
 
 from django.contrib.auth import get_user_model
 

pyproject.toml

@@ -26,6 +26,7 @@ classifiers = [
     "Programming Language :: Python",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Utilities",
 ]
 dependencies = [