From 895f04a13300e3f5bfd7dbf79d141053f06503f3 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Tue, 24 Sep 2019 17:21:44 +0200 Subject: [PATCH] Try to fix Sphinx error on Travis --- ci/travis_script_python.sh | 2 +- cpp/src/arrow/filesystem/filesystem.h | 2 ++ cpp/src/arrow/filesystem/localfs.h | 2 ++ cpp/src/arrow/filesystem/s3fs.h | 2 ++ cpp/src/arrow/io/file.h | 3 ++- cpp/src/arrow/io/memory.h | 2 ++ 6 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ci/travis_script_python.sh b/ci/travis_script_python.sh index 202c24f0a58cf..6b095b878e591 100755 --- a/ci/travis_script_python.sh +++ b/ci/travis_script_python.sh @@ -226,7 +226,7 @@ if [ "$ARROW_TRAVIS_PYTHON_DOCS" == "1" ]; then doxygen popd cd ../docs - sphinx-build -q -b html -d _build/doctrees -W source _build/html + sphinx-build -q -b html -d _build/doctrees -W --keep-going source _build/html fi popd # $ARROW_PYTHON_DIR diff --git a/cpp/src/arrow/filesystem/filesystem.h b/cpp/src/arrow/filesystem/filesystem.h index da2b12fb89a9e..3d42dbc363162 100644 --- a/cpp/src/arrow/filesystem/filesystem.h +++ b/cpp/src/arrow/filesystem/filesystem.h @@ -231,7 +231,9 @@ class ARROW_EXPORT SubTreeFileSystem : public FileSystem { std::shared_ptr base_fs); ~SubTreeFileSystem() override; + /// \cond FALSE using FileSystem::GetTargetStats; + /// \endcond Status GetTargetStats(const std::string& path, FileStats* out) override; Status GetTargetStats(const Selector& select, std::vector* out) override; diff --git a/cpp/src/arrow/filesystem/localfs.h b/cpp/src/arrow/filesystem/localfs.h index f160c4c43a4eb..57da283b036ac 100644 --- a/cpp/src/arrow/filesystem/localfs.h +++ b/cpp/src/arrow/filesystem/localfs.h @@ -38,7 +38,9 @@ class ARROW_EXPORT LocalFileSystem : public FileSystem { LocalFileSystem(); ~LocalFileSystem() override; + /// \cond FALSE using FileSystem::GetTargetStats; + /// \endcond Status GetTargetStats(const std::string& path, FileStats* out) override; Status GetTargetStats(const Selector& select, std::vector* out) override; diff --git a/cpp/src/arrow/filesystem/s3fs.h b/cpp/src/arrow/filesystem/s3fs.h index 988682272060d..8dd3d87f8ff8e 100644 --- a/cpp/src/arrow/filesystem/s3fs.h +++ b/cpp/src/arrow/filesystem/s3fs.h @@ -79,7 +79,9 @@ class ARROW_EXPORT S3FileSystem : public FileSystem { public: ~S3FileSystem() override; + /// \cond FALSE using FileSystem::GetTargetStats; + /// \endcond Status GetTargetStats(const std::string& path, FileStats* out) override; Status GetTargetStats(const Selector& select, std::vector* out) override; diff --git a/cpp/src/arrow/io/file.h b/cpp/src/arrow/io/file.h index e863c07934adc..596539477428f 100644 --- a/cpp/src/arrow/io/file.h +++ b/cpp/src/arrow/io/file.h @@ -96,8 +96,9 @@ class ARROW_EXPORT FileOutputStream : public OutputStream { // Write bytes to the stream. Thread-safe Status Write(const void* data, int64_t nbytes) override; - + /// \cond FALSE using Writable::Write; + /// \endcond int file_descriptor() const; diff --git a/cpp/src/arrow/io/memory.h b/cpp/src/arrow/io/memory.h index 275c92ba64c2f..2346e1514f0f3 100644 --- a/cpp/src/arrow/io/memory.h +++ b/cpp/src/arrow/io/memory.h @@ -61,7 +61,9 @@ class ARROW_EXPORT BufferOutputStream : public OutputStream { Status Tell(int64_t* position) const override; Status Write(const void* data, int64_t nbytes) override; + /// \cond FALSE using OutputStream::Write; + /// \endcond /// Close the stream and return the buffer Status Finish(std::shared_ptr* result);