Skip to content

Commit 31bf1af

Browse files
committed
Cleanop old master references
Signed-off-by: Bernát Gábor <[email protected]>
1 parent ffa4e2a commit 31bf1af

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

docs/comparisons.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ None. Either one or the other should be used. These tools compete for a similar
5252

5353
### Migrating to pipx from pipsi
5454

55-
After you have installed pipx, run [migrate_pipsi_to_pipx.py](https://raw.githubusercontent.com/pypa/pipx/master/scripts/migrate_pipsi_to_pipx.py). Why not do this with your new pipx installation?
55+
After you have installed pipx, run [migrate_pipsi_to_pipx.py](https://raw.githubusercontent.com/pypa/pipx/main/scripts/migrate_pipsi_to_pipx.py). Why not do this with your new pipx installation?
5656

5757
```
58-
pipx run https://raw.githubusercontent.com/pypa/pipx/master/scripts/migrate_pipsi_to_pipx.py
58+
pipx run https://raw.githubusercontent.com/pypa/pipx/main/scripts/migrate_pipsi_to_pipx.py
5959
```
6060

6161
## pipx vs brew

docs/examples.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pipx run BINARY # latest version of binary is run with python3
1919
pipx run --spec PACKAGE==2.0.0 BINARY # specific version of package is run
2020
pipx run --python 3.4 BINARY # Installed and invoked with specific Python version
2121
pipx run --python 3.7 --spec PACKAGE=1.7.3 BINARY
22-
pipx run --spec git+https://url.git BINARY # latest version on master is run
22+
pipx run --spec git+https://url.git BINARY # latest version on default branch is run
2323
pipx run --spec git+https://url.git@branch BINARY
2424
pipx run --spec git+https://url.git@hash BINARY
2525
pipx run pycowsay moo

noxfile.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@ def get_branch():
8080
)
8181

8282

83-
def on_master_no_changes(session):
83+
def on_main_no_changes(session):
8484
if has_changes():
8585
session.error("All changes must be committed or removed before publishing")
8686
branch = get_branch()
87-
if branch != "master":
88-
session.error(f"Must be on 'master' branch. Currently on {branch!r} branch")
87+
if branch != "main":
88+
session.error(f"Must be on 'main' branch. Currently on {branch!r} branch")
8989

9090

9191
@nox.session(python=PYTHON_ALL_VERSIONS)
@@ -193,7 +193,7 @@ def build(session):
193193

194194
@nox.session(python=PYTHON_DEFAULT_VERSION)
195195
def publish(session):
196-
on_master_no_changes(session)
196+
on_main_no_changes(session)
197197
session.run("python", "-m", "pip", "install", "--upgrade", "pip")
198198
session.install("twine")
199199
build(session)
@@ -228,7 +228,7 @@ def watch_docs(session):
228228

229229
@nox.session(python=PYTHON_DEFAULT_VERSION)
230230
def pre_release(session):
231-
on_master_no_changes(session)
231+
on_main_no_changes(session)
232232
session.run("python", "-m", "pip", "install", "--upgrade", "pip")
233233
session.install("mypy")
234234
if session.posargs:
@@ -246,7 +246,7 @@ def pre_release(session):
246246

247247
@nox.session(python=PYTHON_DEFAULT_VERSION)
248248
def post_release(session):
249-
on_master_no_changes(session)
249+
on_main_no_changes(session)
250250
session.run("python", "-m", "pip", "install", "--upgrade", "pip")
251251
session.install("mypy")
252252
session.run("python", "scripts/pipx_postrelease.py")

0 commit comments

Comments
 (0)