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@v3
+      with:
+        name: ${{ github.sha }}
+        path: dist/*

.github/workflows/release.yml

@@ -1,56 +1,28 @@
 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: Setup python to build package
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
-      - name: Install build
-        run: python -m pip install build
       - uses: actions/checkout@v4
         with:
+          token: ${{ secrets.GH_RELEASE_PAT }}
           fetch-depth: 0
-      - name: Build ext package
-        run: python -m build ext/
-      - name: Publish ext to PyPI
-        uses: pypa/[email protected]
+      - name: Prepare release
+        uses: getsentry/action-prepare-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
         with:
-          packages-dir: ext/dist/
-
-  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: Setup python to build package
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
-      - name: Install build
-        run: python -m pip install build
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Build package
-        run: python -m build
-      - 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">
 
 [![Build status](https://github.com/typeddjango/django-stubs/workflows/test/badge.svg?branch=master&event=push)](https://github.com/typeddjango/django-stubs/actions?query=workflow%3Atest)

scripts/bump-version.sh

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

setup.py

@@ -37,7 +37,7 @@ def find_stub_files(name: str) -> list[str]:
 }
 
 setup(
-    name="django-stubs",
+    name="sentry-forked-django-stubs",
     version="5.1.2",
     description="Mypy stubs for Django",
     long_description=readme,