Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace master with main where possible #1739

Merged
merged 2 commits into from
Nov 21, 2022
Merged

Replace master with main where possible #1739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88297d0
Replace `master` with `main` where possible
michael-k Nov 21, 2022
f067024
Merge branch 'main' into master-to-main
ssbarnea Nov 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/cron.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')"
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/qa.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions tests/test_repository_pypi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
"""
Expand All @@ -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)
Expand Down