build(devex): strip out pyright and bump ruff

Author: heysamtexas

.pre-commit-config.yaml

@@ -3,7 +3,7 @@
 repos:
 
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.6.0
+  rev: v5.0.0
   hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
@@ -12,16 +12,11 @@ repos:
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.6.6
+  rev: v0.7.1
   hooks:
     # Run the linter.
     - id: ruff
       exclude: ruff.xml
     # Run the formatter.
     - id: ruff-format
       exclude: ruff.xml
-
-- repo: https://github.com/RobertCraigie/pyright-python
-  rev: v1.1.387
-  hooks:
-    - id: pyright

pyproject.toml

@@ -61,49 +61,3 @@ version_files = [
     "pyproject.toml:^version",
     "Dockerfile:VERSION",
 ]
-
-[tool.pyright]
-include = ["src"]
-typeCheckingMode = "basic"
-exclude = [
-    "**/tests",
-    "**/migrations",
-    "**/__pycache__",
-    "**/node_modules",
-    ".git",
-]
-
-# Django-specific settings
-reportMissingImports = true
-reportGeneralTypeIssues = "warning"
-reportMissingTypeStubs = false
-reportUnknownMemberType = "warning"
-reportUnknownParameterType = "warning"
-reportUnknownVariableType = "warning"
-reportUntypedFunctionDecorator = "warning"
-reportOptionalSubscript = true
-reportOptionalMemberAccess = true
-reportOptionalCall = true
-
-# Important for Django
-reportUnknownArgumentType = "warning"
-reportUnusedImport = "warning"
-reportDuplicateImport = "error"
-
-pythonVersion = "3.12"
-pythonPlatform = "Linux"
-
-# Virtual environment settings
-venvPath = "."
-venv = ".venv"
-
-# Django-specific type checking settings
-stubPath = "typings"
-
-
-# Additional Django settings
-extraPaths = ["src"]
-
-[tool.django-stubs]
-django_settings_module = "config.settings"  # Adjust this to your settings module path
-strict_settings = true

src/organizations/forms.py

@@ -82,7 +82,7 @@ class AcceptInviteChangePasswordForm(forms.Form):
     password = forms.CharField(widget=forms.PasswordInput)
     confirm_password = forms.CharField(widget=forms.PasswordInput)
 
-    def clean(self) -> dict:
+    def clean(self) -> dict[str, str]:
         """Validate that the passwords match."""
         cleaned_data = super().clean() or {}
         password = cleaned_data.get("password")

src/organizations/tests/test_forms.py

@@ -11,15 +11,9 @@
 class OrganizationInviteFormTest(TestCase):
     def setUp(self):
         self.organization = Organization.objects.create(name="Test Org")
-        self.owner = User.objects.create_user(
-            username="owner", email="[email protected]", password="password"
-        )
-        self.admin = User.objects.create_user(
-            username="admin", email="[email protected]", password="password"
-        )
-        self.member = User.objects.create_user(
-            username="member", email="[email protected]", password="password"
-        )
+        self.owner = User.objects.create_user(username="owner", email="[email protected]", password="password")
+        self.admin = User.objects.create_user(username="admin", email="[email protected]", password="password")
+        self.member = User.objects.create_user(username="member", email="[email protected]", password="password")
 
         OrganizationMember.objects.create(
             user=self.owner,
@@ -38,19 +32,16 @@ def setUp(self):
         )
 
     def test_form_initialization(self):
-        form = OrganizationInviteForm(
-            initial={"organization": self.organization, "invited_by": self.owner}
-        )
+        form = OrganizationInviteForm(initial={"organization": self.organization, "invited_by": self.owner})
         self.assertIn("role", form.fields)
         self.assertEqual(len(form.fields["role"].choices), 3)  # OWNER, ADMIN, MEMBER
 
-        form = OrganizationInviteForm(
-            initial={"organization": self.organization, "invited_by": self.admin}
-        )
+        form = OrganizationInviteForm(initial={"organization": self.organization, "invited_by": self.admin})
+        print(form.fields["role"].choices)
         self.assertEqual(len(form.fields["role"].choices), 2)  # ADMIN, MEMBER
 
     def test_clean_role(self):
-        form_data = {
+        form_data: dict = {
             "email": "[email protected]",
             "role": OrganizationMember.RoleChoices.OWNER,
         }
@@ -92,27 +83,21 @@ def test_clean(self):
         form.instance.organization = self.organization
         form.instance.invited_by = self.owner
         self.assertFalse(form.is_valid())
-        self.assertIn(
-            "User is already a member of this organization.", form.errors["__all__"]
-        )
+        self.assertIn("User is already a member of this organization.", form.errors["__all__"])
 
         form_data = {
             "email": "[email protected]",
             "role": OrganizationMember.RoleChoices.MEMBER,
         }
-        Invitation.objects.create(
-            organization=self.organization, email="[email protected]"
-        )
+        Invitation.objects.create(organization=self.organization, email="[email protected]")
         form = OrganizationInviteForm(
             data=form_data,
             initial={"organization": self.organization, "invited_by": self.owner},
         )
         form.instance.organization = self.organization
         form.instance.invited_by = self.owner
         self.assertFalse(form.is_valid())
-        self.assertIn(
-            "User is already invited to this organization.", form.errors["__all__"]
-        )
+        self.assertIn("User is already invited to this organization.", form.errors["__all__"])
 
 
 class AcceptInviteChangePasswordFormTest(TestCase):

src/organizations/tests/views/test_organizations.py

@@ -13,17 +13,15 @@ class OrganizationViewsTests(TestCase):
     def setUp(self):
         self.user = User.objects.create_user(username="testuser", password="password")
         self.client.login(username="testuser", password="password")
-        self.organization = Organization.objects.create(
-            name="Test Org", slug="test-org"
-        )
+        self.organization = Organization.objects.create(name="Test Org", slug="test-org")
         self.org_member = OrganizationMember.objects.create(
             organization=self.organization,
             user=self.user,
             role=OrganizationMember.RoleChoices.OWNER,
         )
 
     def test_index_view_renders_correct_template(self):
-        response = self.client.get(reverse("organizations:index"))
+        response = self.client.get(reverse("organizations:list"))
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, "organizations/index.html")
 
@@ -41,8 +39,6 @@ def test_create_organization_creates_new_org(self):
         self.assertTrue(Organization.objects.filter(name="New Org").exists())
 
     def test_detail_view_renders_correct_template(self):
-        response = self.client.get(
-            reverse("organizations:detail", args=[self.organization.slug])
-        )
+        response = self.client.get(reverse("organizations:detail", args=[self.organization.slug]))
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, "organizations/detail.html")