From e3c8187c61ad30ebca8b09e256630b924cf4d478 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 10 Dec 2023 07:22:08 -0500 Subject: [PATCH] GH-38925: [CI] Fix spelling (#38926) ### Rationale for this change ### What changes are included in this PR? Spelling fixes to ci/ ### Are these changes tested? ### Are there any user-facing changes? * Closes: #38925 Authored-by: Josh Soref <2119212+jsoref@users.noreply.github.com> Signed-off-by: Sutou Kouhei --- ci/conan/all/conandata.yml | 6 +++--- ci/conan/all/conanfile.py | 2 +- ci/conan/all/test_package/test_package.cpp | 2 +- ci/docker/conda-cpp.dockerfile | 2 +- ci/docker/java-jni-manylinux-201x.dockerfile | 2 +- ci/docker/python-wheel-manylinux.dockerfile | 2 +- ci/docker/python-wheel-windows-vs2017.dockerfile | 4 ++-- ci/scripts/install_python.sh | 4 ++-- ci/scripts/install_sccache.sh | 2 +- ci/scripts/integration_spark.sh | 2 +- ci/scripts/r_valgrind.sh | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ci/conan/all/conandata.yml b/ci/conan/all/conandata.yml index 376fdfbfa7ad5..7402272a4b366 100644 --- a/ci/conan/all/conandata.yml +++ b/ci/conan/all/conandata.yml @@ -45,21 +45,21 @@ sources: patches: "8.0.1": - patch_file: "patches/8.0.0-0005-install-utils.patch" - patch_description: "enable utilis installation" + patch_description: "enable utils installation" patch_type: "conan" - patch_file: "patches/8.0.0-0006-fix-cmake.patch" patch_description: "use cci package" patch_type: "conan" "8.0.0": - patch_file: "patches/8.0.0-0005-install-utils.patch" - patch_description: "enable utilis installation" + patch_description: "enable utils installation" patch_type: "conan" - patch_file: "patches/8.0.0-0006-fix-cmake.patch" patch_description: "use cci package" patch_type: "conan" "7.0.0": - patch_file: "patches/7.0.0-0006-install-utils.patch" - patch_description: "enable utilis installation" + patch_description: "enable utils installation" patch_type: "conan" - patch_file: "patches/7.0.0-0007-fix-cmake.patch" patch_description: "use cci package" diff --git a/ci/conan/all/conanfile.py b/ci/conan/all/conanfile.py index b32219f63c8e5..7e87f82e7e018 100644 --- a/ci/conan/all/conanfile.py +++ b/ci/conan/all/conanfile.py @@ -328,7 +328,7 @@ def _with_boost(self, required=False): return bool(self.options.with_boost) def _with_thrift(self, required=False): - # No self.options.with_thift exists + # No self.options.with_thrift exists return bool(required or self._parquet()) def _with_utf8proc(self, required=False): diff --git a/ci/conan/all/test_package/test_package.cpp b/ci/conan/all/test_package/test_package.cpp index 42cab6cc76e7a..fb54b040f44e6 100644 --- a/ci/conan/all/test_package/test_package.cpp +++ b/ci/conan/all/test_package/test_package.cpp @@ -78,7 +78,7 @@ arrow::Status VectorToColumnarTable(const std::vector& rows, // Indicate the start of a new list row. This will memorise the current // offset in the values builder. ARROW_RETURN_NOT_OK(components_builder.Append()); - // Store the actual values. The final nullptr argument tells the underyling + // Store the actual values. The final nullptr argument tells the underlying // builder that all added values are valid, i.e. non-null. ARROW_RETURN_NOT_OK(cost_components_builder.AppendValues(row.cost_components.data(), row.cost_components.size())); diff --git a/ci/docker/conda-cpp.dockerfile b/ci/docker/conda-cpp.dockerfile index b635e5e93455c..7a54dcc86f8fa 100644 --- a/ci/docker/conda-cpp.dockerfile +++ b/ci/docker/conda-cpp.dockerfile @@ -22,7 +22,7 @@ FROM ${repo}:${arch}-conda COPY ci/scripts/install_minio.sh /arrow/ci/scripts RUN /arrow/ci/scripts/install_minio.sh latest /opt/conda -# Unless overriden use Python 3.10 +# Unless overridden use Python 3.10 # Google GCS fails building with Python 3.11 at the moment. ARG python=3.10 diff --git a/ci/docker/java-jni-manylinux-201x.dockerfile b/ci/docker/java-jni-manylinux-201x.dockerfile index 207bea72b5375..8b73c73c1d240 100644 --- a/ci/docker/java-jni-manylinux-201x.dockerfile +++ b/ci/docker/java-jni-manylinux-201x.dockerfile @@ -18,7 +18,7 @@ ARG base FROM ${base} -# Install the libaries required by the Gandiva to run +# Install the libraries required by the Gandiva to run # Use enable llvm[enable-rtti] in the vcpkg.json to avoid link problems in Gandiva RUN vcpkg install \ --clean-after-build \ diff --git a/ci/docker/python-wheel-manylinux.dockerfile b/ci/docker/python-wheel-manylinux.dockerfile index 0f7779c878505..0a50d450c225a 100644 --- a/ci/docker/python-wheel-manylinux.dockerfile +++ b/ci/docker/python-wheel-manylinux.dockerfile @@ -73,7 +73,7 @@ ENV CMAKE_BUILD_TYPE=${build_type} \ VCPKG_FEATURE_FLAGS="manifests" COPY ci/vcpkg/vcpkg.json arrow/ci/vcpkg/ # cannot use the S3 feature here because while aws-sdk-cpp=1.9.160 contains -# ssl related fixies as well as we can patch the vcpkg portfile to support +# ssl related fixes as well as we can patch the vcpkg portfile to support # arm machines it hits ARROW-15141 where we would need to fall back to 1.8.186 # but we cannot patch those portfiles since vcpkg-tool handles the checkout of # previous versions => use bundled S3 build diff --git a/ci/docker/python-wheel-windows-vs2017.dockerfile b/ci/docker/python-wheel-windows-vs2017.dockerfile index b6a8125a5c4fc..faf07800c956a 100644 --- a/ci/docker/python-wheel-windows-vs2017.dockerfile +++ b/ci/docker/python-wheel-windows-vs2017.dockerfile @@ -55,7 +55,7 @@ ENV CMAKE_BUILD_TYPE=${build_type} \ VCPKG_FEATURE_FLAGS="manifests" COPY ci/vcpkg/vcpkg.json arrow/ci/vcpkg/ # cannot use the S3 feature here because while aws-sdk-cpp=1.9.160 contains -# ssl related fixies as well as we can patch the vcpkg portfile to support +# ssl related fixes as well as we can patch the vcpkg portfile to support # arm machines it hits ARROW-15141 where we would need to fall back to 1.8.186 # but we cannot patch those portfiles since vcpkg-tool handles the checkout of # previous versions => use bundled S3 build @@ -97,4 +97,4 @@ RUN python -m pip install -r arrow/python/requirements-wheel-build.txt # For debugging purposes # RUN wget --no-check-certificate https://github.com/lucasg/Dependencies/releases/download/v1.10/Dependencies_x64_Release.zip -# RUN unzip Dependencies_x64_Release.zip -d Dependencies && setx path "%path%;C:\Depencencies" +# RUN unzip Dependencies_x64_Release.zip -d Dependencies && setx path "%path%;C:\Dependencies" diff --git a/ci/scripts/install_python.sh b/ci/scripts/install_python.sh index 8487090f7ad26..5f962f02b911b 100755 --- a/ci/scripts/install_python.sh +++ b/ci/scripts/install_python.sh @@ -21,7 +21,7 @@ set -eu declare -A platforms platforms=([windows]=Windows - [macos]=MacOSX + [macos]=macOS [linux]=Linux) declare -A versions @@ -43,7 +43,7 @@ platform=${platforms[$1]} version=$2 full_version=${versions[$2]} -if [ $platform = "MacOSX" ]; then +if [ $platform = "macOS" ]; then echo "Downloading Python installer..." if [ "$(uname -m)" = "arm64" ] || [ "$version" = "3.10" ] || [ "$version" = "3.11" ] || [ "$version" = "3.12" ]; then diff --git a/ci/scripts/install_sccache.sh b/ci/scripts/install_sccache.sh index 902fb69ec6b67..0346c0cc9ce7d 100755 --- a/ci/scripts/install_sccache.sh +++ b/ci/scripts/install_sccache.sh @@ -56,7 +56,7 @@ if [ ! -d $PREFIX ]; then mkdir -p $PREFIX fi -# Extract only the sccache binary into $PREFIX and ignore README and LCIENSE. +# Extract only the sccache binary into $PREFIX and ignore README and LICENSE. # --wildcards doesn't work on busybox. tar -xzvf $SCCACHE_ARCHIVE --strip-component=1 --directory $PREFIX --exclude="sccache*/*E*E*" chmod u+x $PREFIX/sccache diff --git a/ci/scripts/integration_spark.sh b/ci/scripts/integration_spark.sh index 6e20e77032952..424ac5994653a 100755 --- a/ci/scripts/integration_spark.sh +++ b/ci/scripts/integration_spark.sh @@ -27,7 +27,7 @@ test_pyarrow_only=${3:-false} # Spark branch to checkout spark_version=${SPARK_VERSION:-master} -# Use old behavior that always dropped tiemzones. +# Use old behavior that always dropped timezones. export PYARROW_IGNORE_TIMEZONE=1 if [ "${SPARK_VERSION:1:2}" == "2." ]; then diff --git a/ci/scripts/r_valgrind.sh b/ci/scripts/r_valgrind.sh index fe015cbb0c412..a14cb803ca898 100755 --- a/ci/scripts/r_valgrind.sh +++ b/ci/scripts/r_valgrind.sh @@ -33,7 +33,7 @@ ${R_BIN} CMD INSTALL ${INSTALL_ARGS} arrow*.tar.gz pushd tests # to generate suppression files run: -# ${R_BIN} --vanilla -d "valgrind --tool=memcheck --leak-check=full --track-origins=yes --gen-suppressions=all --log-file=memcheck.log" -f testtthat.supp +# ${R_BIN} --vanilla -d "valgrind --tool=memcheck --leak-check=full --track-origins=yes --gen-suppressions=all --log-file=memcheck.log" -f testthat.supp ${R_BIN} --vanilla -d "valgrind --tool=memcheck --leak-check=full --track-origins=yes --suppressions=/${1}/ci/etc/valgrind-cran.supp" -f testthat.R |& tee testthat.out # valgrind --error-exitcode=1 should return an erroring exit code that we can catch,