summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
Diffstat (limited to 'numpy')
-rw-r--r--numpy/_version.py3
-rw-r--r--numpy/core/src/multiarray/ctors.c2
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))) {