Changeset 765fd83 for server

Timestamp:

01/19/2023 01:23:40 PM (17 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/xf86-video-removal

Children:

bb4b217d

Parents:

6550bf6 (diff), ca1012d8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'plabs/python-mods' into trunk

This branch introduces a new layout for python modules, similar
to what is done for perl modules. This allows to have useful python
modules in the book (sphinx, pytest, requests, gi-docgen), together
with their dependencies.

As a convenience for users who build by hand, a "Building
pythonhosted.org Files" section is added, which allows building all
the python modules dependencies in one go. It is generated from
the individual module pages, so the authoritative instructions are
on those individual pages.

Location:

server

Files:

• databases/mariadb.xml (modified) (2 diffs)
• major/bind.xml (modified) (4 diffs)
• other/unbound.xml (modified) (1 diff)

server/databases/mariadb.xml

@@ -109 +109 @@
       <xref linkend="pcre2"/>,
       <xref linkend="ruby"/>,
+      <xref linkend="sphinx"/>,
       <xref linkend="unixodbc"/>,
       <xref linkend="valgrind"/>,
@@ -119 +120 @@
       <ulink url="https://www.mruby.org/">mruby</ulink>,
       <ulink url="https://mariadb.com/kb/en/myrocks/">MyRocks</ulink>,
-      <ulink url="https://github.com/google/snappy">Snappy</ulink>,
-      <ulink url="https://sphinxsearch.com/downloads/">Sphinx</ulink>, and
+      <ulink url="https://github.com/google/snappy">Snappy</ulink>, and
       <!--<ulink url="https://mariadb.com/kb/en/mariadb/tokudb/">TokuDB</ulink>, and-->
       <ulink url="https://zeromq.org/">ZeroMQ</ulink>

server/major/bind.xml

@@ -98 +98 @@
       <xref linkend="lmdb"/>,
       <xref linkend="mitkrb"/>,
+      <xref linkend="pytest"/>,
+      <xref linkend="sphinx"/> (required to build documentation),
       <ulink url="https://cmocka.org/">cmocka</ulink>,
       <ulink url="https://github.com/cjheath/geoip">geoip</ulink>,
-      <ulink url="https://docs.pytest.org/en/stable/">pytest</ulink>,
-      <ulink url="https://pypi.python.org/pypi/Sphinx">Sphinx</ulink> (required to build documentation), and
       <ulink url="&w3m-url;">w3m</ulink>
     </para>
@@ -178 +178 @@
       The test suite may indicate some skipped tests depending on
       what configuration options are used. Some tests are marked
-      <quote>UNTESTED</quote> or does even fail if <xref linkend="perl-net-dns"/>
+      <quote>UNTESTED</quote> or do even fail if <xref linkend="perl-net-dns"/>
       is not installed. <!--One test, <quote>CPU</quote>, is known to fail.-->
       To run the tests, as an unprivileged user, execute:
@@ -575 +575 @@
       is included in the source package. The documentation is in .rst
       format which means, it can be converted in human readable formats
-      if <ulink url="https://www.sphinx-doc.org/">Sphinx</ulink> is
-      installed. As time of writing, sphinx is not included in
-      the BLFS book and therefore, the instructions above do not
-      install the docs.
+      if <xref linkend="sphinx"/> is installed.
     </para>
 
@@ -586 +583 @@
       recommended to consult the ARM documentation. ISC provides an
       updated set of excellent documentation along with every release
-      so it can be easily be viewed and/or downloaded - so there is
+      so it can be easily viewed and/or downloaded &ndash; so there is
       no excuse to not read the docs. The formats ISC provides are PDF,
       epub and html at <ulink url="https://downloads.isc.org/isc/bind9/&bind-version;/doc/arm/"/>.

server/other/unbound.xml

@@ -85 +85 @@
       <xref linkend="nettle"/>,
       <xref linkend="python2"/>,
+      <xref linkend="sphinx"/> (for Python bindings documentation),
       <xref linkend="swig"/> (for Python bindings),
-      <xref linkend="doxygen"/> (for html documentation),
-      <ulink url="https://dnstap.info/">dnstap</ulink>, and
-      <ulink url="https://pypi.python.org/pypi/Sphinx">Sphinx</ulink> (for
-      Python bindings documentation)
+      <xref linkend="doxygen"/> (for html documentation), and
+      <ulink url="https://dnstap.info/">dnstap</ulink>
     </para>