Merge branch 'master' into antonpirker/openai-agents-guardrail-span

Author: antonpirker

.coveragerc36

@@ -3,12 +3,12 @@
 
 [run]
 branch = true
-omit = 
+omit =
     /tmp/*
     */tests/*
     */.venv/*
 
 
 [report]
-exclude_lines = 
+exclude_lines =
     if TYPE_CHECKING:

.cursor/rules/core-architecture.mdc

@@ -1,6 +1,6 @@
 ---
-description: 
-globs: 
+description:
+globs:
 alwaysApply: false
 ---
 # Core Architecture

.cursor/rules/integrations-guide.mdc

@@ -1,6 +1,6 @@
 ---
-description: 
-globs: 
+description:
+globs:
 alwaysApply: false
 ---
 # Integrations Guide
@@ -133,10 +133,10 @@ from sentry_sdk.integrations import Integration
 
 class MyIntegration(Integration):
     identifier = "my_integration"
-    
+
     def __init__(self, param=None):
         self.param = param
-    
+
     @staticmethod
     def setup_once():
         # Install hooks, monkey patches, etc.

.cursor/rules/project-overview.mdc

@@ -1,6 +1,6 @@
 ---
-description: 
-globs: 
+description:
+globs:
 alwaysApply: false
 ---
 # Sentry Python SDK - Project Overview

.cursor/rules/quick-reference.mdc

@@ -1,6 +1,6 @@
 ---
-description: 
-globs: 
+description:
+globs:
 alwaysApply: false
 ---
 # Quick Reference
@@ -44,7 +44,7 @@ tox -e py3.12-django-v5.2.3
 
 ### Code Quality
 
-Our `linters` tox environment runs `black` for formatting, `flake8` for linting and `mypy` for type checking.
+Our `linters` tox environment runs `ruff-format` for formatting, `ruff-check` for linting and `mypy` for type checking.
 
 ```bash
 tox -e linters

.cursor/rules/testing-guide.mdc

@@ -1,6 +1,6 @@
 ---
-description: 
-globs: 
+description:
+globs:
 alwaysApply: false
 ---
 # Testing Guide
@@ -65,10 +65,10 @@ def test_flask_integration(sentry_init, capture_events):
     # Test setup
     sentry_init(integrations=[FlaskIntegration()])
     events = capture_events()
-    
+
     # Test execution
     # ... test code ...
-    
+
     # Assertions
     assert len(events) == 1
     assert events[0]["exception"]["values"][0]["type"] == "ValueError"

.git-blame-ignore-revs

@@ -0,0 +1,3 @@
+# Formatting commits to ignore in git blame
+afea4a017bf13f78e82f725ea9d6a56a8e02cb34
+23a340a9dca60eea36de456def70c00952a33556

.github/workflows/ci.yml

@@ -40,6 +40,9 @@ jobs:
 
     steps:
       - uses: actions/[email protected]
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0
       - uses: actions/setup-python@v6
         with:
           python-version: 3.12

.github/workflows/test-integrations-graphql.yml

@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
+        python-version: ["3.6","3.8","3.9","3.10","3.11","3.12","3.13"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6

.pre-commit-config.yaml

@@ -1,31 +1,9 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+-   repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.13.2
     hooks:
-    -   id: trailing-whitespace
-    -   id: end-of-file-fixer
-
--   repo: https://github.com/psf/black
-    rev: 24.1.0
-    hooks:
-    -   id: black
-        exclude: ^(.*_pb2.py|.*_pb2_grpc.py)
-
--   repo: https://github.com/pycqa/flake8
-    rev: 5.0.4
-    hooks:
-    -   id: flake8
-        additional_dependencies:
-            [
-                flake8-pyproject,
-                flake8-bugbear,
-                pep8-naming,
-            ]
-
-# Disabled for now, because it lists a lot of problems.
-#-   repo: https://github.com/pre-commit/mirrors-mypy
-#    rev: 'v0.931'
-#    hooks:
-#    -   id: mypy
+    -   id: ruff-check
+        args: [--fix]
+    -   id: ruff-format