From 0c814d8e97205086c7067b7a7e32a6aee20b6cc3 Mon Sep 17 00:00:00 2001 From: Markus Petke Date: Thu, 25 Jan 2024 08:52:34 +0100 Subject: [PATCH] fix version and dependency (#49) * fix version and dependency * fix licenses * add defaults --- NOTICE-3RD-PARTY-CONTENT.md | 2 +- pyproject.toml | 10 ++++++---- requirements.txt | 2 +- src/velocitas/model_generator/__init__.py | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/NOTICE-3RD-PARTY-CONTENT.md b/NOTICE-3RD-PARTY-CONTENT.md index a55ba9a..1f63486 100644 --- a/NOTICE-3RD-PARTY-CONTENT.md +++ b/NOTICE-3RD-PARTY-CONTENT.md @@ -15,7 +15,7 @@ |nodeenv|1.8.0|BSD| |packaging|23.2|Apache 2.0
BSD| |platformdirs|4.1.0|MIT| -|pluggy|1.3.0|MIT| +|pluggy|1.4.0|MIT| |pre-commit|3.6.0|MIT| |pytest|7.4.4|MIT| |pytest-cov|4.1.0|MIT| diff --git a/pyproject.toml b/pyproject.toml index b71ffb4..5be0c61 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,18 +1,20 @@ [project] name = "velocitas_model_generator" description = "Generates a language-specific data model out of VSS vspec files" -dynamic = ["version"] +dynamic = ["version", "dependencies"] requires-python = ">= 3.10" readme = "README.md" -license = {file = "LICENSE"} +license = { file = "LICENSE" } [tool.setuptools.dynamic] -dependencies = {file = ["requirements.txt"]} +dependencies = { file = ["requirements.txt"] } [build-system] -requires = ["setuptools >= 61.0"] +requires = ["setuptools >= 61.0", "setuptools_scm[toml]"] build-backend = "setuptools.build_meta" [project.scripts] gen-model = "velocitas.model_generator.cli:main" + +[tool.setuptools_scm] diff --git a/requirements.txt b/requirements.txt index 28fd5a8..f869d4a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -git+https://github.com/covesa/vss-tools@v3.0 +vss-tools@git+https://github.com/covesa/vss-tools@v3.0 diff --git a/src/velocitas/model_generator/__init__.py b/src/velocitas/model_generator/__init__.py index 8ea5513..104f64c 100644 --- a/src/velocitas/model_generator/__init__.py +++ b/src/velocitas/model_generator/__init__.py @@ -47,8 +47,8 @@ def generate_model( input_file_path: str, language: str, - target_folder: str, - name: str, + target_folder: str = "./gen_model", + name: str = "vehicle", strict: bool = True, include_dir: str = ".", ext_attributes_list: List[str] = [],