Skip to content

changes all master branch to main #5355

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.

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

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions content/docs/command-reference/checkout.md
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ DVC went through the stages (in `dvc.yaml`) and adjusted the current set of
`targets`:

```cli
$ git checkout master
$ git checkout main
$ dvc checkout # Start with latest version of everything.

$ git checkout baseline-experiment -- dvc.lock
Expand Down Expand Up @@ -247,7 +247,7 @@ $ dvc install
`dvc install` installs Git hooks to automate common operations, including
running `dvc checkout` when needed.

(Having followed the previous example) we can then checkout the master branch
(Having followed the previous example) we can then checkout the main branch
again:

```cli
Expand Down
2 changes: 1 addition & 1 deletion content/docs/command-reference/commit.md
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ execute.
$ git add src/train.py

$ git commit -m "CHANGED"
[master 72327bd] CHANGED
[main 72327bd] CHANGED
1 file changed, 2 insertions(+)

$ dvc commit
Expand Down
4 changes: 2 additions & 2 deletions content/docs/command-reference/diff.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ directory. Then make sure that you have the latest code and data with the
following commands:

```cli
$ git checkout master
$ git checkout main
$ dvc checkout
```

Expand Down Expand Up @@ -233,7 +233,7 @@ Having followed the previous examples' setup, move into the
and data with the following commands:

```cli
$ git checkout master
$ git checkout main
$ dvc checkout
```

Expand Down
6 changes: 3 additions & 3 deletions content/docs/command-reference/exp/apply.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ We can inspect what changed in the workspace with Git,

```cli
$ git status
On branch master
On branch main
Changes not staged for commit:
modified: dvc.lock
modified: params.yaml
Expand Down Expand Up @@ -147,7 +147,7 @@ $ git add .
$ git commit -m "persist gluey-leak"
```

We can now see that the experiment is the new tip of our master branch:
We can now see that the experiment is the new tip of our main branch:

```cli
$ dvc exp show
Expand All @@ -158,7 +158,7 @@ $ dvc exp show
neutral:**Experiment** neutral:**Created** metric:**auc** param:**featurize.max_features** param:**featurize.ngrams**
─────────────────────────────────────────────────────────────────────────────
workspace - 0.69830 2000 2
master 04:31 PM 0.69830 2000 2
main 04:31 PM 0.69830 2000 2
─────────────────────────────────────────────────────────────────────────────
```

Expand Down
2 changes: 1 addition & 1 deletion content/docs/command-reference/exp/branch.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ And inspect the result with Git:

```cli
$ git branch
* master
* main
gluey-leak-branch
```

Expand Down
2 changes: 1 addition & 1 deletion content/docs/command-reference/exp/push.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ We can now see that the experiment exists in the remote repo:

```cli
$ dvc exp list --all origin
master:
main:
conic-ease
lucid-lair
major-mela
Expand Down
14 changes: 7 additions & 7 deletions content/docs/command-reference/exp/remove.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Let's say we have `dvc exp run` 3 experiments in our project:

```cli
$ dvc exp list
master:
main:
major-mela
conic-ease
lucid-lair
Expand All @@ -71,7 +71,7 @@ To remove any of them, give their names to `dvc exp remove`. Or use the `--all`
$ dvc exp remove conic-ease lucid-lair

$ dvc exp list
master:
main:
major-mela

$ dvc exp remove -A
Expand Down Expand Up @@ -104,7 +104,7 @@ $ dvc exp show
neutral:**Experiment** neutral:**Created** neutral:**State** metric:**avg_prec** metric:**roc_auc** metric:**train.min_split**
──────────────────────────────────────────────────────────────────────────────────────
workspace - - 0.57553 0.94652 2
master Aug 02, 2021 - 0.53252 0.9107 2
main Aug 02, 2021 - 0.53252 0.9107 2
└── 5751540 [split32] 04:57 PM Queued - - 32
──────────────────────────────────────────────────────────────────────────────────────
```
Expand All @@ -115,14 +115,14 @@ We can also remove experiments from a remote Git repository:
$ dvc exp push myremote

$ dvc exp list myremote
master:
main:
conic-ease
urban-sign
major-mela

$ dvc exp remove -g myremote urban-sign major-mela
$ dvc exp list myremote
master:
main:
conic-ease
```

Expand All @@ -131,15 +131,15 @@ their names to `dvc exp remove` with the `--keep` flag :

```cli
$ dvc exp list
master:
main:
major-mela
conic-ease
lucid-lair

$ dvc exp remove --keep major-mela

$ dvc exp list
master:
main:
major-mela

```
Expand Down
8 changes: 4 additions & 4 deletions content/docs/command-reference/exp/rename.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Let's say we have created 3 experiments in our project using `dvc exp run`:

```cli
$ dvc exp list
master:
main:
major-mela
conic-ease
lucid-lair
Expand All @@ -52,7 +52,7 @@ To rename any of them, pass the original and new experiment names to
$ dvc exp rename conic-ease renamed-exp

$ dvc exp list
master:
main:
major-mela
renamed-exp
lucid-lair
Expand All @@ -66,14 +66,14 @@ We can also rename an experiment from a remote Git repository:
$ dvc exp push myremote

$ dvc exp list myremote
master:
main:
conic-ease
urban-sign
major-mela

$ dvc exp rename -g myremote urban-sign renamed-exp
$ dvc exp list myremote
master:
main:
conic-ease
renamed-exp
major-mela
Expand Down
2 changes: 1 addition & 1 deletion content/docs/command-reference/exp/show.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ code.
</admon>

Let's say we have run 3 experiments in our project. The basic usage shows the
workspace (Git working tree) and experiments derived from `HEAD` (`master`
workspace (Git working tree) and experiments derived from `HEAD` (`main`
branch in this case), and all of their metrics, parameters and dependencies
(scroll right to see all):

Expand Down
4 changes: 2 additions & 2 deletions content/docs/command-reference/get.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ the source Git repo. Instead, it's exported in the `dvc.yaml` file as an <abbr>o
of the `train` stage (in the `outs` field). DVC will then `dvc pull` the file from
the `dvc remote default` of the source DVC project (found in [its config file]).

[root directory]: https://github.com/iterative/example-get-started/tree/master/
[root directory]: https://github.com/iterative/example-get-started/tree/main/
[its config file]:
https://github.com/iterative/example-get-started/blob/master/.dvc/config
https://github.com/iterative/example-get-started/blob/main/.dvc/config

<admon type="info">

Expand Down
4 changes: 2 additions & 2 deletions content/docs/command-reference/import.md
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ outs:
```

Several of the values above are pulled from the original `.dvc` file
[in the external DVC repository](https://github.com/iterative/example-get-started/blob/master/data/data.xml.dvc).
[in the external DVC repository](https://github.com/iterative/example-get-started/blob/main/data/data.xml.dvc).
The `url` and `rev_lock` subfields under `repo` are used to save the origin and
version of the dependency, respectively.

Expand Down Expand Up @@ -217,7 +217,7 @@ $ dvc update --rev cats-dogs-v2 cats-dogs.dvc
```

> In the above example, the value for `rev` in the new `.dvc` file will be
> `master` (a branch) so it will be able update normally going forward.
> `main` (a branch) so it will be able update normally going forward.

## Example: Data registry

Expand Down
14 changes: 7 additions & 7 deletions content/docs/command-reference/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ Data and pipelines are up to date.

After running `git checkout` we are also shown a message saying _You are in
'detached HEAD' state_. Returning the workspace to a normal state requires
running `git checkout master`.
running `git checkout main`.

We also see that the first `dvc status` tells us about differences between the
project's <abbr>cache</abbr> and the data files currently in the workspace. Git
Expand All @@ -225,10 +225,10 @@ Running `dvc checkout` then brings them up to date, and a second `dvc status`
tells us that the data files now do match the DVC files.

```cli
$ git checkout master
$ git checkout main
Previous HEAD position was 6666298 Create ML pipeline stages
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
Switched to branch 'main'
Your branch is up to date with 'origin/main'.

$ dvc checkout
```
Expand Down Expand Up @@ -271,7 +271,7 @@ matching what is referenced in the <abbr>DVC files</abbr>.
## Example: Showing DVC status when committing with Git

To follow this example, start with the same workspace as before, making sure it
is not in a _detached HEAD_ state by running `git checkout master`.
is not in a _detached HEAD_ state by running `git checkout main`.

If we simply edit one of the code files:

Expand All @@ -283,7 +283,7 @@ $ git commit -a -m "modified featurization"
featurize:
changed deps:
modified: src/featurization.py
[master 1116ddc] modified featurization
[main 1116ddc] modified featurization
1 file changed, 1 insertion(+), 1 deletion(-)
```

Expand All @@ -305,7 +305,7 @@ M dvc.lock
$ git commit -a -m "updated data after modified featurization"
Data and pipelines are up to date.

[master 78d0c44] modified featurization
[main 78d0c44] modified featurization
5 files changed, 12 insertions(+), 12 deletions(-)
```

Expand Down
2 changes: 1 addition & 1 deletion content/docs/command-reference/update.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fixed to a commit hash (`rev` field in the `.dvc` file). Use the `--rev` option
to update an imported artifact to a different revision.

```cli
$ dvc update --rev master
$ dvc update --rev main
```

## Options
Expand Down
4 changes: 2 additions & 2 deletions content/docs/command-reference/version.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ The detail of DVC version depends upon the way of installing DVC.
If there are any issues reported with the official build, they can be traced
using the official version number.

- **Development version**: contains all the changes done to the `master` branch
- **Development version**: contains all the changes done to the `main` branch
of DVC's repository, following the latest official release. It can be
[installed](/doc/user-guide/contributing/core#development-environment) after
cloning DVC's repo. Running this setup may result in usage issues, as it
Expand All @@ -57,7 +57,7 @@ The detail of DVC version depends upon the way of installing DVC.
Any errors reported with the development version can be traced using the Git
commit hash displayed in the output of `dvc version`, for example:
`1.10.0+292cab.mod`. The part before `+` is the official version number, and
the following part is the commit hash of the tip of the `master` branch. The
the following part is the commit hash of the tip of the `main` branch. The
optional suffix `.mod` means that code is modified.

- **Binary or Package manager**: shows how DVC was downloaded and
Expand Down
2 changes: 1 addition & 1 deletion content/docs/contributing/core.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ as expected.
For specific functionality, you will need to use functional tests alongside
[pytest](https://docs.pytest.org/en/latest/) fixtures to create a temporary
directory, Git and/or DVC repo, and bootstrap some files. See the
[`dir_helpers` module](https://github.com/iterative/dvc/blob/master/tests/dir_helpers.py)
[`dir_helpers` module](https://github.com/iterative/dvc/blob/main/tests/dir_helpers.py)
docstring for some usage examples.

## Running tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ file:///Users/dvc/example-get-started/dvc_plots/index.html
![](/img/plots_cm_get_started_show.svg)

[`evaluate.py`]:
https://github.com/iterative/example-get-started/blob/master/src/evaluate.py
https://github.com/iterative/example-get-started/blob/main/src/evaluate.py
[generate your own]: /doc/user-guide/experiment-management/visualizing-plots

Later we will see how to
Expand Down
2 changes: 1 addition & 1 deletion content/docs/start/experiments/experiment-tracking.md
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ $ dvc exp show
Experiment Created train.loss eval.loss dice_multi base_lr
─────────────────────────────────────────────────────────────────────────────────────
workspace - 0.024942 0.013983 0.922 0.001
master 05:26 PM 0.78426 0.054157 0.49599 0.1
main 05:26 PM 0.78426 0.054157 0.49599 0.1
β”œβ”€β”€ 950c3b5 [bifid-says] 05:33 PM 0.024942 0.013983 0.922 0.001
β”œβ”€β”€ 06090d7 [potty-sash] 05:31 PM 0.026193 0.015237 0.91494 0.01
└── d1ad0a9 [soupy-leak] 05:28 PM 0.075223 0.034786 0.49596 0.1
Expand Down
2 changes: 1 addition & 1 deletion content/docs/use-cases/versioning-data-and-models/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ handled automatically by DVC.
Benefits of our approach include:

- **Lightweight**: DVC is a
[free](https://github.com/iterative/dvc/blob/master/LICENSE), open-source
[free](https://github.com/iterative/dvc/blob/main/LICENSE), open-source
[command line](/doc/command-reference) tool that doesn't require databases,
servers, or any other special services.

Expand Down
4 changes: 2 additions & 2 deletions content/docs/use-cases/versioning-data-and-models/tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -295,11 +295,11 @@ When you have a script that takes some data as an input and produces other data

> If you tried the commands in the
> [Switching between workspace versions](#switching-between-workspace-versions)
> section, go back to the master branch code and data, and remove the
> section, go back to the main branch code and data, and remove the
> `model.weights.h5.dvc` file with:
>
> ```cli
> $ git checkout master
> $ git checkout main
> $ dvc checkout
> $ dvc remove model.weights.h5.dvc
> ```
Expand Down
2 changes: 1 addition & 1 deletion content/docs/user-guide/analytics.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ accurately measure user counts vs. event counts.
## Implementation

The code is viewable in
[`analytics.py`](https://github.com/iterative/dvc/blob/master/dvc/analytics.py).
[`analytics.py`](https://github.com/iterative/dvc/blob/main/dvc/analytics.py).
They are done in a separate background process and fail fast to avoid delaying
any execution. They will fail immediately and silently if you have no network
connection.
Expand Down
2 changes: 1 addition & 1 deletion content/docs/user-guide/integrations/evidently.md
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ $ dvc exp show
Experiment Created weathersit temp atemp hum windspeed holiday workingday step begin end
────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
workspace - 0.231 0 0 0.062 0.012 0.275 0.593 3 2011-02-15 00:00:00 2011-02-21 23:00:00
master 10:02 AM - - - - - - - - - -
main 10:02 AM - - - - - - - - - -
β”œβ”€β”€ a96b45c [muggy-rand] 10:02 AM 0.231 0 0 0.062 0.012 0.275 0.593 3 2011-02-15 00:00:00 2011-02-21 23:00:00
β”œβ”€β”€ 78c6668 [pawky-arcs] 10:02 AM 0.155 0.399 0.537 0.684 0.611 0.588 0.699 2 2011-02-07 00:00:00 2011-02-14 23:00:00
β”œβ”€β”€ c1dd720 [joint-wont] 10:02 AM 0.779 0.098 0.107 0.03 0.171 0.545 0.653 1 2011-01-29 00:00:00 2011-02-07 23:00:00
Expand Down