Skip to content

Commit

Permalink
Cleanop old master references
Browse files Browse the repository at this point in the history
Signed-off-by: Bernát Gábor <gaborjbernat@gmail.com>
  • Loading branch information
gaborbernat committed Dec 26, 2021
1 parent ffa4e2a commit 31bf1af
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions docs/comparisons.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ None. Either one or the other should be used. These tools compete for a similar

### Migrating to pipx from pipsi

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?
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?

```
pipx run https://raw.githubusercontent.com/pypa/pipx/master/scripts/migrate_pipsi_to_pipx.py
pipx run https://raw.githubusercontent.com/pypa/pipx/main/scripts/migrate_pipsi_to_pipx.py
```

## pipx vs brew
Expand Down
2 changes: 1 addition & 1 deletion docs/examples.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pipx run BINARY # latest version of binary is run with python3
pipx run --spec PACKAGE==2.0.0 BINARY # specific version of package is run
pipx run --python 3.4 BINARY # Installed and invoked with specific Python version
pipx run --python 3.7 --spec PACKAGE=1.7.3 BINARY
pipx run --spec git+https://url.git BINARY # latest version on master is run
pipx run --spec git+https://url.git BINARY # latest version on default branch is run
pipx run --spec git+https://url.git@branch BINARY
pipx run --spec git+https://url.git@hash BINARY
pipx run pycowsay moo
Expand Down
12 changes: 6 additions & 6 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,12 @@ def get_branch():
)


def on_master_no_changes(session):
def on_main_no_changes(session):
if has_changes():
session.error("All changes must be committed or removed before publishing")
branch = get_branch()
if branch != "master":
session.error(f"Must be on 'master' branch. Currently on {branch!r} branch")
if branch != "main":
session.error(f"Must be on 'main' branch. Currently on {branch!r} branch")


@nox.session(python=PYTHON_ALL_VERSIONS)
Expand Down Expand Up @@ -193,7 +193,7 @@ def build(session):

@nox.session(python=PYTHON_DEFAULT_VERSION)
def publish(session):
on_master_no_changes(session)
on_main_no_changes(session)
session.run("python", "-m", "pip", "install", "--upgrade", "pip")
session.install("twine")
build(session)
Expand Down Expand Up @@ -228,7 +228,7 @@ def watch_docs(session):

@nox.session(python=PYTHON_DEFAULT_VERSION)
def pre_release(session):
on_master_no_changes(session)
on_main_no_changes(session)
session.run("python", "-m", "pip", "install", "--upgrade", "pip")
session.install("mypy")
if session.posargs:
Expand All @@ -246,7 +246,7 @@ def pre_release(session):

@nox.session(python=PYTHON_DEFAULT_VERSION)
def post_release(session):
on_master_no_changes(session)
on_main_no_changes(session)
session.run("python", "-m", "pip", "install", "--upgrade", "pip")
session.install("mypy")
session.run("python", "scripts/pipx_postrelease.py")
Expand Down

0 comments on commit 31bf1af

Please sign in to comment.