Skip to content

Commit c4f97de

Browse files
committed
MAINT: Switch the primary branch name to main
1 parent 62bcb35 commit c4f97de

33 files changed

+84
-85
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ assignees: ''
2323

2424
**Note**: As you can see, there are many issues on our GitHub tracker, so it is very possible that your issue has been posted before. Please check first before submitting so that we do not have to handle and close duplicates.
2525

26-
**Note**: Please be sure you are using the latest released version of `statsmodels`, or a recent build of `master`. If your problem has been fixed in an unreleased version, you might be able to use `master` until a new release occurs.
26+
**Note**: Please be sure you are using the latest released version of `statsmodels`, or a recent build of `main`. If your problem has been fixed in an unreleased version, you might be able to use `main` until a new release occurs.
2727

28-
**Note**: If you are using a released version, have you verified that the bug exists in the master branch of this repository? It helps the limited resources if we know problems exist in the current master so that they do not need to check whether the code sample produces a bug in the next release.
28+
**Note**: If you are using a released version, have you verified that the bug exists in the main branch of this repository? It helps the limited resources if we know problems exist in the current main branch so that they do not need to check whether the code sample produces a bug in the next release.
2929

3030
</details>
3131

.github/PULL_REQUEST_TEMPLATE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
* It is essential that you add a test when making code changes. Tests are not
1313
needed for doc changes.
1414
* When adding a new function, test values should usually be verified in another package (e.g., R/SAS/Stata).
15-
* When fixing a bug, you must add a test that would produce the bug in master and
15+
* When fixing a bug, you must add a test that would produce the bug in main and
1616
then show that it is fixed with the new code.
1717
* New code additions must be well formatted. Changes should pass flake8. If on Linux or OSX, you can
1818
verify you changes are well formatted by running
1919
```
20-
git diff upstream/master -u -- "*.py" | flake8 --diff --isolated
20+
git diff upstream/main -u -- "*.py" | flake8 --diff --isolated
2121
```
2222
assuming `flake8` is installed. This command is also available on Windows
2323
using the Windows System for Linux once `flake8` is installed in the

README.rst

+7-7
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Main Features
115115

116116
How to get it
117117
=============
118-
The master branch on GitHub is the most up to date code
118+
The main branch on GitHub is the most up to date code
119119

120120
https://www.github.com/statsmodels/statsmodels
121121

@@ -174,12 +174,12 @@ Bug reports can be submitted to the issue tracker at
174174

175175
https://github.com/statsmodels/statsmodels/issues
176176

177-
.. |Azure CI Build Status| image:: https://dev.azure.com/statsmodels/statsmodels-testing/_apis/build/status/statsmodels.statsmodels?branch=master
178-
:target: https://dev.azure.com/statsmodels/statsmodels-testing/_build/latest?definitionId=1&branch=master
179-
.. |Codecov Coverage| image:: https://codecov.io/gh/statsmodels/statsmodels/branch/master/graph/badge.svg
177+
.. |Azure CI Build Status| image:: https://dev.azure.com/statsmodels/statsmodels-testing/_apis/build/status/statsmodels.statsmodels?branch=main
178+
:target: https://dev.azure.com/statsmodels/statsmodels-testing/_build/latest?definitionId=1&branch=main
179+
.. |Codecov Coverage| image:: https://codecov.io/gh/statsmodels/statsmodels/branch/main/graph/badge.svg
180180
:target: https://codecov.io/gh/statsmodels/statsmodels
181-
.. |Coveralls Coverage| image:: https://coveralls.io/repos/github/statsmodels/statsmodels/badge.svg?branch=master
182-
:target: https://coveralls.io/github/statsmodels/statsmodels?branch=master
181+
.. |Coveralls Coverage| image:: https://coveralls.io/repos/github/statsmodels/statsmodels/badge.svg?branch=main
182+
:target: https://coveralls.io/github/statsmodels/statsmodels?branch=main
183183
.. |PyPI downloads| image:: https://img.shields.io/pypi/dm/statsmodels.svg?label=Pypi%20downloads
184184
:target: https://pypi.org/project/statsmodels/
185185
.. |Conda downloads| image:: https://img.shields.io/conda/dn/conda-forge/statsmodels.svg?label=Conda%20downloads
@@ -189,4 +189,4 @@ https://github.com/statsmodels/statsmodels/issues
189189
.. |Conda Version| image:: https://anaconda.org/conda-forge/statsmodels/badges/version.svg
190190
:target: https://anaconda.org/conda-forge/statsmodels/
191191
.. |License| image:: https://img.shields.io/pypi/l/statsmodels.svg
192-
:target: https://github.com/statsmodels/statsmodels/blob/master/LICENSE.txt
192+
:target: https://github.com/statsmodels/statsmodels/blob/main/LICENSE.txt

azure-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# https://docs.microsoft.com/en-us/azure/devops/pipelines/process/templates?view=azure-devops#passing-parameters
22

33
trigger:
4-
- master
4+
- main
55

66
variables:
77
MKL_NUM_THREADS: 1

codecov.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
codecov:
2-
branch: master
2+
branch: main
33
notify:
44
require_ci_to_pass: no
55
after_n_builds: 1

docs/source/contrasts.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ The coefficients taken on by polynomial coding for `k=4` levels are the linear,
182182
.. ipython:: python
183183
184184
_, bins = np.histogram(hsb2.read, 3)
185-
try: # requires numpy master
185+
try: # requires numpy main
186186
readcat = np.digitize(hsb2.read, bins, True)
187187
except:
188188
readcat = np.digitize(hsb2.read, bins)

docs/source/dev/dataset_notes.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,5 @@ used.
6464
**Step 6:** Edit the `datasets/__init__.py` to import the directory.
6565

6666
That's it! The result can be found `here
67-
<https://github.com/statsmodels/statsmodels/tree/master/statsmodels/datasets/nile>`_
67+
<https://github.com/statsmodels/statsmodels/tree/main/statsmodels/datasets/nile>`_
6868
for reference.

docs/source/dev/git_notes.rst

+10-10
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ Create a Branch
6262

6363
All changes to the code should be made in a feature branch. To create a branch, type::
6464

65-
git checkout master
66-
git rebase upstream/master
65+
git checkout main
66+
git rebase upstream/main
6767
git checkout -b shiny-new-feature
6868

6969
The first two lines ensure you are starting from an up-to-date version of the upstream
@@ -76,7 +76,7 @@ Doing::
7676
will give something like::
7777

7878
* shiny-new-feature
79-
master
79+
main
8080

8181
to indicate that you are now on the `shiny-new-feature` branch.
8282

@@ -173,7 +173,7 @@ this by using `compare view
173173
#. Navigate to your repository on github.
174174
#. Click on `Branch List`
175175
#. Click on the `Compare` button for your feature branch, `shiny-new-feature`.
176-
#. Select the `base` and `compare` branches, if necessary. This will be `master` and
176+
#. Select the `base` and `compare` branches, if necessary. This will be `main` and
177177
`shiny-new-feature`, respectively.
178178
#. From here you will see a nice overview of your changes. If anything is amiss, you can fix it.
179179

@@ -189,7 +189,7 @@ Your request will then be reviewed. If you need to go back and make more
189189
changes, you can make them in your branch and push them to github and the pull
190190
request will be automatically updated.
191191

192-
One last thing to note. If there has been a lot of work in upstream/master
192+
One last thing to note. If there has been a lot of work in upstream/main
193193
since you started your patch, you might want to rebase. However, you can
194194
probably get away with not rebasing if these changes are unrelated to the work
195195
you have done in the `shiny-new-feature` branch. If you can avoid it, then
@@ -212,7 +212,7 @@ should be preferred.
212212

213213
A rebase replays commits from one branch on top of another branch to preserve a
214214
linear history. Recall that your commits were tested against a (possibly) older
215-
version of master from which you started your branch, so if you rebase, you
215+
version of main from which you started your branch, so if you rebase, you
216216
could introduce bugs. However, if you have only a few commits, this might not
217217
be such a concern. One great place to start learning about rebase is
218218
:ref:`rebasing without tears <pydagogue:actual-rebase>`. In particular, `heed
@@ -226,19 +226,19 @@ work, do not rebase!!
226226
As for merging, **never merge from trunk into your feature branch**. You will,
227227
however, want to check that your work will merge cleanly into trunk. This will
228228
help out the reviewers. You can do this in your local repository by merging
229-
your work into your master (or any branch that tracks remote master) and
229+
your work into your main branch (or any branch that tracks the remote main branch) and
230230
:ref:`run-tests`.
231231

232232
Deleting Branches
233233
~~~~~~~~~~~~~~~~~
234234

235235
Once your feature branch is accepted into upstream, you might want to get rid
236-
of it. First you'll want to merge upstream master into your branch. That way
236+
of it. First you'll want to merge upstream main into your branch. That way
237237
git will know that it can safely delete your branch::
238238

239239
git fetch upstream
240-
git checkout master
241-
git merge upstream/master
240+
git checkout main
241+
git merge upstream/main
242242

243243
Then you can just do::
244244

docs/source/dev/index.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ greatly helps the job of maintaining and releasing the software a shared effort.
5151

5252
Check that the build output does not have *any* warnings due to your changes.
5353
- Follow `PEP8 <https://www.python.org/dev/peps/pep-0008/>`_ style guidelines
54-
wherever possible. Compare your code to what's in master by running
55-
``git diff upstream/master -u -- "*.py" | flake8 --diff`` prior to submitting.
54+
wherever possible. Compare your code to what's in main by running
55+
``git diff upstream/main -u -- "*.py" | flake8 --diff`` prior to submitting.
5656
- Finally, please add your changes to the release notes. Open the
5757
``docs/source/release/versionX.X.rst`` file that has the version number of the
5858
next release and add your changes to the appropriate section.

docs/source/dev/maintainer_notes.rst

+20-20
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Rebasing
3131
If there are only a few commits, you can rebase to keep a linear history::
3232

3333
git fetch upstream-rw
34-
git rebase upstream-rw/master
34+
git rebase upstream-rw/main
3535

3636
Rebasing will not automatically close the pull request however, if there is one,
3737
so do not forget to do this.
@@ -46,7 +46,7 @@ may ask yourself, :ref:`ff-no-ff`? See below for more on this choice. Once
4646
decided you can do::
4747

4848
git fetch upstream-rw
49-
git merge --no-ff upstream-rw/master
49+
git merge --no-ff upstream-rw/main
5050

5151
Merging will automatically close the pull request on github.
5252

@@ -60,11 +60,11 @@ pushing to the repository::
6060

6161
This shows the history in a compact way of the current branch. This::
6262

63-
git log -p upstream-rw/master..
63+
git log -p upstream-rw/main..
6464

6565
shows the log of commits excluding those that can be reached from
66-
upstream-rw/master, and including those that can be reached from current HEAD.
67-
That is, those changes unique to this branch versus upstream-rw/master. See
66+
upstream-rw/main, and including those that can be reached from current HEAD.
67+
That is, those changes unique to this branch versus upstream-rw/main. See
6868
:ref:`Pydagogue <pydagogue:git-log-dots>` for more on using dots with log and
6969
also for using :ref:`dots with diff <pydagogue:git-diff-dots>`.
7070

@@ -74,21 +74,21 @@ Push Your Feature Branch
7474
All the changes look good? You can push your feature branch after
7575
:ref:`merging` or :ref:`rebasing` by::
7676

77-
git push upstream-rw shiny-new-feature:master
77+
git push upstream-rw shiny-new-feature:main
7878

7979
Cherry-Picking
8080
^^^^^^^^^^^^^^
8181

8282
Say you are interested in some commit in another branch, but want to leave the
8383
other ones for now. You can do this with a cherry-pick. Use `git log --oneline`
8484
to find the commit that you want to cherry-pick. Say you want commit `dd9ff35`
85-
from the `shiny-new-feature` branch. You want to apply this commit to master.
85+
from the `shiny-new-feature` branch. You want to apply this commit to main.
8686
You simply do::
8787

88-
git checkout master
88+
git checkout main
8989
git cherry-pick dd9ff35
9090

91-
And that's all. This commit is now applied as a new commit in master.
91+
And that's all. This commit is now applied as a new commit in main.
9292

9393
.. _ff-no-ff:
9494

@@ -109,7 +109,7 @@ The fast-forward merge does not create a merge commit. This means that the
109109
existence of the feature branch is lost in the history. The fast-forward is the
110110
default for Git basically because branches are cheap and, therefore, *usually*
111111
short-lived. If on the other hand, you have a long-lived feature branch or are
112-
following an iterative workflow on the feature branch (i.e. merge into master,
112+
following an iterative workflow on the feature branch (i.e. merge into main,
113113
then go back to feature branch and add more commits), then it makes sense to
114114
include only the merge in the main branch, rather than all the intermediate
115115
commits of the feature branch, so you should use::
@@ -123,7 +123,7 @@ You can apply a pull request through `fetch <https://www.kernel.org/pub/software
123123
and `merge <https://www.kernel.org/pub/software/scm/git/docs/git-merge.html>`__.
124124
In your local copy of the main repo::
125125

126-
git checkout master
126+
git checkout main
127127
git remote add contrib-name git://github.com/contrib-name/statsmodels.git
128128
git fetch contrib-name
129129
git merge contrib-name/shiny-new-feature
@@ -141,14 +141,14 @@ of::
141141
in the commit message. Any and all problems need to be taken care of locally
142142
before doing::
143143

144-
git push origin master
144+
git push origin main
145145

146146
Releasing
147147
---------
148148

149-
1. Checkout master::
149+
1. Checkout main::
150150

151-
git checkout statsmodels/master
151+
git checkout statsmodels/main
152152

153153
2. Clean the working tree with::
154154

@@ -166,7 +166,7 @@ Releasing
166166

167167
git tag -a v0.10.0rc1 -m "Version 0.10.0 Release Candidate 1"
168168

169-
to use the last commit in master.
169+
to use the last commit in main.
170170

171171
4. Checkout the tag::
172172

@@ -183,8 +183,8 @@ Releasing
183183
git checkout -b maintenance/0.10.x
184184

185185
Any bug fixes and maintenance commits intended for the next micro release should be made
186-
against master as usual, but tagged with the milestone for the micro release it is intended
187-
for. Then merge into master as usual. When ready to do the backports, use the file
186+
against main as usual, but tagged with the milestone for the micro release it is intended
187+
for. Then merge into main as usual. When ready to do the backports, use the file
188188
``tools/backport_pr.py`` to identify which PRs need to be backported and to apply them to the
189189
maintenance branch. The tag for the release should be made in the maintenance branch.
190190

@@ -196,9 +196,9 @@ Releasing
196196

197197
twine upload --repository-url https://test.pypi.org/legacy/ dist/*
198198

199-
8. Go back to the master branch, and add an empty commit::
199+
8. Go back to the main branch, and add an empty commit::
200200

201-
git checkout statsmodels/master
201+
git checkout statsmodels/main
202202
git commit --allow-empty -m "Start of 0.11.0 development"
203203
git tag -a v0.11.0.dev0 -m "Start of 0.11.0 development"
204204

@@ -261,7 +261,7 @@ Once any patches have been backported to a maintenance branch, the release steps
261261

262262
Commit Comments
263263
---------------
264-
Prefix commit messages in the master branch of the main shared repository with
264+
Prefix commit messages in the main branch of the main shared repository with
265265
the following::
266266

267267
ENH: Feature implementation

docs/source/dev/test_notes.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Tests can be run at different levels of granularity:
7777
7878
How To Write A Test
7979
-------------------
80-
NumPy provides a good introduction to unit testing with pytest and NumPy extensions `here <https://github.com/numpy/numpy/blob/master/doc/TESTS.rst.txt>`__. It is worth a read for some more details.
80+
NumPy provides a good introduction to unit testing with pytest and NumPy extensions `here <https://github.com/numpy/numpy/blob/main/doc/TESTS.rst.txt>`__. It is worth a read for some more details.
8181
Here, we will document a few conventions we follow that are worth mentioning. Often we want to test
8282
a whole model at once rather than just one function, for example. The following is a pared down
8383
version test_discrete.py. In this case, several different models with different options need to be

docs/source/examples/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Examples
88
This page provides a series of examples, tutorials and recipes to help you get
99
started with ``statsmodels``. Each of the examples shown here is made available
1010
as an IPython Notebook and as a plain python script on the `statsmodels github
11-
repository <https://github.com/statsmodels/statsmodels/tree/master/examples>`_.
11+
repository <https://github.com/statsmodels/statsmodels/tree/main/examples>`_.
1212

1313
We also encourage users to submit their own examples, tutorials or cool
1414
`statsmodels` trick to the `Examples wiki page

docs/source/faq.rst

+1-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ could also reset git to a prior version by:
6464
6565
git reset --hard
6666
git clean -xdf
67-
git checkout master
68-
python setup.py clean
67+
git checkout main
6968
7069
I'd like to contribute. Where do I start?
7170
-----------------------------------------

docs/source/install.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ available `here <https://www.lfd.uci.edu/~gohlke/pythonlibs/#statsmodels>`__.
4545
Obtaining the Source
4646
--------------------
4747

48-
We do not release very often but the master branch of our source code is
48+
We do not release very often but the main branch of our source code is
4949
usually fine for everyday use. You can get the latest source from our
5050
`github repository <https://github.com/statsmodels/statsmodels>`__. Or if you
5151
have git installed:

docs/source/release/version0.10.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ Release summary
1010
statsmodels is using github to store the updated documentation. Two version are available:
1111

1212
* `Stable <https://www.statsmodels.org/stable/>`_, the latest release
13-
* `Development <https://www.statsmodels.org/devel/>`_, the latest build of the master branch
13+
* `Development <https://www.statsmodels.org/devel/>`_, the latest build of the main branch
1414

1515
**Warning**
1616

1717
API stability is not guaranteed for new features, although even in
1818
this case changes will be made in a backwards compatible way if
1919
possible. The stability of a new feature depends on how much time it
20-
was already in statsmodels master and how much usage it has already
20+
was already in statsmodels main and how much usage it has already
2121
seen. If there are specific known problems or limitations, then they
2222
are mentioned in the docstrings.
2323

@@ -625,7 +625,7 @@ Thie following Pull Requests were merged since the last release:
625625
* :pr:`5204`: MAINT: Avoid/Fix FutureWarnings
626626
* :pr:`5207`: TST: Ensure random numbers are reproducible
627627
* :pr:`5208`: TST/CLN: Tighten tol to reduce spurious test failure
628-
* :pr:`5210`: BLD: Ensure master is available when linting
628+
* :pr:`5210`: BLD: Ensure main is available when linting
629629
* :pr:`5211`: MAINT: Import instead of copy/pasting utils
630630
* :pr:`5213`: MAINT: Move misplaced duration results files
631631
* :pr:`5214`: MAINT: remove example-like file that could never run
@@ -735,7 +735,7 @@ Thie following Pull Requests were merged since the last release:
735735
* :pr:`5600`: TST: Relax tolerance for OpenBlas issue
736736
* :pr:`5601`: Update mixed_linear.rst
737737
* :pr:`5602`: ENH: White spec test (clean commit for PR 4721)
738-
* :pr:`5604`: MAINT: Update template to encourage master check
738+
* :pr:`5604`: MAINT: Update template to encourage main check
739739
* :pr:`5605`: Guofei9987 modify comments proportion confint
740740
* :pr:`5606`: Mattwigway mice setting with copy warning
741741
* :pr:`5607`: Jtweeder graphics addgraphics

docs/source/release/version0.11.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ Release summary
1010
statsmodels is using github to store the updated documentation. Two version are available:
1111

1212
- `Stable <https://www.statsmodels.org/>`_, the latest release
13-
- `Development <https://www.statsmodels.org/devel/>`_, the latest build of the master branch
13+
- `Development <https://www.statsmodels.org/devel/>`_, the latest build of the main branch
1414

1515
**Warning**
1616

1717
API stability is not guaranteed for new features, although even in
1818
this case changes will be made in a backwards compatible way if
1919
possible. The stability of a new feature depends on how much time it
20-
was already in statsmodels master and how much usage it has already
20+
was already in statsmodels main and how much usage it has already
2121
seen. If there are specific known problems or limitations, then they
2222
are mentioned in the docstrings.
2323

0 commit comments

Comments
 (0)