Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: migrate to main as default branch #7792

Merged
merged 5 commits into from
Nov 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/system-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: System Tests
on:
push:
branches:
- 2.x
- main
pull_request:
workflow_dispatch: {}
schedule:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_frameworks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Framework tests
on:
push:
branches:
- 2.x
- main
pull_request:

concurrency:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# `ddtrace`

[![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)
[![CircleCI](https://circleci.com/gh/DataDog/dd-trace-py/tree/main.svg?style=svg)](https://circleci.com/gh/DataDog/dd-trace-py/tree/main)
[![PypiVersions](https://img.shields.io/pypi/v/ddtrace.svg)](https://pypi.org/project/ddtrace/)
[![Pyversions](https://img.shields.io/pypi/pyversions/ddtrace.svg?style=flat)](https://pypi.org/project/ddtrace/)

Expand Down
4 changes: 2 additions & 2 deletions docs/upgrading.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Before v0.60.0, you must enable all deprecation warnings and filter the applicat

.. _upgrade-0.x:

Upgrade to 1.x
Upgrade to 1.0
**************

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

.. _upgrade-1.x:

Upgrade to 2.x
Upgrade to 2.0
**************

Environment variables
Expand Down
2 changes: 1 addition & 1 deletion releasenotes/config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
default_branch: origin/2.x
default_branch: origin/main
unreleased_version_title: Unreleased
sections:
# The prelude section is implicitly included.
Expand Down
Loading