diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml index a565792277d..6f3ce9a7dfc 100644 --- a/.github/workflows/system-tests.yml +++ b/.github/workflows/system-tests.yml @@ -3,7 +3,7 @@ name: System Tests on: push: branches: - - 2.x + - main pull_request: workflow_dispatch: {} schedule: diff --git a/.github/workflows/test_frameworks.yml b/.github/workflows/test_frameworks.yml index 6d194851c57..79d8229d71a 100644 --- a/.github/workflows/test_frameworks.yml +++ b/.github/workflows/test_frameworks.yml @@ -3,7 +3,7 @@ name: Framework tests on: push: branches: - - 2.x + - main pull_request: concurrency: diff --git a/README.md b/README.md index b4305eec4da..76e05723924 100644 --- a/README.md +++ b/README.md @@ -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/) diff --git a/docs/upgrading.rst b/docs/upgrading.rst index 079ce760d28..d698bafe234 100644 --- a/docs/upgrading.rst +++ b/docs/upgrading.rst @@ -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 @@ -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 diff --git a/releasenotes/config.yaml b/releasenotes/config.yaml index bad1897e228..a969a006c7e 100644 --- a/releasenotes/config.yaml +++ b/releasenotes/config.yaml @@ -1,5 +1,5 @@ --- -default_branch: origin/2.x +default_branch: origin/main unreleased_version_title: Unreleased sections: # The prelude section is implicitly included.