diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index dec48de4e1..77c1b55f02 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -18,5 +18,5 @@ * [ ] Tests pass on CI and coverage remains at 100% * [ ] Documentation reflects the changes where applicable * [ ] `changes/-.md` file added describing change - (see [changes/README.md](https://github.com/pydantic/pydantic/blob/master/changes/README.md) for details) + (see [changes/README.md](https://github.com/pydantic/pydantic/blob/main/changes/README.md) for details) * [ ] My PR is ready to review, **please add a comment including the phrase "please review" to assign reviewers** diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 46982a7fb7..88f8c1ab87 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - master + - main tags: - '**' pull_request: {} @@ -308,7 +308,7 @@ jobs: build: name: build py3.${{ matrix.python-version }} on ${{ matrix.platform || matrix.os }} needs: [lint, test-linux-compiled, test-not-compiled, test-old-mypy, test-fastapi] - if: "success() && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master')" + if: "success() && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main')" strategy: fail-fast: false matrix: diff --git a/README.md b/README.md index a6b61903b1..5c61a1a6bd 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # pydantic -[![CI](https://github.com/pydantic/pydantic/workflows/CI/badge.svg?event=push)](https://github.com/pydantic/pydantic/actions?query=event%3Apush+branch%3Amaster+workflow%3ACI) +[![CI](https://github.com/pydantic/pydantic/workflows/CI/badge.svg?event=push)](https://github.com/pydantic/pydantic/actions?query=event%3Apush+branch%3Amain+workflow%3ACI) [![Coverage](https://coverage-badge.samuelcolvin.workers.dev/samuelcolvin/pydantic.svg?v=1)](https://coverage-badge.samuelcolvin.workers.dev/redirect/samuelcolvin/pydantic) [![pypi](https://img.shields.io/pypi/v/pydantic.svg)](https://pypi.python.org/pypi/pydantic) [![CondaForge](https://img.shields.io/conda/v/conda-forge/pydantic.svg)](https://anaconda.org/conda-forge/pydantic) [![downloads](https://pepy.tech/badge/pydantic/month)](https://pepy.tech/project/pydantic) [![versions](https://img.shields.io/pypi/pyversions/pydantic.svg)](https://github.com/pydantic/pydantic) -[![license](https://img.shields.io/github/license/samuelcolvin/pydantic.svg)](https://github.com/pydantic/pydantic/blob/master/LICENSE) +[![license](https://img.shields.io/github/license/samuelcolvin/pydantic.svg)](https://github.com/pydantic/pydantic/blob/main/LICENSE) Data validation and settings management using Python type hints. diff --git a/changes/4405-hramezani.md b/changes/4405-hramezani.md new file mode 100644 index 0000000000..63edc13ef8 --- /dev/null +++ b/changes/4405-hramezani.md @@ -0,0 +1 @@ +Rename `master` to `main` diff --git a/docs/index.md b/docs/index.md index c5da5cbbb0..3c389e2b18 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,9 +1,9 @@ -[![CI](https://github.com/pydantic/pydantic/workflows/CI/badge.svg?event=push)](https://github.com/pydantic/pydantic/actions?query=event%3Apush+branch%3Amaster+workflow%3ACI) -[![Coverage](https://coverage-badge.samuelcolvin.workers.dev/samuelcolvin/pydantic.svg)](https://github.com/pydantic/pydantic/actions?query=event%3Apush+branch%3Amaster+workflow%3ACI) +[![CI](https://github.com/pydantic/pydantic/workflows/CI/badge.svg?event=push)](https://github.com/pydantic/pydantic/actions?query=event%3Apush+branch%3Amain+workflow%3ACI) +[![Coverage](https://coverage-badge.samuelcolvin.workers.dev/samuelcolvin/pydantic.svg)](https://github.com/pydantic/pydantic/actions?query=event%3Apush+branch%3Amain+workflow%3ACI) [![pypi](https://img.shields.io/pypi/v/pydantic.svg)](https://pypi.python.org/pypi/pydantic) [![CondaForge](https://img.shields.io/conda/v/conda-forge/pydantic.svg)](https://anaconda.org/conda-forge/pydantic) [![downloads](https://pepy.tech/badge/pydantic/month)](https://pepy.tech/project/pydantic) -[![license](https://img.shields.io/github/license/samuelcolvin/pydantic.svg)](https://github.com/pydantic/pydantic/blob/master/LICENSE) +[![license](https://img.shields.io/github/license/samuelcolvin/pydantic.svg)](https://github.com/pydantic/pydantic/blob/main/LICENSE) {!.version.md!} diff --git a/docs/install.md b/docs/install.md index aac01b3e60..d64800c67c 100644 --- a/docs/install.md +++ b/docs/install.md @@ -74,7 +74,7 @@ Of course, you can also install these requirements manually with `pip install em And if you prefer to install *pydantic* directly from the repository: ```bash -pip install git+git://github.com/pydantic/pydantic@master#egg=pydantic +pip install git+git://github.com/pydantic/pydantic@main#egg=pydantic # or with extras -pip install git+git://github.com/pydantic/pydantic@master#egg=pydantic[email,dotenv] +pip install git+git://github.com/pydantic/pydantic@main#egg=pydantic[email,dotenv] ``` diff --git a/docs/usage/models.md b/docs/usage/models.md index aa8093c9b0..fb38034001 100644 --- a/docs/usage/models.md +++ b/docs/usage/models.md @@ -155,7 +155,7 @@ Here a vanilla class is used to demonstrate the principle, but any ORM class cou ### Data binding Arbitrary classes are processed by *pydantic* using the `GetterDict` class (see -[utils.py](https://github.com/pydantic/pydantic/blob/master/pydantic/utils.py)), which attempts to +[utils.py](https://github.com/pydantic/pydantic/blob/main/pydantic/utils.py)), which attempts to provide a dictionary-like interface to any class. You can customise how this works by setting your own sub-class of `GetterDict` as the value of `Config.getter_dict` (see [config](model_config.md)). diff --git a/pydantic/datetime_parse.py b/pydantic/datetime_parse.py index b642f17bbd..cfd54593b5 100644 --- a/pydantic/datetime_parse.py +++ b/pydantic/datetime_parse.py @@ -6,7 +6,7 @@ - They're more flexible for datetimes. - The date/datetime/time constructors produce friendlier error messages. -Stolen from https://raw.githubusercontent.com/django/django/master/django/utils/dateparse.py at +Stolen from https://raw.githubusercontent.com/django/django/main/django/utils/dateparse.py at 9718fa2e8abe430c3526a9278dd976443d4ae3c6 Changed to: diff --git a/tests/test_datetime_parse.py b/tests/test_datetime_parse.py index 8792189707..d41c9dbe24 100644 --- a/tests/test_datetime_parse.py +++ b/tests/test_datetime_parse.py @@ -1,5 +1,5 @@ """ -Stolen from https://github.com/django/django/blob/master/tests/utils_tests/test_dateparse.py at +Stolen from https://github.com/django/django/blob/main/tests/utils_tests/test_dateparse.py at 9718fa2e8abe430c3526a9278dd976443d4ae3c6 Changed to: