diff --git a/.cz.toml b/.cz.toml index 0394a9a61..5de657e85 100644 --- a/.cz.toml +++ b/.cz.toml @@ -1,5 +1,5 @@ [tool.commitizen] -bump_message = "build(version): update version from $current_version to $new_version [skip ci]" +bump_message = "build(version): :bookmark: update version from $current_version to $new_version [skip ci]" update_changelog_on_bump = true version_provider = "poetry" version_files = [ diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 17d7aa401..10535a93f 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -3,7 +3,6 @@ // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp // List of extensions which should be recommended for users of this workspace. "recommendations": [ - "jebbs.plantuml", "donjayamanne.githistory", "felipecaputo.git-project-manager", "GitHub.vscode-pull-request-github", diff --git a/.vscode/launch.json b/.vscode/launch.json index 0d0668544..37af1fdee 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -4,17 +4,6 @@ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 "version": "0.2.0", "configurations": [ - { - "name": "seedcase-debugger", - "python": "${workspaceFolder}/.venv/bin/python3", - "type": "debugpy", - "request": "launch", - "program": "${workspaceFolder}/manage.py", - "console": "internalConsole", - "args": [ - "runserver" - ] - }, { "name": "test-debugger", "type": "debugpy", diff --git a/.vscode/settings.json b/.vscode/settings.json index f0060057f..491bd60fc 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -32,9 +32,9 @@ "python.defaultInterpreterPath": "${workspaceFolder}/.venv", "python.languageServer": "Pylance", "files.insertFinalNewline": true, - "cSpell.enableFiletypes": [ - "quarto" - ], + "cSpell.enabledFileTypes": { + "quarto": true + }, "cSpell.language": "en,en-GB", "python.testing.pytestEnabled": true, "python.testing.pytestPath": "${workspaceFolder}/.venv/bin/pytest", diff --git a/LICENSE.md b/LICENSE.md index 740f93f0a..aeed82536 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ # MIT License -Copyright (c) 2023-2024 Aarhus University +Copyright (c) 2023-2025 Aarhus University Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/justfile b/justfile index 98391bb16..e297400a4 100644 --- a/justfile +++ b/justfile @@ -8,14 +8,6 @@ run-all: install-deps format-python check-python test-python check-commits build install-deps: poetry install -# Generate SVG images from all PlantUML files -generate-puml-all: - docker run --rm -v $(pwd):/puml -w /puml ghcr.io/plantuml/plantuml:latest -tsvg "**/*.puml" - -# Generate SVG image from specific PlantUML file -generate-puml name: - docker run --rm -v $(pwd):/puml -w /puml ghcr.io/plantuml/plantuml:latest -tsvg "**/{{name}}.puml" - # Run the Python tests test-python: poetry run pytest @@ -39,7 +31,11 @@ build-website: # Run checks on commits with non-main branches check-commits: #!/bin/zsh - if [[ $(git rev-parse --abbrev-ref HEAD) != "main" ]] + branch_name=$(git rev-parse --abbrev-ref HEAD) + number_of_commits=$(git rev-list --count HEAD ^$branch_name) + if [[ ${branch_name} != "main" && ${number_of_commits} -gt 0 ]] then poetry run cz check --rev-range main..HEAD + else + echo "Not on main or haven't committed yet." fi