docs: support sphinx v3

pygobject · Oct 5, 2020 · 7152de3 · 7152de3
1 parent e9c647d
commit 7152de3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -67,7 +67,7 @@ jobs:
         sudo apt-get update -q
         sudo apt-get install -y libcairo2-dev
         python -m pip install --upgrade setuptools
-        python -m pip install --upgrade pytest flake8 "sphinx<3" sphinx_rtd_theme coverage hypothesis attrs wheel
+        python -m pip install --upgrade pytest flake8 sphinx sphinx_rtd_theme coverage hypothesis attrs wheel
         if [[ "${{ matrix.python-version }}" != "pypy3" ]]; then
           python -m pip install --upgrade mypy
         fi
@@ -126,7 +126,7 @@ jobs:
           python -m pip install --upgrade pip
           python -m pip install --upgrade wheel
           python -m pip install --upgrade setuptools
-          python -m pip install --upgrade pytest flake8 "sphinx<3" sphinx_rtd_theme coverage hypothesis attrs
+          python -m pip install --upgrade pytest flake8 sphinx sphinx_rtd_theme coverage hypothesis attrs
           python -m pip install --upgrade mypy || true
           python -m pip install --upgrade pygame
           python -m coverage run --branch setup.py test
@@ -158,7 +158,7 @@ jobs:
           python -m pip install --upgrade pip
           python -m pip install --upgrade wheel
           python -m pip install --upgrade setuptools
-          python -m pip install --upgrade pytest flake8 "sphinx<3" sphinx_rtd_theme coverage hypothesis attrs
+          python -m pip install --upgrade pytest flake8 sphinx sphinx_rtd_theme coverage hypothesis attrs
           python -m pip install --upgrade mypy || true
           python -m pip install --upgrade pygame
           python -m coverage run --branch setup.py test
@@ -198,7 +198,7 @@ jobs:
           python3 -m venv ../venv
           source ../venv/bin/activate
           python -m pip install --upgrade setuptools
-          python -m pip install --upgrade pytest flake8 "sphinx<3" sphinx_rtd_theme coverage hypothesis attrs wheel
+          python -m pip install --upgrade pytest flake8 sphinx sphinx_rtd_theme coverage hypothesis attrs wheel
           python -m pip install --upgrade mypy || true
           # run tests
           python -m coverage run --branch setup.py test

diff --git a/docs/pycairo_c_api.rst b/docs/pycairo_c_api.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 
 ***************
@@ -106,7 +106,7 @@ Cairo Context
 
 .. c:type:: PyTypeObject *PycairoContext_Type
 
-.. c:macro::  cairo_t * PycairoContext_GET(PycairoContext *obj)
+.. c:macro:: PycairoContext_GET(obj)
 
     :param PycairoContext obj:
     :returns: :any:`cairo_t` [transfer none]
@@ -419,3 +419,11 @@ See https://www.cairographics.org/manual/ for details.
     cairo_font_options_t
     cairo_path_t
     cairo_font_face_t
+
+
+CPython Types
+=============
+
+.. c:type:: PyObject
+
+.. c:type:: PyTypeObject