Added: Added variables and arguments for the conventional commits

greenbone · Aug 30, 2021 · 2daf466 · 2daf466
1 parent 6ff226c
commit 2daf466
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/pontos/release/main.py b/pontos/release/main.py
@@ -88,6 +88,15 @@ def initialize_default_parser() -> ArgumentParser:
             'to CHANGELOG.md in the repository root directory',
         ),
     )
+    prepare_parser.add_argument(
+        '--space',
+        default='greenbone',
+        help='User/Team name in github',
+    )
+    prepare_parser.add_argument(
+        '--project',
+        help='The github project',
+    )
     prepare_parser.add_argument(
         '--conventional-commits',
         '-CC',
@@ -99,6 +108,7 @@ def initialize_default_parser() -> ArgumentParser:
     )
     prepare_parser.add_argument(
         '--conventional-commits-config',
+        dest='cc_config',
         default=Path('changelog.toml'),
         type=FileType('r'),
         help="Conventional commits config file (toml), including conventions.",

diff --git a/pontos/release/prepare.py b/pontos/release/prepare.py
@@ -31,10 +31,7 @@
     calculate_calendar_version,
     commit_files,
     find_signing_key,
-<<<<<<< HEAD
     get_project_name,
-=======
->>>>>>> ee23490... refactor: Splitting up the pontos-release into several files: Detach prepare from single file. Wip: Also including conventional commits into prepare
     get_current_version,
     get_next_patch_version,
     update_version,