From 8b049e90fffa51d243bfc356109018d26bddbeb0 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Mon, 18 Dec 2023 17:10:15 +0000 Subject: [PATCH] Set up antsibull-core v3 development --- .github/workflows/antsibull-docs.yml | 20 +++++++++----------- .github/workflows/antsibull.yml | 18 ++++++++---------- README.md | 2 +- src/antsibull_core/__init__.py | 2 +- 4 files changed, 19 insertions(+), 23 deletions(-) diff --git a/.github/workflows/antsibull-docs.yml b/.github/workflows/antsibull-docs.yml index 022aa07..87601d6 100644 --- a/.github/workflows/antsibull-docs.yml +++ b/.github/workflows/antsibull-docs.yml @@ -30,34 +30,32 @@ jobs: with: path: antsibull-core - # nb: this is the first version of antsibull-docs that declares support - # for antsibull-core v2 - name: Check out antsibull-docs 1.8.0 uses: actions/checkout@v4 with: repository: ansible-community/antsibull-docs - ref: 1.8.0 + ref: main path: antsibull-docs - name: Set up Python 3.11 + id: python uses: actions/setup-python@v5 with: python-version: '3.11' - name: Install dependencies + env: + PYTHON: "${{ steps.python.outputs.python-path }}" run: | - python3 -m venv venv + pipx install --python "${PYTHON}" nox + python -m venv venv . ./venv/bin/activate - python -m pip install --upgrade pip - python -m pip install . ../antsibull-core "pyre-check ~= 0.9" + python -m pip install . ../antsibull-core working-directory: antsibull-docs - # pyre should complain if a signature changed in an incompatible way - - name: Lint with pyre + - name: Run type checkers run: | - . ./venv/bin/activate - sed -i 's|poetry run||' ./lint-pyre.sh - ./lint-pyre.sh + nox -e typing working-directory: antsibull-docs - name: Use antsibull-docs sphinx-init diff --git a/.github/workflows/antsibull.yml b/.github/workflows/antsibull.yml index 6507d25..b405427 100644 --- a/.github/workflows/antsibull.yml +++ b/.github/workflows/antsibull.yml @@ -38,35 +38,33 @@ jobs: ref: 0.14.0 path: antsibull-changelog - # nb: this is the first version of antsibull that declares support for antsibull-core v2 - name: Check out antsibull 0.52.0 uses: actions/checkout@v4 with: repository: ansible-community/antsibull - ref: 0.52.0 + ref: main path: antsibull - name: Set up Python 3.11 + id: python uses: actions/setup-python@v5 with: python-version: '3.11' - name: Install dependencies + env: + PYTHON: "${{ steps.python.outputs.python-path }}" run: | + pipx install --python "${PYTHON}" nox python -m venv venv . ./venv/bin/activate - python -m pip install --upgrade pip - python -m pip install . ../antsibull-changelog ../antsibull-core "pyre-check ~= 0.9" ansible-core "wheel" + python -m pip install . ../antsibull-core ../antsibull-changelog ansible-galaxy collection install community.general working-directory: antsibull - # pyre should complain if a signature changed in an incompatible way - - name: Lint with pyre + - name: Run type checkers run: | - . ./venv/bin/activate - sed -i 's|poetry run||' ./lint-pyre.sh - sed -i 's|--search-path ../antsibull-docs/src/||' ./lint-pyre.sh - ./lint-pyre.sh + nox -e typing working-directory: antsibull - name: "Test building a release: Ansible 7 with ansible-core 2.14" diff --git a/README.md b/README.md index cdbe9e0..7878e30 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ antsibull-core is covered by the [Ansible Code of Conduct](https://docs.ansible. From version 1.0.0 on, antsibull-core sticks to semantic versioning and aims at providing no backwards compatibility breaking changes during a major release cycle. We might make exceptions from this in case of security fixes for vulnerabilities that are severe enough. -The current major version is 2.x.y. Development for 2.x.y occurs on the `main` branch. 1.x.y is End of Life and was developed on the `stable-1` branch. It is no longer updated. 2.x.y mainly differs from 1.x.y by dropping support for Python 3.6, 3.7, and 3.8. It deprecates several compatibility functions for older Python versions that are no longer needed; see the changelog for details. +The current development version is 3.x.y. 3.x.y is developed on the `main` branch. The current supported major version is 2.x.y. Development for 2.x.y occurs on the `stable-2` branch. 1.x.y is End of Life and was developed on the `stable-1` branch. It is no longer updated. 2.x.y mainly differs from 1.x.y by dropping support for Python 3.6, 3.7, and 3.8. It deprecates several compatibility functions for older Python versions that are no longer needed; see the changelog for details. ## Development diff --git a/src/antsibull_core/__init__.py b/src/antsibull_core/__init__.py index ce75392..943d0f3 100644 --- a/src/antsibull_core/__init__.py +++ b/src/antsibull_core/__init__.py @@ -9,6 +9,6 @@ from __future__ import annotations -__version__ = "2.2.0.post0" +__version__ = "3.0.0.dev0" __all__ = ("__version__",)