Merge a1336c2 into release

dnv-opensource · Jan 30, 2025 · e4ba848 · e4ba848
2 parents 8932fc4 + a1336c2
commit e4ba848
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/_build_and_publish_documentation.yml b/.github/workflows/_build_and_publish_documentation.yml
@@ -50,7 +50,8 @@ jobs:
       - uses: sphinx-doc/github-problem-matcher@master
       - name: Build documentation
         run: |
-          uv run docs/make.bat html
+          cd docs
+          uv run make html
 
       - name: Clone and cleanup gh-pages branch
         run: |

diff --git a/.github/workflows/_merge_into_release.yml b/.github/workflows/_merge_into_release.yml
@@ -22,10 +22,4 @@ jobs:
         with:
           type: now
           target_branch: release
-          # @TODO: A dedicated RELEASE_TOKEN should be created in the repo settings
-          #        and used for this task when in production.
-          #        It is set here to the default GITHUB_TOKEN only
-          #        for demonstration purposes, enabling the workflow in the repo template
-          #        to run without additional configuration.
-          # github_token: ${{ secrets.RELEASE_TOKEN }}
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          github_token: ${{ secrets.RELEASE_TOKEN }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e
 
 -/-
 
+## [0.7.1] - 2025-01-30
+
+### Changed
+
+* Made explicit that Python 3.13 is not yet supported in the pyproject.toml file
+
 ## [0.7.0] - 2025-01-22
 
 ### Changed

diff --git a/CITATION.cff b/CITATION.cff
@@ -36,4 +36,4 @@ keywords:
   - Systematic assessment
 license: MIT
 url: 'https://github.com/dnv-opensource/ship-traffic-generator'
-version: 0.7.0
+version: 0.7.1
diff --git a/docs/Makefile b/docs/Makefile
@@ -5,7 +5,7 @@
 # from the environment for the first two.
 SPHINXOPTS    ?=
 SPHINXBUILD   ?= sphinx-build
-SOURCEDIR     = .
+SOURCEDIR     = source
 BUILDDIR      = build
 
 # Put it first so that "make" without argument is like "make help".

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -26,7 +26,7 @@
 author = "Tom Arne Pedersen, Claas Rostock, Minos Hemrich"
 
 # The full version, including alpha/beta/rc tags
-release = "0.7.0"
+release = "0.7.1"
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

diff --git a/pyproject.toml b/pyproject.toml
@@ -25,10 +25,10 @@ packages = [
 
 [project]
 name = "trafficgen"
-version = "0.7.0"
+version = "0.7.1"
 description = "Automatic generation of ship traffic situations from a set of predefined situations"
 readme = "README.md"
-requires-python = ">= 3.11"
+requires-python = ">= 3.11, < 3.13"
 license = { file = "LICENSE" }
 authors = [
     { name = "Tom Arne Pedersen", email = "[email protected]" },