Replace master with main where possible (#1739)

Co-authored-by: Sorin Sbarnea <sorin.sbarnea@gmail.com>
jazzband · Nov 21, 2022 · 1ce43d5 · 1ce43d5
1 parent 67ebdcb
commit 1ce43d5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
@@ -33,7 +33,7 @@ jobs:
       TOXENV: pip${{ matrix.pip-version }}
       TOX_PARALLEL_NO_SPINNER: 1
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@main
       - name: Set up Python ${{ matrix.python-version }} from GitHub
         id: python-install
         if: "!endsWith(matrix.python-version, '-dev')"
@@ -87,7 +87,7 @@ jobs:
       TOXENV: pip${{ matrix.pip-version }}
       TOX_PARALLEL_NO_SPINNER: 1
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@main
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
         with:

diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml
@@ -29,7 +29,7 @@ jobs:
       TOXENV: ${{ matrix.toxenv }}
       TOX_PARALLEL_NO_SPINNER: 1
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@main
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
         with:

diff --git a/tests/test_repository_pypi.py b/tests/test_repository_pypi.py
@@ -432,8 +432,8 @@ def test_name_collision(from_line, pypi_repository, make_package, make_sdist, tm
     """
     Test to ensure we don't fail if there are multiple URL-based requirements
     ending with the same filename where later ones depend on earlier, e.g.
-    https://git.example.com/requirement1/master.zip#egg=req_package_1
-    https://git.example.com/requirement2/master.zip#egg=req_package_2
+    https://git.example.com/requirement1/main.zip#egg=req_package_1
+    https://git.example.com/requirement2/main.zip#egg=req_package_2
     In this case, if req_package_2 depends on req_package_1 we don't want to
     fail due to issues such as caching the requirement based on filename.
     """
@@ -451,18 +451,18 @@ def test_name_collision(from_line, pypi_repository, make_package, make_sdist, tm
 
         os.rename(
             os.path.join(pkg_path, f"{pkg_name}-0.1.zip"),
-            os.path.join(pkg_path, "master.zip"),
+            os.path.join(pkg_path, "main.zip"),
         )
 
     name_collision_1 = "file://{dist_path}#egg=test_package_1".format(
-        dist_path=tmpdir / "test_package_1" / "master.zip"
+        dist_path=tmpdir / "test_package_1" / "main.zip"
     )
     ireq = from_line(name_collision_1)
     deps = pypi_repository.get_dependencies(ireq)
     assert len(deps) == 0
 
     name_collision_2 = "file://{dist_path}#egg=test_package_2".format(
-        dist_path=tmpdir / "test_package_2" / "master.zip"
+        dist_path=tmpdir / "test_package_2" / "main.zip"
     )
     ireq = from_line(name_collision_2)
     deps = pypi_repository.get_dependencies(ireq)