From f3fe5b173149904b3300819c824561480ef07649 Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Mon, 2 Sep 2024 09:59:04 +0300 Subject: [PATCH] ci: fix after default branch name change --- .github/workflows/main.yml | 4 ++-- docs/database.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5f517379..a84d34d7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,12 +3,12 @@ name: main on: push: branches: - - master + - main tags: - "*" pull_request: branches: - - master + - main env: PYTEST_ADDOPTS: "--color=yes" diff --git a/docs/database.rst b/docs/database.rst index 752b7325..ae3d9153 100644 --- a/docs/database.rst +++ b/docs/database.rst @@ -157,7 +157,7 @@ project by specifying a fixture with the same name and scope in ``conftest.py``. .. admonition:: Use the pytest-django source code The default implementation of these fixtures can be found in - `fixtures.py `_. + `fixtures.py `_. The code is relatively short and straightforward and can provide a starting point when you need to customize database setup in your own