chore: rename master branch to main

Also fixes reference to kerrokantasi code. Refs: RATYK-31
City-of-Helsinki · Dec 23, 2024 · 6f2dff9 · 6f2dff9
1 parent 19ffdc6
commit 6f2dff9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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)
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ name: Publish to TestPyPI @@
     on:
       push:
-        branches: [master]
+        branches: [ main ]
     jobs:
       build-and-publish:
@@ Expand Down @@