diff options
| author | Stefan van der Walt <stefanv@berkeley.edu> | 2021-03-04 07:11:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-04 09:11:41 -0600 |
| commit | 954605ec08ad833899ffb956395f2d70f8eea2df (patch) | |
| tree | a728df2ab2d8c29e8a36e98cd4a97581e87460ea /numpy | |
| parent | 7134dcfe5f43146ffd1ba8d9c58504ec7146ea3f (diff) | |
| download | numpy-954605ec08ad833899ffb956395f2d70f8eea2df.tar.gz | |
MAINT: Update master to main after branch rename (gh-18544)
* Upload docs to main branch of neps/devdocs
* Update `master` to `main` to be consistent with current state of renaming
* Remove badges from README
* Replace remaining instances of `master` with `main`
* Add back logo
* Fix CircleCI branch checks
* Fix GA branch name
* master->main in issue templates.
* master->main for 2 links to numpy archive.
* Change master to main in NEP 23
Co-authored-by: Ross Barnowski <rossbar@berkeley.edu>
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/_version.py | 3 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/ctors.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/numpy/_version.py b/numpy/_version.py index 6605bf4af..dcc0c5573 100644 --- a/numpy/_version.py +++ b/numpy/_version.py @@ -1,4 +1,3 @@ - # This file helps to compute a version number in source trees obtained from # git-archive tarball (such as those provided by githubs download-from-tag # feature). Distribution tarballs (built by setup.py sdist) and build @@ -191,7 +190,7 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): # refs/heads/ and refs/tags/ prefixes that would let us distinguish # between branches and tags. By ignoring refnames without digits, we # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". + # "stabilization", as well as "HEAD" and "main". tags = set([r for r in refs if re.search(r'\d', r)]) if verbose: print("discarding '%s', no digits" % ",".join(refs - tags)) diff --git a/numpy/core/src/multiarray/ctors.c b/numpy/core/src/multiarray/ctors.c index 52f21b61f..70ca96a2d 100644 --- a/numpy/core/src/multiarray/ctors.c +++ b/numpy/core/src/multiarray/ctors.c @@ -1150,7 +1150,7 @@ _array_from_buffer_3118(PyObject *memoryview) * bpo-32780 * bpo-32782 * - * Note that even if the above are fixed in master, we have to drop the + * Note that even if the above are fixed in main, we have to drop the * early patch versions of python to actually make use of the fixes. */ if (!npy_ctypes_check(Py_TYPE(view->obj))) { |