Skip to content

Commit 577ed15

Browse files
authored
chore: migrate to main as default branch (#7792)
We make `main` the default branch. Contributors should update their local clone: ``` git remote set-head origin -a ``` ## Checklist - [x] Change(s) are motivated and described in the PR description. - [x] Testing strategy is described if automated tests are not included in the PR. - [x] Risk is outlined (performance impact, potential for breakage, maintainability, etc). - [x] Change is maintainable (easy to change, telemetry, documentation). - [x] [Library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) are followed. If no release note is required, add label `changelog/no-changelog`. - [x] Documentation is included (in-code, generated user docs, [public corp docs](https://github.com/DataDog/documentation/)). - [x] Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) ## Reviewer Checklist - [x] Title is accurate. - [x] No unnecessary changes are introduced. - [x] Description motivates each change. - [x] Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes unless absolutely necessary. - [x] Testing strategy adequately addresses listed risk(s). - [x] Change is maintainable (easy to change, telemetry, documentation). - [x] Release note makes sense to a user of the library. - [x] Reviewer has explicitly acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment. - [x] Backport labels are set in a manner that is consistent with the [release branch maintenance policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting) - [x] If this PR touches code that signs or publishes builds or packages, or handles credentials of any kind, I've requested a review from `@DataDog/security-design-and-guidance`. - [x] This PR doesn't touch any of that.
1 parent 49d3503 commit 577ed15

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

.github/workflows/system-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: System Tests
33
on:
44
push:
55
branches:
6-
- 2.x
6+
- main
77
pull_request:
88
workflow_dispatch: {}
99
schedule:

.github/workflows/test_frameworks.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Framework tests
33
on:
44
push:
55
branches:
6-
- 2.x
6+
- main
77
pull_request:
88

99
concurrency:

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# `ddtrace`
22

3-
[![CircleCI](https://circleci.com/gh/DataDog/dd-trace-py/tree/2.x.svg?style=svg)](https://circleci.com/gh/DataDog/dd-trace-py/tree/2.x)
3+
[![CircleCI](https://circleci.com/gh/DataDog/dd-trace-py/tree/main.svg?style=svg)](https://circleci.com/gh/DataDog/dd-trace-py/tree/main)
44
[![PypiVersions](https://img.shields.io/pypi/v/ddtrace.svg)](https://pypi.org/project/ddtrace/)
55
[![Pyversions](https://img.shields.io/pypi/pyversions/ddtrace.svg?style=flat)](https://pypi.org/project/ddtrace/)
66

docs/upgrading.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Before v0.60.0, you must enable all deprecation warnings and filter the applicat
3232

3333
.. _upgrade-0.x:
3434

35-
Upgrade to 1.x
35+
Upgrade to 1.0
3636
**************
3737

3838
Environment variables
@@ -51,7 +51,7 @@ Use the following patterns to identify the deprecated environment variables in a
5151

5252
.. _upgrade-1.x:
5353

54-
Upgrade to 2.x
54+
Upgrade to 2.0
5555
**************
5656

5757
Environment variables

releasenotes/config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
default_branch: origin/2.x
2+
default_branch: origin/main
33
unreleased_version_title: Unreleased
44
sections:
55
# The prelude section is implicitly included.

0 commit comments

Comments
 (0)