From 6f2dff92179638ba2f0360055fbe8292dd302840 Mon Sep 17 00:00:00 2001 From: Juha Louhiranta Date: Wed, 11 Dec 2024 14:55:46 +0200 Subject: [PATCH] chore: rename master branch to main Also fixes reference to kerrokantasi code. Refs: RATYK-31 --- .github/workflows/staging.yml | 2 +- .github/workflows/test.yml | 4 ++-- README.md | 2 +- helusers/tests/test_oidc_api_token_authentication.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 9638803..fe842b8 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -2,7 +2,7 @@ name: Publish to TestPyPI on: push: - branches: [master] + branches: [ main ] jobs: build-and-publish: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c1b71de..04d75f7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,9 +5,9 @@ env: on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: test: diff --git a/README.md b/README.md index 50571c3..70edecd 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Run tests](https://github.com/City-of-Helsinki/django-helusers/actions/workflows/test.yml/badge.svg)](https://github.com/City-of-Helsinki/django-helusers/actions/workflows/test.yml) -[![codecov](https://codecov.io/gh/City-of-Helsinki/django-helusers/branch/master/graph/badge.svg?token=bOfnYCJsWW)](https://codecov.io/gh/City-of-Helsinki/django-helusers) +[![codecov](https://codecov.io/gh/City-of-Helsinki/django-helusers/branch/main/graph/badge.svg?token=bOfnYCJsWW)](https://codecov.io/gh/City-of-Helsinki/django-helusers) # Django app for City of Helsinki user infrastructure diff --git a/helusers/tests/test_oidc_api_token_authentication.py b/helusers/tests/test_oidc_api_token_authentication.py index 855f5fc..287c155 100644 --- a/helusers/tests/test_oidc_api_token_authentication.py +++ b/helusers/tests/test_oidc_api_token_authentication.py @@ -51,7 +51,7 @@ def test_overridden_validate_claims_method_works(): authentication_passes(sut=AmrFixApiTokenAuthentication(), amr="test_value") -# From https://github.com/City-of-Helsinki/kerrokantasi/blob/master/kerrokantasi/oidc.py +# From https://github.com/City-of-Helsinki/kerrokantasi/blob/main/kerrokantasi/oidc.py class KerroKantasiApiTokenAuthentication(ApiTokenAuthentication): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs)