Skip to content

update local references from master -> main - #7804

Merged
esc merged 1 commit into
numba:mainfrom
esc:rename_master_main
Feb 1, 2022
Merged

esc merged 1 commit into
numba:mainfrom
esc:rename_master_main

Conversation

@esc

@esc esc commented Jan 31, 2022

Copy link
Copy Markdown
Member

As title.

@esc esc mentioned this pull request Jan 31, 2022
@esc

esc commented Jan 31, 2022

Copy link
Copy Markdown
Member Author

All the other references to master should be OK:

 💣 zsh» git --no-pager grep master
CHANGE_LOG:* PR #6057: fix aarch64/python_3.8 failure on master
CHANGE_LOG:* PR #5738: Unbreak master on buildfarm
CHANGE_LOG:* PR #5232: Fixes a bad import that breaks master
CHANGE_LOG:* PR #5147: Update master for 0.48.0 updates
CHANGE_LOG:* PR #4302: Fix flake8 issue on master
docs/dagmap/template.html:        src="https://cdn.rawgit.com/jquery/jquery-mousewheel/master/jquery.mousewheel.min.js"></script>
docs/dagmap/template.html:    <script type="text/javascript" src="https://cdn.rawgit.com/jquery/jquery-color/master/jquery.color.js"></script>
docs/source/conf.py:# The master toctree document.
docs/source/conf.py:master_doc = 'index'
docs/source/developer/dispatching.rst:<https://github.com/numba/numba-benchmark/blob/master/benchmarks/bench_dispatch.py>`_
docs/source/index.rst:.. Numba documentation master file, created by
docs/source/proposals/external-memory-management.rst:  https://github.com/gmarkall/nbep-7/blob/master/nbep7/cupy_mempool.py - uses
docs/source/user/faq.rst:<https://github.com/numba/Numba-SC15-Paper/raw/master/numba_sc15.pdf>`_, in case
numba/_version.py:        # "stabilization", as well as "HEAD" and "master".
numba/np/arraymath.py:                # NOTE: there's a change in master which is not
numba/np/arraymath.py:                # NOTE: this is in master but not in any released
numba/np/linalg.py:        # https://github.com/numpy/numpy/blob/master/numpy/linalg/umath_linalg.c.src
numba/np/polynomial.py:        # https://github.com/numpy/numpy/blob/master/numpy/lib/polynomial.py
numba/tests/test_unicode.py:        # https://github.com/python/cpython/blob/master/Objects/unicodetype_db.h
versioneer.py:(https://travis-ci.org/warner/python-versioneer.png?branch=master)
versioneer.py:        # "stabilization", as well as "HEAD" and "master".
versioneer.py:        # "stabilization", as well as "HEAD" and "master".

@esc

esc commented Jan 31, 2022

Copy link
Copy Markdown
Member Author

PR is currently broken, since the default branch has not yet been updated.

@esc

esc commented Feb 1, 2022

Copy link
Copy Markdown
Member Author

/azp run

@azure-pipelines

Copy link
Copy Markdown
Contributor
Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

@esc

esc commented Feb 1, 2022

Copy link
Copy Markdown
Member Author

/azp run

@azure-pipelines

Copy link
Copy Markdown
Contributor
Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

@esc

esc commented Feb 1, 2022

Copy link
Copy Markdown
Member Author

/azp run

@azure-pipelines

Copy link
Copy Markdown
Contributor
Azure Pipelines successfully started running 1 pipeline(s).

@sklam sklam left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All good

@esc esc added 5 - Ready to merge Review and testing done, is ready to merge and removed 3 - Ready for Review labels Feb 1, 2022
@esc
esc merged commit 62df0f0 into numba:main Feb 1, 2022
@esc

esc commented Feb 1, 2022

Copy link
Copy Markdown
Member Author

@sklam thank you for the review.

@esc esc mentioned this pull request May 19, 2022
21 tasks done
esc added a commit to esc/numba that referenced this pull request May 19, 2022
update local references from master -> main
esc added a commit to esc/numba that referenced this pull request May 19, 2022
…'backport/0.55/7804', 'public_ci/pin_llvmlite' and 'changelog/0.55.2' into combine_8067_8069

* backport/0.55/numpy_122:
  Backport numba#8027: Support for NumPy 1.22

* 0.55.2/update_max_numpy:
  fixup error message
  bump version in __init__.py too
  update max NumPy for 0.55.2

* backport/0.55/7804:
  update the target branch to match the release branch
  Merge pull request numba#7804 from esc/rename_master_main

* public_ci/pin_llvmlite:
  Install llvmlite 0.38 for Numba 0.55.*

* changelog/0.55.2:
  update changelog for 0.55.2
sklam added a commit that referenced this pull request May 23, 2022
Backport #7804: update local references from master -> main
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

5 - Ready to merge Review and testing done, is ready to merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants