diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index d5829e200..62d358c63 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -5,15 +5,15 @@ on: workflow_dispatch: inputs: # Ask if docker deployment needed when manually triggered - deploy: + deploy: description: 'Deploy Docker Image (y/n)?' required: true default: 'n' push: tags: - - '*.*.*' + - '*.*.*' env: - NEEDS_VERSION: 1.1.1 + NEEDS_VERSION: 1.2.0 jobs: build: @@ -25,8 +25,8 @@ jobs: - base-image: "sphinxdoc/sphinx:latest" image: "sphinxneeds-latexpdf" - base-image: "sphinxdoc/sphinx-latexpdf:latest" - image: "sphinxneeds" - name: "Image: ${{ matrix.image }} | Baseimage: ${{ matrix.base-image }}" + image: "sphinxneeds" + name: "Image: ${{ matrix.image }} | Baseimage: ${{ matrix.base-image }}" runs-on: ubuntu-latest steps: # Checks-out your repository under $GITHUB_WORKSPACE @@ -46,7 +46,7 @@ jobs: latest=true tags: | type=pep440,pattern={{version}} - - + - # Check if deployment is needed (if no manual trigger was done, defaults to 'y') name: Check if deployment is needed id: deploycheck @@ -59,7 +59,7 @@ jobs: uses: docker/login-action@v1 with: username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push html image to Doker Hub Docker Registry 🐳 id: docker_build @@ -67,8 +67,8 @@ jobs: with: push: ${{ github.event_name != 'pull_request' && steps.deploycheck.outputs.value == 'y' }} file: docker/Dockerfile - build-args: | + build-args: | NEEDS_VERSION=${{ env.NEEDS_VERSION }} - BASE_IMAGE=${{ matrix.base-image }} + BASE_IMAGE=${{ matrix.base-image }} tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }}} + labels: ${{ steps.meta.outputs.labels }}} diff --git a/docs/changelog.rst b/docs/changelog.rst index 872d4a7a0..b62afba10 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -8,10 +8,16 @@ License .. include:: ../LICENSE -1.2.0 +1.3.0 ----- Released: under development +1.2.0 +----- +Released: 24.01.2023 + +* Bugfix: Allowing newer versions of jsonschema. + (`#848 `_) * Improvement: Adds :ref:`list2need` directive, which allows to create simple needs from list. (`#854 `_) diff --git a/docs/conf.py b/docs/conf.py index d9f6c17d4..d5ccf930b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -42,7 +42,7 @@ # The short X.Y version. version = "1.1" # The full version, including alpha/beta/rc tags. -release = "1.1.1" +release = "1.2.0" on_rtd = os.environ.get("READTHEDOCS") == "True" diff --git a/pyproject.toml b/pyproject.toml index b724ce949..4d1409665 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ name = "sphinx-needs" # !! Don't miss updates in needs.py, conf.py, changelog.rst, and .github/workflows/docker !!! -version = "1.1.1" +version = "1.2.0" description = "Sphinx needs extension for managing needs/requirements and specifications" authors = ["team useblocks "] diff --git a/sphinx_needs/needs.py b/sphinx_needs/needs.py index 56e4b1699..57a924c4e 100644 --- a/sphinx_needs/needs.py +++ b/sphinx_needs/needs.py @@ -103,7 +103,7 @@ from sphinx_needs.utils import INTERNALS, NEEDS_FUNCTIONS, node_match from sphinx_needs.warnings import process_warnings -VERSION = "1.1.1" +VERSION = "1.2.0" NEEDS_FUNCTIONS.clear()