Make compatible with antsibull-core 2.x.y (#78)

* Make compatible with antsibull-core 2.x.y.

* Linting with 3.11 fails as frozenlist cannot be installed.

Author: felixfontein

.github/workflows/antsibull-docs.yml

@@ -24,8 +24,15 @@ jobs:
       matrix:
         options:
           - '--use-current --sphinx-theme sphinx_rtd_theme'
-          - '--use-current --use-html-blobs --no-breadcrumbs community.crypto community.docker'
-          - '--no-indexes --squash-hierarchy --intersphinx ansible6:https://docs.ansible.com/ansible/6/ community.crypto --collection-version 2.0.0'
+          - '--no-indexes --squash-hierarchy --intersphinx ansible7:https://docs.ansible.com/ansible/6/ community.crypto --collection-version 2.0.0'
+        python:
+          - '3.11'
+        antsibull_core_ref:
+          - main
+        include:
+          - options: '--use-current --use-html-blobs --no-breadcrumbs community.crypto community.docker'
+            python: '3.9'
+            antsibull_core_ref: stable-1
 
     steps:
       - name: Check out antsibull-docs
@@ -38,17 +45,18 @@ jobs:
         with:
           repository: ansible-community/antsibull-core
           path: antsibull-core
+          ref: ${{ matrix.antsibull_core_ref }}
 
-      - name: Set up Python 3.10
+      - name: Set up Python ${{ matrix.python }}
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: ${{ matrix.python }}
 
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           python -m pip install poetry
-          sed -i -e 's/^python = .*/python = "^3.10"/' pyproject.toml
+          sed -i -e 's/^python = .*/python = "^${{ matrix.python }}"/' pyproject.toml
           poetry install
           poetry update
         working-directory: antsibull-docs
@@ -126,23 +134,23 @@ jobs:
           repository: ansible-community/antsibull-core
           path: antsibull-core
 
-      - name: Set up Python 3.10
+      - name: Set up Python 3.11
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.11'
 
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           python -m pip install poetry
-          sed -i -e 's/^python = .*/python = "^3.10"/' pyproject.toml
+          sed -i -e 's/^python = .*/python = "^3.11"/' pyproject.toml
           poetry install
           poetry update
         working-directory: antsibull-docs
 
       - name: Get hold of deps file
         run: |
-          curl https://raw.githubusercontent.com/ansible-community/ansible-build-data/main/6/ansible-6.5.0.deps --output ansible.deps
+          curl https://raw.githubusercontent.com/ansible-community/ansible-build-data/main/7/ansible-7.0.0.deps --output ansible.deps
         working-directory: antsibull-docs
 
       - name: Build stable docs RST files
@@ -175,23 +183,23 @@ jobs:
           repository: ansible-community/antsibull-core
           path: antsibull-core
 
-      - name: Set up Python 3.10
+      - name: Set up Python 3.11
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.11'
 
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           python -m pip install poetry
-          sed -i -e 's/^python = .*/python = "^3.10"/' pyproject.toml
+          sed -i -e 's/^python = .*/python = "^3.11"/' pyproject.toml
           poetry install
           poetry update
         working-directory: antsibull-docs
 
       - name: Get hold of ansible.in file
         run: |
-          curl https://raw.githubusercontent.com/ansible-community/ansible-build-data/main/7/ansible.in --output ansible.in
+          curl https://raw.githubusercontent.com/ansible-community/ansible-build-data/main/8/ansible.in --output ansible.in
         working-directory: antsibull-docs
 
       - name: Build devel docs RST files

.github/workflows/pythonlinters.yml

@@ -3,7 +3,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-# This workflow will install Python 3.9 and other dependencies to lint the code.
+# This workflow will install Python 3.10 and other dependencies to lint the code.
 # For more information see:
 # https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9]
+        python-version: ['3.10']
 
     steps:
       - name: Check out antsibull-docs
@@ -36,6 +36,8 @@ jobs:
         with:
           repository: ansible-community/antsibull-core
           path: antsibull-core
+          # TODO: As long as we still support Python 3.6, 3.7, and 3.8, use stable-1 instead of main!
+          ref: stable-1
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4

.github/workflows/pythontests.yml

@@ -28,6 +28,8 @@ jobs:
         include:
           - python-version: '3.10'
             skip-is-error: true
+          - python-version: '3.11'
+            skip-is-error: true
 
     steps:
       - name: Check out antsibull-docs
@@ -40,6 +42,9 @@ jobs:
         with:
           repository: ansible-community/antsibull-core
           path: antsibull-core
+          # TODO: As long as we still support Python 3.6, 3.7, and 3.8, use stable-1 instead of main!
+          ref: >-
+            ${{ contains(fromJson('["3.6", "3.7", "3.8"]'), matrix.python-version) && 'stable-1' || 'main' }}
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4

changelogs/fragments/78-antsibull-core.yml

@@ -0,0 +1,2 @@
+minor_changes:
+  - "Make compatible with antsibull-core 2.x.y (https://github.com/ansible-community/antsibull-docs/pull/78)."

pyproject.toml

@@ -35,7 +35,7 @@ antsibull-docs = "antsibull_docs.cli.antsibull_docs:main"
 [tool.poetry.dependencies]
 python = "^3.6.1"
 ansible-pygments = "*"
-antsibull-core = ">= 1.2.0, < 2.0.0"
+antsibull-core = ">= 1.2.0, < 3.0.0"
 asyncio-pool = "*"
 docutils = "*"
 jinja2 = "*"