sentry fork

Author: asottile-sentry

.craft.yml

@@ -0,0 +1,6 @@
+minVersion: 0.34.0
+targets:
+- name: pypi
+- name: github
+- name: sentry-pypi
+  internalPypiRepo: getsentry/pypi

.github/workflows/build.yml

@@ -0,0 +1,26 @@
+name: build
+
+on:
+  pull_request:
+  push:
+    branches: [main, release/**, test-me-*]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v4
+      with:
+        python-version: 3.x
+    - run: |
+        set -x
+        pip install build
+        python -m build
+        # TODO: we don't yet need an ext fork
+        # cd ext
+        # python -m build --outdir ../dist
+    - uses: actions/upload-artifact@v4
+      with:
+        name: ${{ github.sha }}
+        path: dist/*

.github/workflows/release.yml

@@ -1,50 +1,34 @@
 name: Release
 
 on:
-  release:
-    types: [published]
-
-concurrency:
-  group: release-${{ github.event.release.tag_name }}
+  workflow_dispatch:
+    inputs:
+      version:
+        description: Version to release
+        required: true
+      merge_target:
+        description: Target branch to merge into. Uses the default branch as a fallback (optional)
+        required: true
 
 jobs:
-  build-and-publish-ext:
+  release:
     runs-on: ubuntu-latest
-    environment:
-      name: release-ext
-      url: https://pypi.org/p/django-stubs-ext
-    permissions:
-      id-token: write
+    name: "Release a new version"
     steps:
-      - name: Install uv & Python
-        uses: astral-sh/setup-uv@v7
+      - name: Get auth token
+        id: token
+        uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
         with:
-          python-version: "3.13"
-      - uses: actions/checkout@v5
+          app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
+          private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
+      - uses: actions/checkout@v4
         with:
+          token: ${{ steps.token.outputs.token }}
           fetch-depth: 0
-      - name: Build ext package
-        run: uv build --package=django-stubs-ext
-      - name: Publish ext to PyPI
-        uses: pypa/[email protected]
-
-  build-and-publish:
-    runs-on: ubuntu-latest
-    needs: [build-and-publish-ext]
-    environment:
-      name: release
-      url: https://pypi.org/p/django-stubs
-    permissions:
-      id-token: write
-    steps:
-      - name: Install uv & Python
-        uses: astral-sh/setup-uv@v7
+      - name: Prepare release
+        uses: getsentry/action-prepare-release@v1
+        env:
+          GITHUB_TOKEN: ${{ steps.token.outputs.token }}
         with:
-          python-version: "3.13"
-      - uses: actions/checkout@v5
-        with:
-          fetch-depth: 0
-      - name: Build package
-        run: uv build --package=django-stubs
-      - name: Publish to PyPI
-        uses: pypa/[email protected]
+          version: ${{ github.event.inputs.version }}
+          merge_target: ${{ github.event.inputs.merge_target }}

README.md

@@ -1,3 +1,25 @@
+sentry-forked-django-stubs
+==========================
+
+### new release
+
+make a new branch for the fork of an upstream tag:
+
+```bash
+git remote add upstream [email protected]:typeddjango/django-stubs
+git fetch upstream --tags
+git push origin --tags
+git checkout 1.2.3 -b sentry-1.2.3
+```
+
+- cherry-pick the craft / release commit(s) into your branch from `master`
+- cherry-pick relevant commit(s) from previous releases
+
+releases are done through craft in the release.yml workflow -- make sure to
+target your particular branch with a `.#` release postfix (like `1.2.3.0`)
+
+___
+
 <img src="https://raw.githubusercontent.com/typeddjango/django-stubs/master/logo.svg" alt="django-stubs">
 
 [![test](https://github.com/typeddjango/django-stubs/actions/workflows/test.yml/badge.svg?branch=master&event=push)](https://github.com/typeddjango/django-stubs/actions/workflows/test.yml)

pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-name = "django-stubs"
+name = "sentry-forked-django-stubs"
 version = "5.2.7"
 description = "Mypy stubs for Django"
 readme = "README.md"
@@ -56,7 +56,7 @@ tests = [
   "pyyaml==6.0.2",
   # typing:
   "mypy==1.18.1",
-  "django-stubs[compatible-mypy,oracle,redis]",
+  "sentry-forked-django-stubs[compatible-mypy,oracle,redis]",
 ]
 pyright = [
   "pyright==1.1.405",
@@ -73,7 +73,7 @@ Funding = "https://github.com/sponsors/typeddjango"
 "Release notes" = "https://github.com/typeddjango/django-stubs/releases"
 
 [tool.uv.sources]
-django-stubs = { workspace = true }
+sentry-forked-django-stubs = { workspace = true }
 django-stubs-ext = { workspace = true }
 
 [tool.uv.workspace]
@@ -84,7 +84,7 @@ requires = ["uv_build>=0.8.22,<0.9.0"]
 build-backend = "uv_build"
 
 [tool.uv.build-backend]
-module-name = ["django-stubs", "mypy_django_plugin"]
+module-name = ["sentry-forked-django-stubs", "mypy_django_plugin"]
 module-root = ""
 
 [tool.codespell]

scripts/bump-version.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -euxo pipefail
+
+sed -i "s/^version = "'"'".*"'"'"$/version = "'"'"$2"'"'"/" pyproject.toml