Merge pull request #89 from ThomasWaldmann/sphinx7

upgrade to sphinx 7, fixes #76
libfuse · Aug 28, 2023 · bb69ae0 · bb69ae0
2 parents 5ad944f + df95c4e
commit bb69ae0
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -30,7 +30,7 @@ jobs:
           sudo apt-get install -y pkg-config gcc ninja-build meson
 
       - name: Install Python dependencies (misc)
-        run: pip install setuptools trio pytest pytest_trio "sphinx<6.0" sphinxcontrib-asyncio
+        run: pip install setuptools trio pytest pytest_trio sphinx
 
       - name: Install Python dependencies (Cython 0.29)
         if: ${{ matrix.cython-version == '0.29' }}

diff --git a/developer-notes/release_process.rst b/developer-notes/release_process.rst
@@ -1,7 +1,7 @@
 Steps for Releasing a New Version
 ---------------------------------
 
- * pip install twine "sphinx<6.0" sphinxcontrib-asyncio
+ * pip install twine sphinx
  * pip install -U Cython  # important: use latest/best Cython!
  * Bump version in `setup.py` and version/release in `rst/conf.py`
  * Add release date to `Changes.rst`

diff --git a/rst/conf.py b/rst/conf.py
@@ -28,8 +28,7 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx',
-              'sphinx_cython', 'sphinxcontrib.asyncio' ]
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'sphinx_cython']
 
 # Link to Python standard library
 intersphinx_mapping = {'python': ('https://docs.python.org/3/', None),

diff --git a/rst/fuse_api.rst b/rst/fuse_api.rst
@@ -5,7 +5,7 @@
 .. currentmodule:: pyfuse3
 
 .. autofunction:: init
-.. autocofunction:: main
+.. autofunction:: main
 .. autofunction:: terminate
 .. autofunction:: close
 .. autofunction:: invalidate_inode

diff --git a/rst/install.rst b/rst/install.rst
@@ -46,7 +46,7 @@ Development Version
 
 If you have checked out the unstable development version, a bit more
 effort is required. You need to also have Cython_ (0.29 or newer) and
-Sphinx_ (<6.0) installed, and the necessary commands are::
+Sphinx_ installed, and the necessary commands are::
 
   python3 setup.py build_cython
   python3 setup.py build_ext --inplace