Skip to content
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

Change default branch from master to main #4495

Merged
merged 2 commits into from
Mar 8, 2021
Merged
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 .github/workflows/ci-pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Linting

on:
push:
branches: master
branches: main
pull_request:
branches: master
branches: main

jobs:
checks:
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ Distributed
A library for distributed computation. See documentation_ for more details.

.. _documentation: https://distributed.dask.org
.. |Linux/Windows Build Status| image:: https://github.com/dask/distributed/workflows/Tests/badge.svg?branch=master
.. |Linux/Windows Build Status| image:: https://github.com/dask/distributed/workflows/Tests/badge.svg?branch=main
:target: https://github.com/dask/distributed/actions?query=workflow%3A%22Tests%22
.. |MacOS Build Status| image:: https://github.com/dask/distributed/workflows/MacOS%20tests/badge.svg?branch=master
.. |MacOS Build Status| image:: https://github.com/dask/distributed/workflows/MacOS%20tests/badge.svg?branch=main
:target: https://github.com/dask/distributed/actions?query=workflow%3A%22MacOS+tests%22
.. |Doc Status| image:: https://readthedocs.org/projects/distributed/badge/?version=latest
:target: https://distributed.dask.org
Expand Down
2 changes: 1 addition & 1 deletion distributed/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,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))
Expand Down
4 changes: 2 additions & 2 deletions distributed/dashboard/templates/performance_report.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends "file.html" %}
{# See https://github.com/bokeh/bokeh/blob/master/bokeh/core/_templates/file.html #}
{# See https://github.com/bokeh/bokeh/blob/main/bokeh/core/_templates/file.html #}

{% block preamble %}
<link rel="shortcut icon" href="https://docs.dask.org/en/latest/_static/images/favicon.ico" />
{% endblock %}
{% endblock %}
2 changes: 1 addition & 1 deletion docs/release-procedure.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Distributed follows a similar procedure for releasing as the core Dask project.

See https://github.com/dask/dask/blob/master/docs/release-procedure.md for instructions.
See https://github.com/dask/dask/blob/master/docs/release-procedure.md for instructions.
jrbourbeau marked this conversation as resolved.
Show resolved Hide resolved
14 changes: 7 additions & 7 deletions docs/source/develop.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ To keep a fork in sync with the upstream source::
git remote add upstream [email protected]:dask/distributed.git
git remote -v
git fetch -a upstream
git checkout master
git pull upstream master
git push origin master
git checkout main
git pull upstream main
git push origin main

Test
----
Expand Down Expand Up @@ -92,7 +92,7 @@ The test suite contains three kinds of tests
same event loop in the main thread. These are good for testing complex
logic and inspecting the state of the system directly. They are also
easier to debug and cause the fewest problems with shutdowns.
2. ``def test_foo(client)``: Tests with multiple processes forked from the master
2. ``def test_foo(client)``: Tests with multiple processes forked from the main
process. These are good for testing the synchronous (normal user) API and
when triggering hard failures for resilience tests.
3. ``popen``: Tests that call out to the command line to start the system.
Expand All @@ -114,15 +114,15 @@ using the ``@gen_cluster`` style of test, e.g.
assert isinstance(s, Scheduler)
assert isinstance(a, Worker)
assert isinstance(b, Worker)

future = c.submit(inc, 1)
assert isinstance(future, Future)
assert future.key in c.futures

# result = future.result() # This synchronous API call would block
result = await future
assert result == 2

assert future.key in s.tasks
assert future.key in a.data or future.key in b.data

Expand Down
4 changes: 2 additions & 2 deletions docs/source/diagnosing-performance.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ The main way to observe these times is with the task stream plot on the
scheduler's ``/status`` page where the colors of the bars correspond to the
colors listed above.

.. image:: https://raw.githubusercontent.com/dask/dask-org/master/images/bokeh-task-stream.gif
.. image:: https://raw.githubusercontent.com/dask/dask-org/main/images/bokeh-task-stream.gif
:alt: Dask task stream
:width: 50%

Expand Down Expand Up @@ -73,7 +73,7 @@ any of the bars in the profile will zoom the user into just that section, as is
typical with most profiling tools. There is a timeline at the bottom of the
page to allow users to select different periods in time.

.. image:: https://raw.githubusercontent.com/dask/dask-org/master/images/daskboard-profile.gif
.. image:: https://raw.githubusercontent.com/dask/dask-org/main/images/daskboard-profile.gif
:alt: Dask profiler
:width: 70%

Expand Down
4 changes: 2 additions & 2 deletions versioneer.py
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,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))
Expand Down Expand Up @@ -998,7 +998,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))
Expand Down