From 0d8f2170cc840d5eb3ccefd726a119eba496b84f Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Thu, 16 Feb 2023 17:55:01 +0100 Subject: [PATCH 1/2] GH-31148: [Dev] Update URLs in the repo to point to main --- .github/CONTRIBUTING.md | 4 +- .github/pull_request_template.md | 2 +- .github/workflows/dev_pr/title_check.md | 2 +- .github/workflows/java_nightly.yml | 4 +- .github/workflows/r_nightly.yml | 2 +- README.md | 38 +++++++++---------- c_glib/README.md | 4 +- cpp/README.md | 2 +- cpp/build-support/get-upstream-commit.sh | 2 +- .../arrow/engine_substrait_consumption.cc | 2 +- .../arrow/engine/substrait/extension_set.h | 2 +- cpp/src/arrow/engine/substrait/serde_test.cc | 4 +- cpp/thirdparty/README.md | 2 +- csharp/README.md | 2 +- dev/archery/archery/release/core.py | 4 +- dev/tasks/r/github.macos.brew.yml | 4 +- docs/README.md | 4 +- docs/source/conf.py | 2 +- .../cpp/examples/cmake_minimal_build.rst | 2 +- .../cpp/examples/row_columnar_conversion.rst | 4 +- docs/source/cpp/gdb.rst | 4 +- docs/source/cpp/streaming_execution.rst | 2 +- docs/source/developers/benchmarks.rst | 2 +- .../continuous_integration/overview.rst | 2 +- docs/source/developers/contributing.rst | 2 +- docs/source/developers/cpp/building.rst | 4 +- docs/source/developers/cpp/development.rst | 2 +- docs/source/developers/cpp/windows.rst | 4 +- docs/source/developers/guide/resources.rst | 2 +- .../guide/step_by_step/pr_lifecycle.rst | 14 +++---- .../guide/tutorials/python_tutorial.rst | 12 +++--- .../developers/guide/tutorials/r_tutorial.rst | 12 +++--- docs/source/developers/java/building.rst | 2 +- docs/source/developers/java/development.rst | 4 +- docs/source/developers/overview.rst | 12 +++--- docs/source/developers/python.rst | 6 +-- docs/source/developers/release.rst | 8 ++-- docs/source/format/Columnar.rst | 8 ++-- docs/source/format/Integration.rst | 4 +- docs/source/index.rst | 6 +-- docs/source/python/getting_involved.rst | 2 +- java/README.md | 2 +- java/flight/flight-core/README.md | 2 +- java/plasma/README.md | 2 +- js/DEVELOP.md | 2 +- js/README.md | 6 +-- js/package.json | 2 +- ...atlab_interface_for_apache_arrow_design.md | 4 +- python/README.md | 4 +- r/PACKAGING.md | 12 +++--- r/R/install-arrow.R | 2 +- r/README.md | 2 +- r/_pkgdown.yml | 8 ++-- r/inst/demo_flight_server.py | 2 +- r/man/create_package_with_all_dependencies.Rd | 2 +- r/tests/testthat/test-io.R | 2 +- r/tools/nixlibs.R | 4 +- r/vignettes/developers/install_details.Rmd | 2 +- r/vignettes/developers/workflow.Rmd | 4 +- r/vignettes/developers/writing_bindings.Rmd | 2 +- r/vignettes/developing.Rmd | 2 +- r/vignettes/install.Rmd | 8 ++-- ruby/README.md | 12 +++--- ruby/red-arrow-cuda/README.md | 4 +- ruby/red-arrow-dataset/README.md | 4 +- ruby/red-arrow-flight-sql/README.md | 4 +- ruby/red-arrow-flight/README.md | 4 +- ruby/red-arrow/README.md | 6 +-- ruby/red-gandiva/README.md | 4 +- ruby/red-parquet/README.md | 4 +- ruby/red-plasma/README.md | 4 +- 71 files changed, 162 insertions(+), 166 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 3a86a4ab6c8..37a1be7d2c0 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -55,7 +55,7 @@ To contribute a patch: harder to merge in a large change with a lot of disjoint features. 2. If one doesn't already exist, create a JIRA for your patch on the [Arrow Project JIRA](https://issues.apache.org/jira/browse/ARROW). -3. Submit the patch as a GitHub pull request against the master branch. For a +3. Submit the patch as a GitHub pull request against the main branch. For a tutorial, see the GitHub guides on [forking a repo](https://help.github.com/en/articles/fork-a-repo) and [sending a pull request](https://help.github.com/en/articles/creating-a-pull-request-from-a-fork). So that your pull request syncs with the JIRA issue, prefix your pull request name with the JIRA issue id (ex: [ARROW-767: [C++] Filesystem abstraction](https://github.com/apache/arrow/pull/4225)) @@ -67,6 +67,6 @@ file. Thank you in advance for your contributions! [1]: mailto:dev-subscribe@arrow.apache.org -[2]: https://github.com/apache/arrow/tree/master/format +[2]: https://github.com/apache/arrow/tree/main/format [3]: https://issues.apache.org/jira/browse/ARROW [4]: https://github.com/apache/arrow diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index a3ad9803ecf..ddcdb5ebfd9 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -7,7 +7,7 @@ to contribute here: * [Contributing Overview](https://arrow.apache.org/docs/dev/developers/overview.html) -If this is not a [minor PR](https://github.com/apache/arrow/blob/master/CONTRIBUTING.md#Minor-Fixes). Could you open an issue for this pull request on GitHub? https://github.com/apache/arrow/issues/new/choose +If this is not a [minor PR](https://github.com/apache/arrow/blob/main/CONTRIBUTING.md#Minor-Fixes). Could you open an issue for this pull request on GitHub? https://github.com/apache/arrow/issues/new/choose Opening GitHub issues ahead of time contributes to the [Openness](http://theapacheway.com/open/#:~:text=Openness%20allows%20new%20users%20the,must%20happen%20in%20the%20open.) of the Apache Arrow project. diff --git a/.github/workflows/dev_pr/title_check.md b/.github/workflows/dev_pr/title_check.md index 479a1f76c7d..55fc188f773 100644 --- a/.github/workflows/dev_pr/title_check.md +++ b/.github/workflows/dev_pr/title_check.md @@ -19,7 +19,7 @@ Thanks for opening a pull request! -If this is not a [minor PR](https://github.com/apache/arrow/blob/master/CONTRIBUTING.md#Minor-Fixes). Could you open an issue for this pull request on GitHub? https://github.com/apache/arrow/issues/new/choose +If this is not a [minor PR](https://github.com/apache/arrow/blob/main/CONTRIBUTING.md#Minor-Fixes). Could you open an issue for this pull request on GitHub? https://github.com/apache/arrow/issues/new/choose Opening GitHub issues ahead of time contributes to the [Openness](http://theapacheway.com/open/#:~:text=Openness%20allows%20new%20users%20the,must%20happen%20in%20the%20open.) of the Apache Arrow project. diff --git a/.github/workflows/java_nightly.yml b/.github/workflows/java_nightly.yml index 24d8c7c54ee..5dfef462659 100644 --- a/.github/workflows/java_nightly.yml +++ b/.github/workflows/java_nightly.yml @@ -48,7 +48,7 @@ jobs: fetch-depth: 1 path: arrow repository: apache/arrow - ref: master + ref: main submodules: recursive - name: Checkout Crossbow uses: actions/checkout@v3 @@ -56,7 +56,7 @@ jobs: fetch-depth: 0 path: crossbow repository: ursacomputing/crossbow - ref: master + ref: main - name: Set up Python uses: actions/setup-python@v4 with: diff --git a/.github/workflows/r_nightly.yml b/.github/workflows/r_nightly.yml index 8d10bee30d0..bde105979b4 100644 --- a/.github/workflows/r_nightly.yml +++ b/.github/workflows/r_nightly.yml @@ -50,7 +50,7 @@ jobs: fetch-depth: 1 path: arrow repository: apache/arrow - ref: master + ref: main submodules: recursive - name: Checkout Crossbow uses: actions/checkout@v3 diff --git a/README.md b/README.md index 9c4c143e6ca..86ed0db11ce 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ # Apache Arrow [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/arrow.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arrow) -[![License](http://img.shields.io/:license-Apache%202-blue.svg)](https://github.com/apache/arrow/blob/master/LICENSE.txt) +[![License](http://img.shields.io/:license-Apache%202-blue.svg)](https://github.com/apache/arrow/blob/main/LICENSE.txt) [![Twitter Follow](https://img.shields.io/twitter/follow/apachearrow.svg?style=social&label=Follow)](https://twitter.com/apachearrow) ## Powering In-Memory Analytics @@ -30,27 +30,27 @@ set of technologies that enable big data systems to process and move data fast. Major components of the project include: - - [The Arrow Columnar In-Memory Format](https://github.com/apache/arrow/blob/master/docs/source/format/Columnar.rst): + - [The Arrow Columnar In-Memory Format](https://github.com/apache/arrow/blob/main/docs/source/format/Columnar.rst): a standard and efficient in-memory representation of various datatypes, plain or nested - - [The Arrow IPC Format](https://github.com/apache/arrow/blob/master/docs/source/format/Columnar.rst#serialization-and-interprocess-communication-ipc): + - [The Arrow IPC Format](https://github.com/apache/arrow/blob/main/docs/source/format/Columnar.rst#serialization-and-interprocess-communication-ipc): an efficient serialization of the Arrow format and associated metadata, for communication between processes and heterogeneous environments - - [The Arrow Flight RPC protocol](https://github.com/apache/arrow/tree/master/format/Flight.proto): + - [The Arrow Flight RPC protocol](https://github.com/apache/arrow/tree/main/format/Flight.proto): based on the Arrow IPC format, a building block for remote services exchanging Arrow data with application-defined semantics (for example a storage server or a database) - - [C++ libraries](https://github.com/apache/arrow/tree/master/cpp) - - [C bindings using GLib](https://github.com/apache/arrow/tree/master/c_glib) - - [C# .NET libraries](https://github.com/apache/arrow/tree/master/csharp) - - [Gandiva](https://github.com/apache/arrow/tree/master/cpp/src/gandiva): + - [C++ libraries](https://github.com/apache/arrow/tree/main/cpp) + - [C bindings using GLib](https://github.com/apache/arrow/tree/main/c_glib) + - [C# .NET libraries](https://github.com/apache/arrow/tree/main/csharp) + - [Gandiva](https://github.com/apache/arrow/tree/main/cpp/src/gandiva): an [LLVM](https://llvm.org)-based Arrow expression compiler, part of the C++ codebase - - [Go libraries](https://github.com/apache/arrow/tree/master/go) - - [Java libraries](https://github.com/apache/arrow/tree/master/java) - - [JavaScript libraries](https://github.com/apache/arrow/tree/master/js) - - [Plasma Object Store](https://github.com/apache/arrow/tree/master/cpp/src/plasma): + - [Go libraries](https://github.com/apache/arrow/tree/main/go) + - [Java libraries](https://github.com/apache/arrow/tree/main/java) + - [JavaScript libraries](https://github.com/apache/arrow/tree/main/js) + - [Plasma Object Store](https://github.com/apache/arrow/tree/main/cpp/src/plasma): a shared-memory blob store, part of the C++ codebase - - [Python libraries](https://github.com/apache/arrow/tree/master/python) - - [R libraries](https://github.com/apache/arrow/tree/master/r) - - [Ruby libraries](https://github.com/apache/arrow/tree/master/ruby) + - [Python libraries](https://github.com/apache/arrow/tree/main/python) + - [R libraries](https://github.com/apache/arrow/tree/main/r) + - [Ruby libraries](https://github.com/apache/arrow/tree/main/ruby) - [Rust libraries](https://github.com/apache/arrow-rs) Arrow is an [Apache Software Foundation](https://www.apache.org) project. Learn more at @@ -78,8 +78,8 @@ The reference Arrow libraries contain many distinct software components: The official Arrow libraries in this repository are in different stages of implementing the Arrow format and related features. See our current -[feature matrix](https://github.com/apache/arrow/blob/master/docs/source/status.rst) -on git master. +[feature matrix](https://github.com/apache/arrow/blob/main/docs/source/status.rst) +on git main. ## How to Contribute @@ -98,7 +98,7 @@ integrations in other projects, we'd be happy to have you involved: - Contribute code to one of the reference implementations [1]: mailto:dev-subscribe@arrow.apache.org -[2]: https://github.com/apache/arrow/tree/master/format +[2]: https://github.com/apache/arrow/tree/main/format [3]: https://github.com/apache/arrow/issues [4]: https://github.com/apache/arrow -[5]: https://github.com/apache/arrow/blob/master/docs/source/developers/contributing.rst +[5]: https://github.com/apache/arrow/blob/main/docs/source/developers/contributing.rst diff --git a/c_glib/README.md b/c_glib/README.md index c39660b3e8c..ea227d90231 100644 --- a/c_glib/README.md +++ b/c_glib/README.md @@ -20,7 +20,7 @@ # Arrow GLib Arrow GLib is a wrapper library for [Arrow -C++](https://github.com/apache/arrow/tree/master/cpp). Arrow GLib +C++](https://github.com/apache/arrow/tree/main/cpp). Arrow GLib provides C API. Arrow GLib supports [GObject @@ -54,7 +54,7 @@ recommended that you use packages. We use Meson and Ninja as build tools. If you find problems when installing please see [common build -problems](https://github.com/apache/arrow/blob/master/c_glib/README.md#common-build-problems). +problems](https://github.com/apache/arrow/blob/main/c_glib/README.md#common-build-problems). ### Packages diff --git a/cpp/README.md b/cpp/README.md index b083f3fe78e..a070a16e74b 100644 --- a/cpp/README.md +++ b/cpp/README.md @@ -31,4 +31,4 @@ to install pre-compiled binary versions of the library. Please refer to our latest [C++ Development Documentation][1]. -[1]: https://github.com/apache/arrow/blob/master/docs/source/developers/cpp +[1]: https://github.com/apache/arrow/blob/main/docs/source/developers/cpp diff --git a/cpp/build-support/get-upstream-commit.sh b/cpp/build-support/get-upstream-commit.sh index 779cb012b89..8b89acea3f3 100755 --- a/cpp/build-support/get-upstream-commit.sh +++ b/cpp/build-support/get-upstream-commit.sh @@ -18,7 +18,7 @@ # under the License. # # Script which tries to determine the most recent git hash in the current -# branch which originates from master by checking for the +# branch which originates from main by checking for the # 'ARROW-1234: Description` commit message set -e diff --git a/cpp/examples/arrow/engine_substrait_consumption.cc b/cpp/examples/arrow/engine_substrait_consumption.cc index 354375ce59b..61bf8814fd3 100644 --- a/cpp/examples/arrow/engine_substrait_consumption.cc +++ b/cpp/examples/arrow/engine_substrait_consumption.cc @@ -89,7 +89,7 @@ arrow::Future> GetSubstraitFromServer( "extension_uris": [ { "extension_uri_anchor": 7, - "uri": "https://github.com/apache/arrow/blob/master/format/substrait/extension_types.yaml" + "uri": "https://github.com/apache/arrow/blob/main/format/substrait/extension_types.yaml" } ], "extensions": [ diff --git a/cpp/src/arrow/engine/substrait/extension_set.h b/cpp/src/arrow/engine/substrait/extension_set.h index 4df64abba07..8ec8956757f 100644 --- a/cpp/src/arrow/engine/substrait/extension_set.h +++ b/cpp/src/arrow/engine/substrait/extension_set.h @@ -283,7 +283,7 @@ class ARROW_ENGINE_EXPORT ExtensionIdRegistry { }; constexpr std::string_view kArrowExtTypesUri = - "https://github.com/apache/arrow/blob/master/format/substrait/" + "https://github.com/apache/arrow/blob/main/format/substrait/" "extension_types.yaml"; /// A default registry with all supported functions and data types registered diff --git a/cpp/src/arrow/engine/substrait/serde_test.cc b/cpp/src/arrow/engine/substrait/serde_test.cc index 97a2aea3985..9a475469809 100644 --- a/cpp/src/arrow/engine/substrait/serde_test.cc +++ b/cpp/src/arrow/engine/substrait/serde_test.cc @@ -1970,7 +1970,7 @@ TEST(Substrait, AggregateWithFilter) { }], "extensionUris": [{ "extension_uri_anchor": 0, - "uri": "https://github.com/apache/arrow/blob/master/format/substrait/extension_types.yaml" + "uri": "https://github.com/apache/arrow/blob/main/format/substrait/extension_types.yaml" }], "extensions": [{ "extension_function": { @@ -2044,7 +2044,7 @@ TEST(Substrait, AggregateBadPhase) { }], "extensionUris": [{ "extension_uri_anchor": 0, - "uri": "https://github.com/apache/arrow/blob/master/format/substrait/extension_types.yaml" + "uri": "https://github.com/apache/arrow/blob/main/format/substrait/extension_types.yaml" }], "extensions": [{ "extension_function": { diff --git a/cpp/thirdparty/README.md b/cpp/thirdparty/README.md index 86ccfa71dab..81806810530 100644 --- a/cpp/thirdparty/README.md +++ b/cpp/thirdparty/README.md @@ -22,4 +22,4 @@ See the "Build Dependency Management" section in the [C++ Developer Documentation][1]. -[1]: https://github.com/apache/arrow/blob/master/docs/source/developers/cpp/building.rst +[1]: https://github.com/apache/arrow/blob/main/docs/source/developers/cpp/building.rst diff --git a/csharp/README.md b/csharp/README.md index 3d0681279a3..2da3c802edf 100644 --- a/csharp/README.md +++ b/csharp/README.md @@ -21,7 +21,7 @@ An implementation of Arrow targeting .NET Standard. -See our current [feature matrix](https://github.com/apache/arrow/blob/master/docs/source/status.rst) +See our current [feature matrix](https://github.com/apache/arrow/blob/main/docs/source/status.rst) for currently available features. # Implementation diff --git a/dev/archery/archery/release/core.py b/dev/archery/archery/release/core.py index 822d408f88c..81a623be25b 100644 --- a/dev/archery/archery/release/core.py +++ b/dev/archery/archery/release/core.py @@ -451,9 +451,7 @@ def default_branch(self): default_branch_name = origin_head_name_tokenized[-1] except (KeyError, IndexError): # Use a hard-coded default value to set default_branch_name - # TODO: ARROW-18011 to track changing the hard coded default - # value from "master" to "main". - default_branch_name = "master" + default_branch_name = "main" warnings.warn('Unable to determine default branch name: ' 'ARCHERY_DEFAULT_BRANCH environment variable is ' 'not set. Git repository does not contain a ' diff --git a/dev/tasks/r/github.macos.brew.yml b/dev/tasks/r/github.macos.brew.yml index 7cf86d999db..dea7564c5f8 100644 --- a/dev/tasks/r/github.macos.brew.yml +++ b/dev/tasks/r/github.macos.brew.yml @@ -36,9 +36,7 @@ jobs: # for testing brew install minio - # TODO: Update the TODO for ARROW-16907 below to refer to main instead of master - # after migrating the default branch to main. - # TODO(ARROW-16907): apache/arrow@master seems to be installed already + # TODO(ARROW-16907): apache/arrow@main seems to be installed already # so this does nothing on a branch/PR brew install -v --HEAD apache-arrow diff --git a/docs/README.md b/docs/README.md index 213042641fc..a449bacc75b 100644 --- a/docs/README.md +++ b/docs/README.md @@ -26,5 +26,5 @@ Instructions for building the documentation site are found in [docs/source/developers/documentation.rst][1]. The build depends on the API documentation for some of the project subcomponents. -[1]: https://github.com/apache/arrow/blob/master/docs/source/developers/documentation.rst -[2]: https://github.com/apache/arrow/tree/master/docs/source/format +[1]: https://github.com/apache/arrow/blob/main/docs/source/developers/documentation.rst +[2]: https://github.com/apache/arrow/tree/main/docs/source/format diff --git a/docs/source/conf.py b/docs/source/conf.py index 2c3686df870..70cfc640078 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -249,7 +249,7 @@ # "switcher_template_url": "http://0.0.0.0:8000/docs/{version}", "github_user": "apache", "github_repo": "arrow", - "github_version": "master", + "github_version": "main", "doc_path": "docs/source", } diff --git a/docs/source/cpp/examples/cmake_minimal_build.rst b/docs/source/cpp/examples/cmake_minimal_build.rst index f135de830fa..66732d36a8f 100644 --- a/docs/source/cpp/examples/cmake_minimal_build.rst +++ b/docs/source/cpp/examples/cmake_minimal_build.rst @@ -24,5 +24,5 @@ Minimal build using CMake The folder ``cpp/examples/minimal_build/`` located inside the source tree contains a Docker-based example of building and using Arrow from a third-party project, using CMake. The -`README `_ +`README `_ file in that folder has more information. diff --git a/docs/source/cpp/examples/row_columnar_conversion.rst b/docs/source/cpp/examples/row_columnar_conversion.rst index c4a20d29b44..8c95e3bedd9 100644 --- a/docs/source/cpp/examples/row_columnar_conversion.rst +++ b/docs/source/cpp/examples/row_columnar_conversion.rst @@ -49,7 +49,7 @@ provides several utilities: The following example shows how to implement conversion between ``rapidjson::Document`` and Arrow objects. You can read the full code example at -https://github.com/apache/arrow/blob/master/cpp/examples/arrow/rapidjson_row_converter.cc +https://github.com/apache/arrow/blob/main/cpp/examples/arrow/rapidjson_row_converter.cc Writing conversions to Arrow ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -87,7 +87,7 @@ an iterator of the column values for the current field across the rows. In row-based structures that are flat (such as a vector of values) this may be trivial to implement. But if the schema is nested, as in the case of JSON documents, a special iterator is needed to navigate the levels of nesting. See the -`full example `_ +`full example `_ for the implementation details of ``DocValuesIterator``. .. literalinclude:: ../../../../cpp/examples/arrow/rapidjson_row_converter.cc diff --git a/docs/source/cpp/gdb.rst b/docs/source/cpp/gdb.rst index ed1810a6720..b6387ed487d 100644 --- a/docs/source/cpp/gdb.rst +++ b/docs/source/cpp/gdb.rst @@ -77,7 +77,7 @@ and here is a :class:`arrow::Decimal128Scalar`:: Fortunately, GDB also allows custom extensions to override the default printing for specific types. We provide a -`GDB extension `_ +`GDB extension `_ written in Python that enables pretty-printing for common Arrow C++ classes, so as to enable a more productive debugging experience. For example, here is how the aforementioned :class:`arrow::Status` instance will be @@ -94,7 +94,7 @@ Manual loading -------------- To enable the GDB extension for Arrow, you can simply -`download it `_ +`download it `_ somewhere on your computer and ``source`` it from the GDB prompt:: (gdb) source path/to/gdb_arrow.py diff --git a/docs/source/cpp/streaming_execution.rst b/docs/source/cpp/streaming_execution.rst index 73857d8b6a4..0da3ad7ddcb 100644 --- a/docs/source/cpp/streaming_execution.rst +++ b/docs/source/cpp/streaming_execution.rst @@ -278,7 +278,7 @@ Functions * ``approx_count_distinct`` * The functions above should be referenced using the URI - ``https://github.com/apache/arrow/blob/master/format/substrait/extension_types.yaml`` + ``https://github.com/apache/arrow/blob/main/format/substrait/extension_types.yaml`` * Alternatively, the URI can be left completely empty and Acero will match based only on function name. This fallback mechanism is non-standard and should be avoided if possible. diff --git a/docs/source/developers/benchmarks.rst b/docs/source/developers/benchmarks.rst index 22eb5159dfd..aec3d1d65bc 100644 --- a/docs/source/developers/benchmarks.rst +++ b/docs/source/developers/benchmarks.rst @@ -59,7 +59,7 @@ One goal with benchmarking is to detect performance regressions. To this end, diff`` sub-command. In the default invocation, it will compare the current source (known as the -current workspace in git) with local master branch: +current workspace in git) with local main branch: .. code-block:: shell diff --git a/docs/source/developers/continuous_integration/overview.rst b/docs/source/developers/continuous_integration/overview.rst index 9f558e68571..70323c9e489 100644 --- a/docs/source/developers/continuous_integration/overview.rst +++ b/docs/source/developers/continuous_integration/overview.rst @@ -54,7 +54,7 @@ The ``.yml`` files in ``.github/worflows`` are workflows which are run on GitHub - ``@github-actions crossbow submit ...`` - runs the specified Crossbow command - ``@github-actions autotune`` - runs a number of stylers/formatters, builds some of the docs, and commits the results - - ``@github-actions rebase`` - rebases the PR onto the master branch + - ``@github-actions rebase`` - rebases the PR onto the main branch - ``dev.yml`` - runs any time there is activity on a PR, or a PR is merged; it runs the linter and tests that the PR can be merged - ``dev_pr.yml`` - runs any time a PR is opened or updated; checks the formatting of the PR title, adds assignee to the appropriate GitHub issue if needed (or adds a comment requesting the user to include the issue id in the title), and adds any relevant GitHub labels diff --git a/docs/source/developers/contributing.rst b/docs/source/developers/contributing.rst index 47882e6c9a8..0aba193844a 100644 --- a/docs/source/developers/contributing.rst +++ b/docs/source/developers/contributing.rst @@ -187,4 +187,4 @@ Connection to the specific language development pages: .. tab-item:: Ruby - * `Red Arrow - Apache Arrow Ruby `_ + * `Red Arrow - Apache Arrow Ruby `_ diff --git a/docs/source/developers/cpp/building.rst b/docs/source/developers/cpp/building.rst index 4365c549984..eebf7a287b0 100644 --- a/docs/source/developers/cpp/building.rst +++ b/docs/source/developers/cpp/building.rst @@ -488,7 +488,7 @@ from source, set This variable is unfortunately case-sensitive; the name used for each package is listed above, but the most up-to-date listing can be found in -`cpp/cmake_modules/ThirdpartyToolchain.cmake `_. +`cpp/cmake_modules/ThirdpartyToolchain.cmake `_. Bundled Dependency Versions --------------------------- @@ -555,7 +555,7 @@ If you are using CMake, the bundled dependencies will automatically be included when linking if you use the ``arrow_static`` CMake target. In other build systems, you may need to explicitly link to the dependency bundle. We created an `example CMake-based build configuration -`_ to +`_ to show you a working example. On Linux and macOS, if your application does not link to the ``pthread`` diff --git a/docs/source/developers/cpp/development.rst b/docs/source/developers/cpp/development.rst index 48fd5c1a31c..9bc4b9aa357 100644 --- a/docs/source/developers/cpp/development.rst +++ b/docs/source/developers/cpp/development.rst @@ -116,7 +116,7 @@ what files/lines need to be fixed, if any. In order to account for variations in the behavior of ``clang-format`` between major versions of LLVM, we pin the version of ``clang-format`` used. You can confirm the current pinned version by finding the ``CLANG_TOOLS`` variable -value in `.env `_. Note that +value in `.env `_. Note that the version must match exactly; a newer version (even a patch release) will not work. LLVM can be installed through a system package manager or a package manager like Conda or Homebrew, though note they may not offer the exact diff --git a/docs/source/developers/cpp/windows.rst b/docs/source/developers/cpp/windows.rst index 4d58be87f60..d97b038ade5 100644 --- a/docs/source/developers/cpp/windows.rst +++ b/docs/source/developers/cpp/windows.rst @@ -114,7 +114,7 @@ Using vcpkg for build dependencies `vcpkg `_ is an open source package manager from Microsoft. It hosts community-contributed ports of C and C++ packages and their dependencies. Arrow includes a manifest file `cpp/vcpkg.json -`_ that specifies +`_ that specifies which vcpkg packages are required to build the C++ library. To use vcpkg for C++ build dependencies on Windows, first @@ -341,7 +341,7 @@ linking some dependencies, we provide some options * ``-ZSTD_MSVC_STATIC_LIB_SUFFIX=%ZSTD_SUFFIX%`` To get the latest build instructions, you can reference `ci/appveyor-built.bat -`_, +`_, which is used by automated Appveyor builds. Statically linking to Arrow on Windows diff --git a/docs/source/developers/guide/resources.rst b/docs/source/developers/guide/resources.rst index b53d104860d..f6e8db61e51 100644 --- a/docs/source/developers/guide/resources.rst +++ b/docs/source/developers/guide/resources.rst @@ -46,7 +46,7 @@ Additional information every pull request that is opened, merged, etc. - `Apache Arrow Actions on GitHub `_ - - `Location of the workflows in Arrow: arrow/.github/workflows/ `_ + - `Location of the workflows in Arrow: arrow/.github/workflows/ `_ - `GitHub Documentation on GitHub Actions `_ .. ARROW-13841: [Doc] Document the different subcomponents that make up the CI and how they fit together: diff --git a/docs/source/developers/guide/step_by_step/pr_lifecycle.rst b/docs/source/developers/guide/step_by_step/pr_lifecycle.rst index 6cdb642bc3f..7418830ca04 100644 --- a/docs/source/developers/guide/step_by_step/pr_lifecycle.rst +++ b/docs/source/developers/guide/step_by_step/pr_lifecycle.rst @@ -43,14 +43,14 @@ have successfully built Arrow and have a GitHub issue to work on. **Before making changes to the code, you should create a new branch in Git.** -1. Update your fork’s master branch with ``upstream/master``. +1. Update your fork’s main branch with ``upstream/main``. Run this in the shell from the ``arrow`` directory. .. code:: console - $ git checkout master # select the main Arrow branch - $ git fetch upstream # check for changes in upstream/master - $ git pull --ff-only upstream master # save the changes from upstream/master + $ git checkout main # select the main Arrow branch + $ git fetch upstream # check for changes in upstream/main + $ git pull --ff-only upstream main # save the changes from upstream/main Note: ``--ff-only`` applies changes only if they can be fast-forwarded without conflicts or creating merge commits. @@ -252,15 +252,15 @@ The steps for updating the pull request would then be as follows: Here we merge the new commits with our local branch and we do not rebase. -3. Now we have to update the branch to sync with upstream master Arrow branch. +3. Now we have to update the branch to sync with upstream main Arrow branch. This way the pull request will be able to get merged. We use rebase in this case. .. code:: console - $ git pull upstream master --rebase + $ git pull upstream main --rebase - This will rebase your local commits on top of the tip of ``upstream/master``. + This will rebase your local commits on top of the tip of ``upstream/main``. 4. Now you can push the changes by running: diff --git a/docs/source/developers/guide/tutorials/python_tutorial.rst b/docs/source/developers/guide/tutorials/python_tutorial.rst index ad5e6462891..d7d14889088 100644 --- a/docs/source/developers/guide/tutorials/python_tutorial.rst +++ b/docs/source/developers/guide/tutorials/python_tutorial.rst @@ -102,13 +102,13 @@ Start the work on a new branch ------------------------------ Before we start working on adding the feature we should -create a new branch from the updated master branch. +create a new branch from the updated main branch. .. code:: console - $ git checkout master + $ git checkout main $ git fetch upstream - $ git pull --ff-only upstream master + $ git pull --ff-only upstream main $ git checkout -b ARROW-14977 Let's research the Arrow library to see where the ``pc.min_max`` @@ -443,7 +443,7 @@ We can use ``git log`` to check the history of commits: Adding a new compute feature for tutorial purposes - commit 8cebc4948ab5c5792c20a3f463e2043e01c49828 (master) + commit 8cebc4948ab5c5792c20a3f463e2043e01c49828 (main) Author: Sutou Kouhei Date: Sun Dec 5 15:19:46 2021 +0900 @@ -459,11 +459,11 @@ We can use ``git log`` to check the history of commits: ... If we would started the branch some time ago, we may need to rebase to -upstream master to make sure there are no merge conflicts: +upstream main to make sure there are no merge conflicts: .. code:: console - $ git pull upstream master --rebase + $ git pull upstream main --rebase And now we can push our work to the forked Arrow repository on GitHub called ``origin``. diff --git a/docs/source/developers/guide/tutorials/r_tutorial.rst b/docs/source/developers/guide/tutorials/r_tutorial.rst index a4ae9df139f..e94acb384b4 100644 --- a/docs/source/developers/guide/tutorials/r_tutorial.rst +++ b/docs/source/developers/guide/tutorials/r_tutorial.rst @@ -117,13 +117,13 @@ Start the work on a new branch ------------------------------ Before we start working on adding the binding we should -create a new branch from the updated master. +create a new branch from the updated main. .. code:: console - $ git checkout master + $ git checkout main $ git fetch upstream - $ git pull --ff-only upstream master + $ git pull --ff-only upstream main $ git checkout -b ARROW-14816 Now we can start with researching the R function and the C++ Arrow @@ -371,7 +371,7 @@ We can use ``git log`` to check the history of commits: Adding a binding and a test for mday() lubridate - commit c5358787ee8f7b80f067292f49e5f032854041b9 (upstream/master, upstream/HEAD, master, ARROW-15346, ARROW-10643) + commit c5358787ee8f7b80f067292f49e5f032854041b9 (upstream/main, upstream/HEAD, main, ARROW-15346, ARROW-10643) Author: Krisztián Szűcs Date: Thu Jan 20 09:45:59 2022 +0900 @@ -385,11 +385,11 @@ We can use ``git log`` to check the history of commits: Signed-off-by: Sutou Kouhei If we started the branch some time ago, we may need to rebase -to upstream master to make sure there are no merge conflicts: +to upstream main to make sure there are no merge conflicts: .. code:: console - $ git pull upstream master --rebase + $ git pull upstream main --rebase And now we can push our work to the forked Arrow repository on GitHub called origin. diff --git a/docs/source/developers/java/building.rst b/docs/source/developers/java/building.rst index 3578b639074..ce07aa9867c 100644 --- a/docs/source/developers/java/building.rst +++ b/docs/source/developers/java/building.rst @@ -379,7 +379,7 @@ Common Errors -DORC_SOURCE=BUNDLED \ -DZLIB_SOURCE=BUNDLED -.. _Archery: https://github.com/apache/arrow/blob/master/dev/archery/README.md +.. _Archery: https://github.com/apache/arrow/blob/main/dev/archery/README.md .. _Dependency Resolution: https://arrow.apache.org/docs/developers/cpp/building.html#individual-dependency-resolution .. _C++ shared libraries: https://arrow.apache.org/docs/cpp/build_system.html diff --git a/docs/source/developers/java/development.rst b/docs/source/developers/java/development.rst index a699e055854..1094d02f1c1 100644 --- a/docs/source/developers/java/development.rst +++ b/docs/source/developers/java/development.rst @@ -102,6 +102,6 @@ This checks the code style of all source code under the current directory or fro $ mvn checkstyle:check .. _benchmark: https://github.com/ursacomputing/benchmarks -.. _archery: https://github.com/apache/arrow/blob/master/dev/conbench_envs/README.md#L188 +.. _archery: https://github.com/apache/arrow/blob/main/dev/conbench_envs/README.md#L188 .. _conbench: https://github.com/conbench/conbench -.. _checkstyle: https://github.com/apache/arrow/blob/master/java/dev/checkstyle/checkstyle.xml \ No newline at end of file +.. _checkstyle: https://github.com/apache/arrow/blob/main/java/dev/checkstyle/checkstyle.xml \ No newline at end of file diff --git a/docs/source/developers/overview.rst b/docs/source/developers/overview.rst index 91fcee0e2d0..272f3dbd980 100644 --- a/docs/source/developers/overview.rst +++ b/docs/source/developers/overview.rst @@ -31,12 +31,12 @@ checklist for using ``git``: * Work off of your **personal fork** of ``apache/arrow`` and submit pull requests "upstream". -* Keep your fork's **master branch synced** with ``upstream/master``. -* **Develop on branches**, rather than your own "master" branch. +* Keep your fork's **main branch synced** with ``upstream/main``. +* **Develop on branches**, rather than your own "main" branch. * It does not matter what you call your branch. Some people like to use the GitHub issue number as branch name, others use descriptive names. -* **Sync your branch** with ``upstream/master`` **regularly**, as many commits are - merged to master every day. +* **Sync your branch** with ``upstream/main`` **regularly**, as many commits are + merged to main every day. * It is recommended to use ``git rebase`` rather than ``git merge``. * In case there are conflicts, and your local commit history has multiple commits, you may simplify the conflict resolution process by **squashing your local commits @@ -96,7 +96,7 @@ Pull request and review When contributing a patch, use this list as a checklist of Apache Arrow workflow: -* Submit the patch as a **GitHub pull request** against the **master branch**. +* Submit the patch as a **GitHub pull request** against the **main branch**. * So that your pull request syncs with the GitHub issue, **prefix your pull request title with the GitHub issue id** (ex: `GH-14866: [C++] Remove internal GroupBy implementation `_). @@ -139,7 +139,7 @@ will merge the pull request. This is done with a :class-container: sd-shadow-md A pull request is merged with a squash merge so that all of your commits will be - registered as a single commit to the master branch; this simplifies the + registered as a single commit to the main branch; this simplifies the connection between GitHub issues and commits, makes it easier to bisect history to identify where changes were introduced, and helps us be able to cherry-pick individual patches onto a maintenance branch. diff --git a/docs/source/developers/python.rst b/docs/source/developers/python.rst index b32b77fa6c9..8df095f7c3b 100644 --- a/docs/source/developers/python.rst +++ b/docs/source/developers/python.rst @@ -83,9 +83,9 @@ and look for the "custom options" section. .. note:: There are a few low-level tests written directly in C++. These tests are - implemented in `pyarrow/src/python_test.cc `_, + implemented in `pyarrow/src/python_test.cc `_, but they are also wrapped in a ``pytest``-based - `test module `_ + `test module `_ run automatically as part of the PyArrow test suite. Test Groups @@ -382,7 +382,7 @@ For any other C++ build challenges, see :ref:`cpp-development`. In case you may need to rebuild the C++ part due to errors in the process it is advisable to delete the build folder with command ``rm -rf arrow/cpp/build``. If the build has passed successfully and you need to rebuild due to latest pull -from git master, then this step is not needed. +from git main, then this step is not needed. Now, build pyarrow: diff --git a/docs/source/developers/release.rst b/docs/source/developers/release.rst index 66307615342..cb0d713f50d 100644 --- a/docs/source/developers/release.rst +++ b/docs/source/developers/release.rst @@ -95,7 +95,7 @@ Creating a Release Candidate These are the different steps that are required to create a Release Candidate. -For the initial Release Candidate, we will create a maintenance branch from master. +For the initial Release Candidate, we will create a maintenance branch from main. Follow up Release Candidates will update the maintenance branch by cherry-picking specific commits. @@ -113,7 +113,7 @@ Create or update the corresponding maintenance branch .. code-block:: - # Execute the following from an up to date master branch. + # Execute the following from an up to date main branch. # This will create a branch locally called maint-X.Y.Z. # X.Y.Z corresponds with the Major, Minor and Patch version number # of the release respectively. As an example 9.0.0 @@ -487,7 +487,7 @@ Be sure to go through on the following checklist: to point to the official (non-rc) URL and mark them as ready for review. Jeroen will merge, build the binary artifacts, and publish them in the right places. See the - `packaging checklist `_. + `packaging checklist `_. for a precise list of pull requests that must be made prior to submission to CRAN. @@ -499,7 +499,7 @@ Be sure to go through on the following checklist: binaries will work and that everything runs on the same infrastructure that CRAN has, which is difficult/impossible to emulate fully on Travis or with Docker. For a precise list of checks, see the - `packaging checklist `_. + `packaging checklist `_. Once all checks are clean, we submit to CRAN, which has a web form for uploading packages. The release process requires email confirmation diff --git a/docs/source/format/Columnar.rst b/docs/source/format/Columnar.rst index 9a19d7ecee9..77d74564ae0 100644 --- a/docs/source/format/Columnar.rst +++ b/docs/source/format/Columnar.rst @@ -1318,10 +1318,10 @@ data, these custom vectors should be converted to a type that exist in the Arrow spec. .. _Flatbuffers: http://github.com/google/flatbuffers -.. _Flatbuffers protocol definition files: https://github.com/apache/arrow/tree/master/format -.. _Schema.fbs: https://github.com/apache/arrow/blob/master/format/Schema.fbs -.. _Message.fbs: https://github.com/apache/arrow/blob/master/format/Message.fbs -.. _File.fbs: https://github.com/apache/arrow/blob/master/format/File.fbs +.. _Flatbuffers protocol definition files: https://github.com/apache/arrow/tree/main/format +.. _Schema.fbs: https://github.com/apache/arrow/blob/main/format/Schema.fbs +.. _Message.fbs: https://github.com/apache/arrow/blob/main/format/Message.fbs +.. _File.fbs: https://github.com/apache/arrow/blob/main/format/File.fbs .. _least-significant bit (LSB) numbering: https://en.wikipedia.org/wiki/Bit_numbering .. _Intel performance guide: https://software.intel.com/en-us/articles/practical-intel-avx-optimization-on-2nd-generation-intel-core-processors .. _Endianness: https://en.wikipedia.org/wiki/Endianness diff --git a/docs/source/format/Integration.rst b/docs/source/format/Integration.rst index d0902601e1a..5f2341b9c46 100644 --- a/docs/source/format/Integration.rst +++ b/docs/source/format/Integration.rst @@ -93,7 +93,7 @@ cross-language integration testing purposes. This representation is `not canonical `_ but it provides a human-readable way of verifying language implementations. -See `here `_ +See `here `_ for some examples of this JSON data. .. can we check in more examples, e.g. from the generated_*.json test files? @@ -159,7 +159,7 @@ considered equivalent to ``[]`` (no metadata). Duplicated keys are not forbidden } A ``Type`` will have other fields as defined in -`Schema.fbs `_ +`Schema.fbs `_ depending on its name. Int: :: diff --git a/docs/source/index.rst b/docs/source/index.rst index 4be72554cc8..8341b9f3543 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -43,15 +43,15 @@ target environment.** C/GLib C++ - C# + C# Go Java JavaScript Julia - MATLAB + MATLAB Python R - Ruby + Ruby Rust status diff --git a/docs/source/python/getting_involved.rst b/docs/source/python/getting_involved.rst index f85a7ee575c..2271ad3cc02 100644 --- a/docs/source/python/getting_involved.rst +++ b/docs/source/python/getting_involved.rst @@ -32,7 +32,7 @@ integrations in other projects, we'd be happy to have you involved: `Archive `_. * Follow our activity on `GitHub `_ * Learn the `Format / Specification - `_ + `_ .. _py_arch_overview: diff --git a/java/README.md b/java/README.md index cb810a16e1a..36022268026 100644 --- a/java/README.md +++ b/java/README.md @@ -137,6 +137,6 @@ mvn -Pintegration-tests ``` [1]: https://logback.qos.ch/manual/configuration.html -[2]: https://github.com/apache/arrow/blob/master/cpp/README.md +[2]: https://github.com/apache/arrow/blob/main/cpp/README.md [3]: http://google.github.io/styleguide/javaguide.html [4]: https://maven.apache.org/surefire/maven-failsafe-plugin/ diff --git a/java/flight/flight-core/README.md b/java/flight/flight-core/README.md index 3256220a89f..82b56f2e83b 100644 --- a/java/flight/flight-core/README.md +++ b/java/flight/flight-core/README.md @@ -23,7 +23,7 @@ Exposing Apache Arrow data on the wire. [Protocol Description Slides](https://www.slideshare.net/JacquesNadeau5/apache-arrow-flight-overview) -[GRPC Protocol Definition](https://github.com/apache/arrow/blob/master/format/Flight.proto) +[GRPC Protocol Definition](https://github.com/apache/arrow/blob/main/format/Flight.proto) ## Example Usage diff --git a/java/plasma/README.md b/java/plasma/README.md index d3c936f6f2b..46395de7286 100644 --- a/java/plasma/README.md +++ b/java/plasma/README.md @@ -26,7 +26,7 @@ This is deprecated since 10.0.0. This will be removed from 12.0.0 or so. Install: - java 8 or later - maven 3.3 or later - - the same requirement of build [Arrow C++](https://github.com/apache/arrow/tree/master/cpp) + - the same requirement of build [Arrow C++](https://github.com/apache/arrow/tree/main/cpp) ## Build the jar of plasma client diff --git a/js/DEVELOP.md b/js/DEVELOP.md index d58f666a1e5..900d9f363fc 100644 --- a/js/DEVELOP.md +++ b/js/DEVELOP.md @@ -115,6 +115,6 @@ Run `yarn gulp bundle:webpack:analyze` to open [Webpack Bundle Analyzer](https:/ 4. Execute `yarn lint` from the `js` directory to fix the linting errors [1]: mailto:dev-subscribe@arrow.apache.org -[2]: https://github.com/apache/arrow/tree/master/format +[2]: https://github.com/apache/arrow/tree/main/format [3]: https://github.com/apache/arrow/issues [4]: https://github.com/apache/arrow diff --git a/js/README.md b/js/README.md index ae52535a22a..f626ef7240f 100644 --- a/js/README.md +++ b/js/README.md @@ -39,7 +39,7 @@ Apache Arrow is the emerging standard for large in-memory columnar data ([Spark] Check out our [API documentation][5] to learn more about how to use Apache Arrow's JS implementation. You can also learn by example by checking out some of the following resources: -* [/js/test/unit](https://github.com/apache/arrow/tree/master/js/test/unit) - Unit tests for Table and Vector +* [/js/test/unit](https://github.com/apache/arrow/tree/main/js/test/unit) - Unit tests for Table and Vector ## Cookbook @@ -247,10 +247,10 @@ Full list of broader Apache Arrow [projects & organizations](https://arrow.apach # License -[Apache 2.0](https://github.com/apache/arrow/blob/master/LICENSE) +[Apache 2.0](https://github.com/apache/arrow/blob/main/LICENSE) [1]: mailto:dev-subscribe@arrow.apache.org -[2]: https://github.com/apache/arrow/tree/master/format +[2]: https://github.com/apache/arrow/tree/main/format [3]: https://github.com/apache/arrow/issues [4]: https://github.com/apache/arrow [5]: https://arrow.apache.org/docs/js/ diff --git a/js/package.json b/js/package.json index 5d1b1904d88..ff271758bef 100644 --- a/js/package.json +++ b/js/package.json @@ -37,7 +37,7 @@ "bugs": { "url": "https://issues.apache.org/jira/projects/ARROW" }, - "homepage": "https://github.com/apache/arrow/blob/master/js/README.md", + "homepage": "https://github.com/apache/arrow/blob/main/js/README.md", "files": [ "bin", "src", diff --git a/matlab/doc/matlab_interface_for_apache_arrow_design.md b/matlab/doc/matlab_interface_for_apache_arrow_design.md index 5d64c8e85bb..2c227819072 100644 --- a/matlab/doc/matlab_interface_for_apache_arrow_design.md +++ b/matlab/doc/matlab_interface_for_apache_arrow_design.md @@ -354,13 +354,13 @@ The table below provides a high-level roadmap for the development of specific ca [`test_cffi.py` test cases for PyArrow]: https://github.com/apache/arrow/blob/97879eb970bac52d93d2247200b9ca7acf6f3f93/python/pyarrow/tests/test_cffi.py#L109 [MATLAB supports running Python code in a separate process]: https://www.mathworks.com/help/matlab/matlab_external/out-of-process-execution-of-python-functionality.html [Plasma Object Store]: https://arrow.apache.org/docs/python/plasma.html -[tutorial]: https://github.com/apache/arrow/blob/master/cpp/apidoc/tutorials/plasma.md#getting-an-object +[tutorial]: https://github.com/apache/arrow/blob/main/cpp/apidoc/tutorials/plasma.md#getting-an-object [MATLAB Class-Based Unit Tests]: https://www.mathworks.com/help/matlab/class-based-unit-tests.html [Integration Testing]: https://arrow.apache.org/docs/format/Integration.html [MATLAB Help Text]: https://www.mathworks.com/help/matlab/matlab_prog/add-help-for-your-program.html [MEX]: https://www.mathworks.com/help/matlab/call-mex-files-1.html [Add-On Explorer]: https://www.mathworks.com/help/matlab/matlab_env/get-add-ons.html -[JavaScript user]: https://github.com/apache/arrow/tree/master/js +[JavaScript user]: https://github.com/apache/arrow/tree/main/js [`apache-arrow` package via the `npm` package manager]: https://www.npmjs.com/package/apache-arrow [Rust user]: https://github.com/apache/arrow-rs [`arrow` crate via the `cargo` package manager]: https://crates.io/crates/arrow diff --git a/python/README.md b/python/README.md index def98a36e58..9eb0cbd65cb 100644 --- a/python/README.md +++ b/python/README.md @@ -52,8 +52,8 @@ See [Python Development][2] in the documentation subproject. See [documentation build instructions][1] in the documentation subproject. -[1]: https://github.com/apache/arrow/blob/master/docs/source/developers/documentation.rst -[2]: https://github.com/apache/arrow/blob/master/docs/source/developers/python.rst +[1]: https://github.com/apache/arrow/blob/main/docs/source/developers/documentation.rst +[2]: https://github.com/apache/arrow/blob/main/docs/source/developers/python.rst [3]: https://github.com/pandas-dev/pandas [5]: https://arrow.apache.org/docs/latest/python/benchmarks.html [6]: https://www.microsoft.com/en-us/download/details.aspx?id=48145 \ No newline at end of file diff --git a/r/PACKAGING.md b/r/PACKAGING.md index 699a07f533b..bf5d43cd683 100644 --- a/r/PACKAGING.md +++ b/r/PACKAGING.md @@ -52,19 +52,19 @@ use the release candidate as the source. - [ ] Pull request to modify [the apache-arrow autobrew formula]( https://github.com/autobrew/homebrew-core/blob/high-sierra/Formula/apache-arrow.rb) to update the release version, SHA256 checksum of the release source file (which can be found in the same directory as the release source file), and any changes to dependencies and build steps that have changed in the - [copy of the formula we have of that formula in the Arrow repo](https://github.com/apache/arrow/blob/master/dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb) + [copy of the formula we have of that formula in the Arrow repo](https://github.com/apache/arrow/blob/main/dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb) - [ ] Pull request to modify [the apache-arrow-static autobrew formula](https://github.com/autobrew/homebrew-cran/blob/master/Formula/apache-arrow-static.rb) to update the version, SHA, and any changes to dependencies and build steps that have changed in the - [copy of the formula we have of that formula in the Arrow repo](https://github.com/apache/arrow/blob/master/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb) + [copy of the formula we have of that formula in the Arrow repo](https://github.com/apache/arrow/blob/main/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb) - [ ] Pull request to modify the [autobrew script](https://github.com/autobrew/scripts/blob/master/apache-arrow) to include any additions made to - [r/tools/autobrew](https://github.com/apache/arrow/blob/master/r/tools/autobrew). + [r/tools/autobrew](https://github.com/apache/arrow/blob/main/r/tools/autobrew). - [ ] Pull request to modify the [RTools PKGBUILD script](https://github.com/r-windows/rtools-packages/blob/master/mingw-w64-arrow/PKGBUILD) to reflect changes in - [ci/PKGBUILD](https://github.com/apache/arrow/blob/master/ci/scripts/PKGBUILD), + [ci/PKGBUILD](https://github.com/apache/arrow/blob/main/ci/scripts/PKGBUILD), uncommenting the line that says "uncomment to test the rc". Prepare and check the .tar.gz that will be released to CRAN. @@ -85,7 +85,7 @@ Wait for the official release... - [ ] Release vote passed! - [ ] If the release candidate commit updated, rebase the CRAN release branch on that commit. -- [ ] Pick any commits that were made to master since the release commit that +- [ ] Pick any commits that were made to main since the release commit that were needed to fix CRAN-related submission issues identified in the above steps. - [ ] Remove badges from README.md @@ -126,7 +126,7 @@ Wait for CRAN... - [ ] Accepted! - [ ] Tag the tip of the CRAN-specific release branch -- [ ] Add a new line to the matrix in the [backwards compatability job](https://github.com/apache/arrow/blob/master/dev/tasks/r/github.linux.arrow.version.back.compat.yml) +- [ ] Add a new line to the matrix in the [backwards compatability job](https://github.com/apache/arrow/blob/main/dev/tasks/r/github.linux.arrow.version.back.compat.yml) - [ ] (patch releases only) Update the package version in `ci/scripts/PKGBUILD`, `dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb`, `r/DESCRIPTION`, and `r/NEWS.md` - [ ] Update the packaging checklist template to reflect any new realities of the packaging process. diff --git a/r/R/install-arrow.R b/r/R/install-arrow.R index db3e8e9eea2..8380fa2af98 100644 --- a/r/R/install-arrow.R +++ b/r/R/install-arrow.R @@ -171,7 +171,7 @@ reload_arrow <- function() { #' #' ### Using a computer with internet access, pre-download the dependencies: #' * Install the `arrow` package _or_ run -#' `source("https://raw.githubusercontent.com/apache/arrow/master/r/R/install-arrow.R")` +#' `source("https://raw.githubusercontent.com/apache/arrow/main/r/R/install-arrow.R")` #' * Run `create_package_with_all_dependencies("my_arrow_pkg.tar.gz")` #' * Copy the newly created `my_arrow_pkg.tar.gz` to the computer without internet access #' diff --git a/r/README.md b/r/README.md index 3551e92bffb..d343d6979c0 100644 --- a/r/README.md +++ b/r/README.md @@ -1,7 +1,7 @@ # arrow [![cran](https://www.r-pkg.org/badges/version-last-release/arrow)](https://cran.r-project.org/package=arrow) -[![CI](https://github.com/apache/arrow/workflows/R/badge.svg?event=push)](https://github.com/apache/arrow/actions?query=workflow%3AR+branch%3Amaster+event%3Apush) +[![CI](https://github.com/apache/arrow/workflows/R/badge.svg?event=push)](https://github.com/apache/arrow/actions?query=workflow%3AR+branch%3Amain+event%3Apush) [![conda-forge](https://img.shields.io/conda/vn/conda-forge/r-arrow.svg)](https://anaconda.org/conda-forge/r-arrow) [Apache Arrow](https://arrow.apache.org/) is a cross-language diff --git a/r/_pkgdown.yml b/r/_pkgdown.yml index 391d3407694..8b45360f02b 100644 --- a/r/_pkgdown.yml +++ b/r/_pkgdown.yml @@ -75,15 +75,15 @@ home: text: > [C GLib](https://arrow.apache.org/docs/c_glib)
[C++](https://arrow.apache.org/docs/cpp)
- [C#](https://github.com/apache/arrow/blob/master/csharp/README.md)
+ [C#](https://github.com/apache/arrow/blob/main/csharp/README.md)
[Go](https://pkg.go.dev/github.com/apache/arrow/go)
[Java](https://arrow.apache.org/docs/java)
[JavaScript](https://arrow.apache.org/docs/js)
[Julia](https://github.com/apache/arrow-julia/blob/main/README.md)
- [MATLAB](https://github.com/apache/arrow/blob/master/matlab/README.md)
+ [MATLAB](https://github.com/apache/arrow/blob/main/matlab/README.md)
[Python](https://arrow.apache.org/docs/python)
[R](index.html)
- [Ruby](https://github.com/apache/arrow/blob/master/ruby/README.md)
+ [Ruby](https://github.com/apache/arrow/blob/main/ruby/README.md)
[Rust](https://docs.rs/crate/arrow/latest) navbar: @@ -278,5 +278,5 @@ reference: repo: jira_projects: [ARROW] url: - source: https://github.com/apache/arrow/blob/master/r/ + source: https://github.com/apache/arrow/blob/main/r/ issue: https://issues.apache.org/jira/browse/ diff --git a/r/inst/demo_flight_server.py b/r/inst/demo_flight_server.py index 0c81aa912a1..4204564ca40 100644 --- a/r/inst/demo_flight_server.py +++ b/r/inst/demo_flight_server.py @@ -17,7 +17,7 @@ """ An example Flight Python server. - See https://github.com/apache/arrow/blob/master/python/examples/flight/server.py + See https://github.com/apache/arrow/blob/main/python/examples/flight/server.py """ import ast diff --git a/r/man/create_package_with_all_dependencies.Rd b/r/man/create_package_with_all_dependencies.Rd index b2da8c2491a..94bb0a67b57 100644 --- a/r/man/create_package_with_all_dependencies.Rd +++ b/r/man/create_package_with_all_dependencies.Rd @@ -38,7 +38,7 @@ something other than the RSPM binary mirror URLs). \subsection{Using a computer with internet access, pre-download the dependencies:}{ \itemize{ \item Install the \code{arrow} package \emph{or} run -\code{source("https://raw.githubusercontent.com/apache/arrow/master/r/R/install-arrow.R")} +\code{source("https://raw.githubusercontent.com/apache/arrow/main/r/R/install-arrow.R")} \item Run \code{create_package_with_all_dependencies("my_arrow_pkg.tar.gz")} \item Copy the newly created \code{my_arrow_pkg.tar.gz} to the computer without internet access } diff --git a/r/tests/testthat/test-io.R b/r/tests/testthat/test-io.R index 39cfe6e5e68..b4780af75dd 100644 --- a/r/tests/testthat/test-io.R +++ b/r/tests/testthat/test-io.R @@ -71,7 +71,7 @@ test_that("make_readable_file() works for non-filesystem URLs", { skip_if_offline() readable_file <- make_readable_file( - "https://github.com/apache/arrow/raw/master/r/inst/v0.7.1.parquet" + "https://github.com/apache/arrow/raw/main/r/inst/v0.7.1.parquet" ) expect_r6_class(readable_file, "InputStream") expect_identical(rawToChar(as.raw(readable_file$Read(3))), "PAR") diff --git a/r/tools/nixlibs.R b/r/tools/nixlibs.R index e8af2386c61..3d9edf03687 100644 --- a/r/tools/nixlibs.R +++ b/r/tools/nixlibs.R @@ -125,7 +125,7 @@ identify_binary <- function(lib = Sys.getenv("LIBARROW_BINARY"), info = distro() } } -check_allowlist <- function(os, allowed = "https://raw.githubusercontent.com/apache/arrow/master/r/tools/nixlibs-allowlist.txt") { +check_allowlist <- function(os, allowed = "https://raw.githubusercontent.com/apache/arrow/main/r/tools/nixlibs-allowlist.txt") { allowlist <- tryCatch( # Try a remote allowlist so that we can add/remove without a release suppressWarnings(readLines(allowed)), @@ -555,7 +555,7 @@ turn_off_all_optional_features <- function(env_var_list) { # check the existing value. # Some features turn on other features (e.g. substrait -> protobuf), # So the list of things to turn off is long. See: - # https://github.com/apache/arrow/blob/master/cpp/cmake_modules/ThirdpartyToolchain.cmake#L275 + # https://github.com/apache/arrow/blob/main/cpp/cmake_modules/ThirdpartyToolchain.cmake#L275 turn_off <- c( "ARROW_MIMALLOC" = "OFF", "ARROW_JEMALLOC" = "OFF", diff --git a/r/vignettes/developers/install_details.Rmd b/r/vignettes/developers/install_details.Rmd index 549a5889ded..3ab6265cb11 100644 --- a/r/vignettes/developers/install_details.Rmd +++ b/r/vignettes/developers/install_details.Rmd @@ -101,7 +101,7 @@ that match your both your local operating system, required dependencies (e.g. openssl version) and arrow R package version. These are used automatically on many Linux distributions (x86_64 architecture only), -according to the [allowlist](https://github.com/apache/arrow/blob/master/r/tools/nixlibs-allowlist.txt). +according to the [allowlist](https://github.com/apache/arrow/blob/main/r/tools/nixlibs-allowlist.txt). If your distribution isn't in the list, you can opt-in by setting the `NOT_CRAN` environment variable before you call `install.packages()`. If found, they will be downloaded and bundled when your R package compiles. diff --git a/r/vignettes/developers/workflow.Rmd b/r/vignettes/developers/workflow.Rmd index 06da30b167c..d6335ddd968 100644 --- a/r/vignettes/developers/workflow.Rmd +++ b/r/vignettes/developers/workflow.Rmd @@ -55,7 +55,7 @@ pkgdown::build_site(preview=TRUE) The R code in the package follows [the tidyverse style](https://style.tidyverse.org/). On PR submission (and on pushes) our CI will run linting and will flag possible errors on the pull request with annotations. -To run the linter locally, install the `{lintr}` package (note, we currently use a fork that includes fixes not yet accepted upstream, see how lintr is being installed in the file [`ci/docker/linux-apt-lint.dockerfile`](https://github.com/apache/arrow/blob/master/ci/docker/linux-apt-lint.dockerfile) for the current status) and then run +To run the linter locally, install the `{lintr}` package (note, we currently use a fork that includes fixes not yet accepted upstream, see how lintr is being installed in the file [`ci/docker/linux-apt-lint.dockerfile`](https://github.com/apache/arrow/blob/main/ci/docker/linux-apt-lint.dockerfile) for the current status) and then run ```r lintr::lint_package("arrow/r") @@ -208,7 +208,7 @@ This runs each of the R-related CI tasks. @github-actions crossbow submit {task-name} ``` -See the `r:` group definition near the beginning of the [crossbow configuration](https://github.com/apache/arrow/blob/master/dev/tasks/tasks.yml) +See the `r:` group definition near the beginning of the [crossbow configuration](https://github.com/apache/arrow/blob/main/dev/tasks/tasks.yml) for a list of glob expression patterns that match names of items in the `tasks:` list below it. diff --git a/r/vignettes/developers/writing_bindings.Rmd b/r/vignettes/developers/writing_bindings.Rmd index 2b137c3d098..443211b3c2b 100644 --- a/r/vignettes/developers/writing_bindings.Rmd +++ b/r/vignettes/developers/writing_bindings.Rmd @@ -132,7 +132,7 @@ set of unit tests that use a dplyr pipeline and `compare_dplyr_binding()` (and perhaps even `compare_dplyr_error()` if necessary. These functions compare the output of the original function with the dplyr bindings and make sure they match. We recommend looking at the [documentation next to the source code for these -functions](https://github.com/apache/arrow/blob/master/r/tests/testthat/helper-expectation.R) +functions](https://github.com/apache/arrow/blob/main/r/tests/testthat/helper-expectation.R) to get a better understanding of how they work. You should make sure you're testing all parameters of the R function in your diff --git a/r/vignettes/developing.Rmd b/r/vignettes/developing.Rmd index 567094da172..248a80292a0 100644 --- a/r/vignettes/developing.Rmd +++ b/r/vignettes/developing.Rmd @@ -14,7 +14,7 @@ It helps to first outline the structure of the package. C++ is an object-oriented language, so the core logic of the Arrow C++ library is encapsulated in classes and methods. In the arrow R package, these classes are implemented as [R6](https://r6.r-lib.org) classes, most of which are exported from the namespace. -In order to match the C++ naming conventions, the R6 classes are named in "TitleCase", e.g. `RecordBatch`. This makes it easy to look up the relevant C++ implementations in the [code](https://github.com/apache/arrow/tree/master/cpp) or [documentation](https://arrow.apache.org/docs/cpp/). To simplify things in R, the C++ library namespaces are generally dropped or flattened; that is, where the C++ library has `arrow::io::FileOutputStream`, it is just `FileOutputStream` in the R package. One exception is for the file readers, where the namespace is necessary to disambiguate. So `arrow::csv::TableReader` becomes `CsvTableReader`, and `arrow::json::TableReader` becomes `JsonTableReader`. +In order to match the C++ naming conventions, the R6 classes are named in "TitleCase", e.g. `RecordBatch`. This makes it easy to look up the relevant C++ implementations in the [code](https://github.com/apache/arrow/tree/main/cpp) or [documentation](https://arrow.apache.org/docs/cpp/). To simplify things in R, the C++ library namespaces are generally dropped or flattened; that is, where the C++ library has `arrow::io::FileOutputStream`, it is just `FileOutputStream` in the R package. One exception is for the file readers, where the namespace is necessary to disambiguate. So `arrow::csv::TableReader` becomes `CsvTableReader`, and `arrow::json::TableReader` becomes `JsonTableReader`. Some of these classes are not meant to be instantiated directly; they may be base classes or other kinds of helpers. For those that you should be able to create, use the `$create()` method to instantiate an object. For example, `rb <- RecordBatch$create(int = 1:10, dbl = as.numeric(1:10))` will create a `RecordBatch`. Many of these factory methods that an R user might most often encounter also have a "snake_case" alias, in order to be more familiar for contemporary R users. So `record_batch(int = 1:10, dbl = as.numeric(1:10))` would do the same as `RecordBatch$create()` above. diff --git a/r/vignettes/install.Rmd b/r/vignettes/install.Rmd index e778d9a83d9..73ac8f632d3 100644 --- a/r/vignettes/install.Rmd +++ b/r/vignettes/install.Rmd @@ -114,7 +114,7 @@ conda install -c conda-forge --strict-channel-priority r-arrow knitr::include_graphics("./r_source_libarrow_binary.png") ``` -Another way of achieving faster installation with all key features enabled is to use static libarrow binaries we host. These are used automatically on many Linux distributions (x86_64 architecture only), according to the [allowlist](https://github.com/apache/arrow/blob/master/r/tools/nixlibs-allowlist.txt). If your distribution isn't in the list, you can opt-in by setting the `NOT_CRAN` environment variable before you call `install.packages()`: +Another way of achieving faster installation with all key features enabled is to use static libarrow binaries we host. These are used automatically on many Linux distributions (x86_64 architecture only), according to the [allowlist](https://github.com/apache/arrow/blob/main/r/tools/nixlibs-allowlist.txt). If your distribution isn't in the list, you can opt-in by setting the `NOT_CRAN` environment variable before you call `install.packages()`: ```{r, eval = FALSE} Sys.setenv("NOT_CRAN" = "true") @@ -221,7 +221,7 @@ already present (when set to `AUTO`, the default). These dependencies vary by platform; however, if you wish to install these yourself prior to libarrow installation, we recommend that you take a look at -the [docker file for whichever of our CI builds](https://github.com/apache/arrow/tree/master/ci/docker) +the [docker file for whichever of our CI builds](https://github.com/apache/arrow/tree/main/ci/docker) (the ones ending in "cpp" are for building Arrow's C++ libaries, aka libarrow) corresponds most closely to your setup. This will contain the most up-to-date information about dependencies and minimum versions. @@ -354,7 +354,7 @@ Although this function is part of the arrow package, it is also available as a standalone script, so you can access it without first installing the package: ```r -source("https://raw.githubusercontent.com/apache/arrow/master/r/R/install-arrow.R") +source("https://raw.githubusercontent.com/apache/arrow/main/r/R/install-arrow.R") ``` Notes: @@ -378,7 +378,7 @@ on a computer without internet access. The process is as follows: * Install the arrow package **or** source the script directly using the following command: ```r - source("https://raw.githubusercontent.com/apache/arrow/master/r/R/install-arrow.R") + source("https://raw.githubusercontent.com/apache/arrow/main/r/R/install-arrow.R") ``` * Use the `create_package_with_all_dependencies()` function to create the installation bundle: diff --git a/ruby/README.md b/ruby/README.md index 06b9662f04a..1ce82e283e8 100644 --- a/ruby/README.md +++ b/ruby/README.md @@ -21,17 +21,17 @@ Here are the official Ruby bindings for Apache Arrow. -[Red Arrow](https://github.com/apache/arrow/tree/master/ruby/red-arrow) is the base Apache Arrow bindings. +[Red Arrow](https://github.com/apache/arrow/tree/main/ruby/red-arrow) is the base Apache Arrow bindings. -[Red Arrow CUDA](https://github.com/apache/arrow/tree/master/ruby/red-arrow-cuda) is the Apache Arrow bindings of CUDA part. +[Red Arrow CUDA](https://github.com/apache/arrow/tree/main/ruby/red-arrow-cuda) is the Apache Arrow bindings of CUDA part. -[Red Arrow Dataset](https://github.com/apache/arrow/tree/master/ruby/red-arrow-dataset) is the Apache Arrow Dataset bindings. +[Red Arrow Dataset](https://github.com/apache/arrow/tree/main/ruby/red-arrow-dataset) is the Apache Arrow Dataset bindings. -[Red Gandiva](https://github.com/apache/arrow/tree/master/ruby/red-gandiva) is the Gandiva bindings. +[Red Gandiva](https://github.com/apache/arrow/tree/main/ruby/red-gandiva) is the Gandiva bindings. -[Red Plasma](https://github.com/apache/arrow/tree/master/ruby/red-plasma) is the Plasma bindings. (This is deprecated since 10.0.0. This will be removed from 12.0.0 or so.) +[Red Plasma](https://github.com/apache/arrow/tree/main/ruby/red-plasma) is the Plasma bindings. (This is deprecated since 10.0.0. This will be removed from 12.0.0 or so.) -[Red Parquet](https://github.com/apache/arrow/tree/master/ruby/red-parquet) is the Parquet bindings. +[Red Parquet](https://github.com/apache/arrow/tree/main/ruby/red-parquet) is the Parquet bindings. ## Cookbook diff --git a/ruby/red-arrow-cuda/README.md b/ruby/red-arrow-cuda/README.md index f05e6640a83..343b4996a3a 100644 --- a/ruby/red-arrow-cuda/README.md +++ b/ruby/red-arrow-cuda/README.md @@ -25,9 +25,9 @@ Red Arrow CUDA is the Ruby bindings of Apache Arrow CUDA. Red Arrow CUDA is base [GObject Introspection](https://wiki.gnome.org/action/show/Projects/GObjectIntrospection) is a middleware for language bindings of C library. GObject Introspection can generate language bindings automatically at runtime. -Red Arrow CUDA uses [Apache Arrow CUDA GLib](https://github.com/apache/arrow/tree/master/c_glib) and [gobject-introspection gem](https://rubygems.org/gems/gobject-introspection) to generate Ruby bindings of Apache Arrow CUDA. +Red Arrow CUDA uses [Apache Arrow CUDA GLib](https://github.com/apache/arrow/tree/main/c_glib) and [gobject-introspection gem](https://rubygems.org/gems/gobject-introspection) to generate Ruby bindings of Apache Arrow CUDA. -Apache Arrow CUDA GLib is a C wrapper for [Apache Arrow CUDA C++](https://github.com/apache/arrow/tree/master/cpp). GObject Introspection can't use Apache Arrow CUDA C++ directly. Apache Arrow CUDA GLib is a bridge between Apache Arrow CUDA C++ and GObject Introspection. +Apache Arrow CUDA GLib is a C wrapper for [Apache Arrow CUDA C++](https://github.com/apache/arrow/tree/main/cpp). GObject Introspection can't use Apache Arrow CUDA C++ directly. Apache Arrow CUDA GLib is a bridge between Apache Arrow CUDA C++ and GObject Introspection. gobject-introspection gem is a Ruby bindings of GObject Introspection. Red Arrow CUDA uses GObject Introspection via gobject-introspection gem. diff --git a/ruby/red-arrow-dataset/README.md b/ruby/red-arrow-dataset/README.md index b48ef0b6c5e..fa5dd1b0e25 100644 --- a/ruby/red-arrow-dataset/README.md +++ b/ruby/red-arrow-dataset/README.md @@ -25,9 +25,9 @@ Red Arrow Dataset is the Ruby bindings of Apache Arrow Dataset. Red Arrow Datase [GObject Introspection](https://wiki.gnome.org/action/show/Projects/GObjectIntrospection) is a middleware for language bindings of C library. GObject Introspection can generate language bindings automatically at runtime. -Red Arrow Dataset uses [Apache Arrow Dataset GLib](https://github.com/apache/arrow/tree/master/c_glib) and [gobject-introspection gem](https://rubygems.org/gems/gobject-introspection) to generate Ruby bindings of Apache Arrow Dataset. +Red Arrow Dataset uses [Apache Arrow Dataset GLib](https://github.com/apache/arrow/tree/main/c_glib) and [gobject-introspection gem](https://rubygems.org/gems/gobject-introspection) to generate Ruby bindings of Apache Arrow Dataset. -Apache Arrow Dataset GLib is a C wrapper for [Apache Arrow Dataset C++](https://github.com/apache/arrow/tree/master/cpp). GObject Introspection can't use Apache Arrow Dataset C++ directly. Apache Arrow Dataset GLib is a bridge between Apache Arrow Dataset C++ and GObject Introspection. +Apache Arrow Dataset GLib is a C wrapper for [Apache Arrow Dataset C++](https://github.com/apache/arrow/tree/main/cpp). GObject Introspection can't use Apache Arrow Dataset C++ directly. Apache Arrow Dataset GLib is a bridge between Apache Arrow Dataset C++ and GObject Introspection. gobject-introspection gem is a Ruby bindings of GObject Introspection. Red Arrow Dataset uses GObject Introspection via gobject-introspection gem. diff --git a/ruby/red-arrow-flight-sql/README.md b/ruby/red-arrow-flight-sql/README.md index 449c215a72a..6639c3d6166 100644 --- a/ruby/red-arrow-flight-sql/README.md +++ b/ruby/red-arrow-flight-sql/README.md @@ -25,9 +25,9 @@ Red Arrow Flight SQL is the Ruby bindings of Apache Arrow Flight SQL. Red Arrow [GObject Introspection](https://wiki.gnome.org/action/show/Projects/GObjectIntrospection) is a middleware for language bindings of C library. GObject Introspection can generate language bindings automatically at runtime. -Red Arrow Flight SQL uses [Apache Arrow Flight SQL GLib](https://github.com/apache/arrow/tree/master/c_glib/arrow-flight-sql) and [gobject-introspection gem](https://rubygems.org/gems/gobject-introspection) to generate Ruby bindings of Apache Arrow Flight SQL. +Red Arrow Flight SQL uses [Apache Arrow Flight SQL GLib](https://github.com/apache/arrow/tree/main/c_glib/arrow-flight-sql) and [gobject-introspection gem](https://rubygems.org/gems/gobject-introspection) to generate Ruby bindings of Apache Arrow Flight SQL. -Apache Arrow Flight SQL GLib is a C wrapper for [Apache Arrow Flight SQL C++](https://github.com/apache/arrow/tree/master/cpp/src/arrow/flight/sql). GObject Introspection can't use Apache Arrow Flight SQL C++ directly. Apache Arrow Flight SQL GLib is a bridge between Apache Arrow Flight SQL C++ and GObject Introspection. +Apache Arrow Flight SQL GLib is a C wrapper for [Apache Arrow Flight SQL C++](https://github.com/apache/arrow/tree/main/cpp/src/arrow/flight/sql). GObject Introspection can't use Apache Arrow Flight SQL C++ directly. Apache Arrow Flight SQL GLib is a bridge between Apache Arrow Flight SQL C++ and GObject Introspection. gobject-introspection gem is a Ruby bindings of GObject Introspection. Red Arrow Flight SQL uses GObject Introspection via gobject-introspection gem. diff --git a/ruby/red-arrow-flight/README.md b/ruby/red-arrow-flight/README.md index 6498eb6d2bb..58082393275 100644 --- a/ruby/red-arrow-flight/README.md +++ b/ruby/red-arrow-flight/README.md @@ -25,9 +25,9 @@ Red Arrow Flight is the Ruby bindings of Apache Arrow Flight. Red Arrow Flight i [GObject Introspection](https://wiki.gnome.org/action/show/Projects/GObjectIntrospection) is a middleware for language bindings of C library. GObject Introspection can generate language bindings automatically at runtime. -Red Arrow Flight uses [Apache Arrow Flight GLib](https://github.com/apache/arrow/tree/master/c_glib/arrow-flight-glib) and [gobject-introspection gem](https://rubygems.org/gems/gobject-introspection) to generate Ruby bindings of Apache Arrow Flight. +Red Arrow Flight uses [Apache Arrow Flight GLib](https://github.com/apache/arrow/tree/main/c_glib/arrow-flight-glib) and [gobject-introspection gem](https://rubygems.org/gems/gobject-introspection) to generate Ruby bindings of Apache Arrow Flight. -Apache Arrow Flight GLib is a C wrapper for [Apache Arrow Flight C++](https://github.com/apache/arrow/tree/master/cpp/src/arrow/flight). GObject Introspection can't use Apache Arrow Flight C++ directly. Apache Arrow Flight GLib is a bridge between Apache Arrow Flight C++ and GObject Introspection. +Apache Arrow Flight GLib is a C wrapper for [Apache Arrow Flight C++](https://github.com/apache/arrow/tree/main/cpp/src/arrow/flight). GObject Introspection can't use Apache Arrow Flight C++ directly. Apache Arrow Flight GLib is a bridge between Apache Arrow Flight C++ and GObject Introspection. gobject-introspection gem is a Ruby bindings of GObject Introspection. Red Arrow Flight uses GObject Introspection via gobject-introspection gem. diff --git a/ruby/red-arrow/README.md b/ruby/red-arrow/README.md index 4249eeae690..46370af0092 100644 --- a/ruby/red-arrow/README.md +++ b/ruby/red-arrow/README.md @@ -25,9 +25,9 @@ Red Arrow is the Ruby bindings of Apache Arrow. Red Arrow is based on GObject In [GObject Introspection](https://wiki.gnome.org/action/show/Projects/GObjectIntrospection) is a middleware for language bindings of C library. GObject Introspection can generate language bindings automatically at runtime. -Red Arrow uses [Apache Arrow GLib](https://github.com/apache/arrow/tree/master/c_glib) and [gobject-introspection gem](https://rubygems.org/gems/gobject-introspection) to generate Ruby bindings of Apache Arrow. +Red Arrow uses [Apache Arrow GLib](https://github.com/apache/arrow/tree/main/c_glib) and [gobject-introspection gem](https://rubygems.org/gems/gobject-introspection) to generate Ruby bindings of Apache Arrow. -Apache Arrow GLib is a C wrapper for [Apache Arrow C++](https://github.com/apache/arrow/tree/master/cpp). GObject Introspection can't use Apache Arrow C++ directly. Apache Arrow GLib is a bridge between Apache Arrow C++ and GObject Introspection. +Apache Arrow GLib is a C wrapper for [Apache Arrow C++](https://github.com/apache/arrow/tree/main/cpp). GObject Introspection can't use Apache Arrow C++ directly. Apache Arrow GLib is a bridge between Apache Arrow C++ and GObject Introspection. gobject-introspection gem is a Ruby bindings of GObject Introspection. Red Arrow uses GObject Introspection via gobject-introspection gem. @@ -56,7 +56,7 @@ table.save("/dev/shm/data-processed.arrow") Note that you need to install Apache Arrow C++/GLib at master before preparing Red Arrow. See also: * For Apache Arrow C++: https://arrow.apache.org/docs/developers/cpp/building.html - * For Apache Arrow GLib: https://github.com/apache/arrow/blob/master/c_glib/README.md + * For Apache Arrow GLib: https://github.com/apache/arrow/blob/main/c_glib/README.md ```console $ cd ruby/red-arrow diff --git a/ruby/red-gandiva/README.md b/ruby/red-gandiva/README.md index ac6f88c5893..aa3c0ba0307 100644 --- a/ruby/red-gandiva/README.md +++ b/ruby/red-gandiva/README.md @@ -25,9 +25,9 @@ Gandiva is a toolset for compiling and evaluating expressions on Arrow data. [GObject Introspection](https://wiki.gnome.org/action/show/Projects/GObjectIntrospection) is a middleware for language bindings of C library. GObject Introspection can generate language bindings automatically at runtime. -Red Gandiva uses [Gandiva GLib](https://github.com/apache/arrow/tree/master/c_glib/gandiva-glib) and [gobject-introspection gem](https://rubygems.org/gems/gobject-introspection) to generate Ruby bindings of Gandiva. +Red Gandiva uses [Gandiva GLib](https://github.com/apache/arrow/tree/main/c_glib/gandiva-glib) and [gobject-introspection gem](https://rubygems.org/gems/gobject-introspection) to generate Ruby bindings of Gandiva. -Gandiva GLib is a C wrapper for [Gandiva C++](https://github.com/apache/arrow/tree/master/cpp/gandiva). GObject Introspection can't use Gandiva C++ directly. Gandiva GLib is a bridge between Gandiva C++ and GObject Introspection. +Gandiva GLib is a C wrapper for [Gandiva C++](https://github.com/apache/arrow/tree/main/cpp/gandiva). GObject Introspection can't use Gandiva C++ directly. Gandiva GLib is a bridge between Gandiva C++ and GObject Introspection. gobject-introspection gem is a Ruby bindings of GObject Introspection. Red Gandiva uses GObject Introspection via gobject-introspection gem. diff --git a/ruby/red-parquet/README.md b/ruby/red-parquet/README.md index ff919c53704..0c7ebe24483 100644 --- a/ruby/red-parquet/README.md +++ b/ruby/red-parquet/README.md @@ -25,9 +25,9 @@ Red Parquet is the Ruby bindings of Apache Parquet. Red Parquet is based on GObj [GObject Introspection](https://wiki.gnome.org/action/show/Projects/GObjectIntrospection) is a middleware for language bindings of C library. GObject Introspection can generate language bindings automatically at runtime. -Red Parquet uses [Apache Parquet GLib](https://github.com/apache/arrow/tree/master/c_glib/parquet-glib) and [gobject-introspection gem](https://rubygems.org/gems/gobject-introspection) to generate Ruby bindings of Apache Parquet. +Red Parquet uses [Apache Parquet GLib](https://github.com/apache/arrow/tree/main/c_glib/parquet-glib) and [gobject-introspection gem](https://rubygems.org/gems/gobject-introspection) to generate Ruby bindings of Apache Parquet. -Apache Parquet GLib is a C wrapper for [Apache Parquet C++](https://github.com/apache/arrow/tree/master/cpp/src/parquet). GObject Introspection can't use Apache Parquet C++ directly. Apache Parquet GLib is a bridge between Apache Parquet C++ and GObject Introspection. +Apache Parquet GLib is a C wrapper for [Apache Parquet C++](https://github.com/apache/arrow/tree/main/cpp/src/parquet). GObject Introspection can't use Apache Parquet C++ directly. Apache Parquet GLib is a bridge between Apache Parquet C++ and GObject Introspection. gobject-introspection gem is a Ruby bindings of GObject Introspection. Red Parquet uses GObject Introspection via gobject-introspection gem. diff --git a/ruby/red-plasma/README.md b/ruby/red-plasma/README.md index ad717685ece..05c882b885e 100644 --- a/ruby/red-plasma/README.md +++ b/ruby/red-plasma/README.md @@ -27,9 +27,9 @@ Plasma is an in-memory object store and cache for big data. [GObject Introspection](https://wiki.gnome.org/action/show/Projects/GObjectIntrospection) is a middleware for language bindings of C library. GObject Introspection can generate language bindings automatically at runtime. -Red Plasma uses [Plasma GLib](https://github.com/apache/arrow/tree/master/c_glib/plasma-glib) and [gobject-introspection gem](https://rubygems.org/gems/gobject-introspection) to generate Ruby bindings of Plasma. +Red Plasma uses [Plasma GLib](https://github.com/apache/arrow/tree/main/c_glib/plasma-glib) and [gobject-introspection gem](https://rubygems.org/gems/gobject-introspection) to generate Ruby bindings of Plasma. -Plasma GLib is a C wrapper for [Plasma C++](https://github.com/apache/arrow/tree/master/cpp/plasma). GObject Introspection can't use Plasma C++ directly. Plasma GLib is a bridge between Plasma C++ and GObject Introspection. +Plasma GLib is a C wrapper for [Plasma C++](https://github.com/apache/arrow/tree/main/cpp/plasma). GObject Introspection can't use Plasma C++ directly. Plasma GLib is a bridge between Plasma C++ and GObject Introspection. gobject-introspection gem is a Ruby bindings of GObject Introspection. Red Plasma uses GObject Introspection via gobject-introspection gem. From 00096ffc6d2c686847d80bfb69b70471ab851237 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Thu, 16 Feb 2023 20:19:40 +0100 Subject: [PATCH 2/2] few more --- dev/archery/archery/crossbow/core.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/dev/archery/archery/crossbow/core.py b/dev/archery/archery/crossbow/core.py index fbb76d92aec..3353c30b1a6 100644 --- a/dev/archery/archery/crossbow/core.py +++ b/dev/archery/archery/crossbow/core.py @@ -373,9 +373,7 @@ def default_branch_name(self): target_name_tokenized = target_name.split("/") default_branch_name = target_name_tokenized[-1] except KeyError: - # TODO: ARROW-18011 to track changing the hard coded default - # value from "master" to "main". - default_branch_name = "master" + default_branch_name = "main" warnings.warn('Unable to determine default branch name: ' 'ARCHERY_DEFAULT_BRANCH environment variable is ' 'not set. Git repository does not contain a ' @@ -792,9 +790,6 @@ def __init__(self, head, branch, remote, version, r_version, email=None): self.r_version = r_version self.no_rc_version = re.sub(r'-rc\d+\Z', '', version) self.no_rc_r_version = re.sub(r'-rc\d+\Z', '', r_version) - # TODO(ARROW-17552): Remove "master" from default_branch after - # migration to "main". - self.default_branch = ['main', 'master'] # Semantic Versioning 1.0.0: https://semver.org/spec/v1.0.0.html # # > A pre-release version number MAY be denoted by appending an @@ -872,9 +867,7 @@ def from_repo(cls, repo, head=None, branch=None, remote=None, version=None, version=version, r_version=r_version) def is_default_branch(self): - # TODO(ARROW-17552): Switch the condition to "is" instead of "in" - # once "master" is removed from "default_branch". - return self.branch in self.default_branch + return self.branch == 'main' class Task(Serializable):