Fix requirements for docs html build

locationtech · May 3, 2024 · 8dde283 · 8dde283
1 parent 734c786
commit 8dde283
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 38 deletions.
diff --git a/docs/README.md b/docs/README.md
@@ -11,7 +11,7 @@ Installing Sphinx and its dependencies in a Python ``virtualenv``:
 
     $ virtualenv .sphinx && source .sphinx/bin/activate
     $ pip install -r requirements.txt
-    
+
 Alternatively use ``sudo`` with the ``pip`` command to install the packages in the system Python distribution.
 
     $ sudo pip install -r requirements.txt
@@ -49,7 +49,7 @@ when it prompts for input. It should build the whole document. If the
 table of contents doesn't render properly, delete ``GeoMesa.pdf``
 and run ``make`` again.
 
-To build a single HTML file containing all three manuals:
+To build a single HTML file containing all two manuals:
 
     $ mvn clean install -Pdocs,singlehtml
 

diff --git a/docs/bin/common.sh b/docs/bin/common.sh
diff --git a/docs/bin/run-servlet.sh b/docs/bin/run-servlet.sh
diff --git a/docs/pom.xml b/docs/pom.xml
@@ -66,7 +66,7 @@
                                 <configuration>
                                     <target>
                                         <property name="build.directory" value="${project.build.directory}" />
-                                        <ant antfile="build.xml" target="${ant.target}" />
+                                        <ant antfile="build.xml" dir="${basedir}" target="${ant.target}" />
                                     </target>
                                 </configuration>
                                 <goals>

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -5,3 +5,9 @@ sphinx-rtd-theme==1.1.1
 docutils<0.18
 jinja2==3.1.2
 sphinx-copybutton==0.5.1
+# pin some older versions that are compatible with sphinx 4.5
+sphinxcontrib-applehelp==1.0.3
+sphinxcontrib.devhelp==1.0.2
+sphinxcontrib-htmlhelp==2.0.0
+sphinxcontrib-serializinghtml==1.1.5
+sphinxcontrib-qthelp==1.0.3
diff --git a/docs/user/cli/ingest.rst b/docs/user/cli/ingest.rst
@@ -58,7 +58,7 @@ The ``--converter`` argument may be any of the following:
 * The name of a file containing a converter configuration
 
 If a converter is not specified, GeoMesa will attempt to infer a converter definition based on the input files.
-Currently this supports GeoJSON, self-describing Avro, delimited text (TSV, CSV) or Shapefiles. If GeoMesa is able
+Currently this supports JSON, XML, self-describing Avro, delimited text (TSV, CSV), and Shapefiles. If GeoMesa is able
 to infer a schema and converter definition, the user can accept them as-is, or alternatively use them as the basis
 for a fully custom converter. If desired, the user can persist the inferred converter to file, which allows for
 easy modification and reuse. When ingesting a large data set, it can be useful to ingest a single file in local