Merge branch 'main' into main-github

jannismain · Sep 25, 2023 · d28a29e · d28a29e
2 parents 811e095 + 05e997e
commit d28a29e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.0.4
+current_version = 0.0.5
 commit = True
 message = bump {current_version} -> {new_version}
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+## [0.0.5] - 2023-09-25
+
+### Fixed
+
+- badge image url for projects hosted on GitLab
+
 ## [0.0.4] - 2023-09-25
 
 ### Changed
@@ -81,7 +87,8 @@ An example project (comparable to [pypa/sampleproject]) can be found at [jannism
 
 - trove classifiers (only relevant when publishing to PyPI)
 
-[unreleased]: https://github.com/jannismain/python-project-template/compare/v0.0.4...HEAD
+[unreleased]: https://github.com/jannismain/python-project-template/compare/v0.0.5...HEAD
+[0.0.5]: https://github.com/jannismain/python-project-template/compare/0.0.4...0.0.5
 [0.0.4]: https://github.com/jannismain/python-project-template/compare/0.0.3...0.0.4
 [0.0.3]: https://github.com/jannismain/python-project-template/compare/0.0.2...0.0.3
 [0.0.2]: https://github.com/jannismain/python-project-template/compare/0.0.1...0.0.2

diff --git a/src/init_python_project/cli.py b/src/init_python_project/cli.py
@@ -11,7 +11,7 @@
 
 app = Typer()
 
-__version__ = "0.0.4"
+__version__ = "0.0.5"
 
 
 def version_callback(value: bool) -> None:

diff --git a/template/context b/template/context
@@ -1,10 +1,10 @@
-{# Example: remote_url = git@git01.iis.fhg.de:ks-ip-lib/software/sample_project.git  #}
-{#                          |----------------|---------|-----------------------|     #}
-{#                                domain        group         pages_path             #}
-{#                                           |---------------------------------|     #}
-{#                                                         path                      #}
-{# remote_url_https = https://git01.iis.fhg.de/ks-ip-lib/software/sample_project/    #}
-{# remote_url_pages = https://ks-ip-lib.git01.iis.fhg.de/software/sample_project/    #}
+{# Example: remote_url = git@git01.iis.fhg.de:ks-ip-lib/software/sample_project.git #}
+{# |----------------|---------|-----------------------| #}
+{# domain group pages_path #}
+{# |---------------------------------| #}
+{# path #}
+{# remote_url_https = https://git01.iis.fhg.de/ks-ip-lib/software/sample_project/ #}
+{# remote_url_pages = https://ks-ip-lib.git01.iis.fhg.de/software/sample_project/ #}
 
 {% set domain = (remote_url | replace("git@", "")).split(":")[0] %}
 {% set path = remote_url.split(":")[1].replace(".git", "") %}
@@ -37,8 +37,8 @@
 {% set remote_url_pipeline_badge = remote_url_https + '/actions/workflows/ci.yaml/badge.svg' %}
 {% else %}
 ## coverage and pipeline badges are provided by gitlab
-{% set remote_url_coverage_badge = remote_url_https + '/badges/' + default_branch + 'coverage.svg' %}
-{% set remote_url_pipeline_badge = remote_url_https + '/badges/' + default_branch + 'pipeline.svg' %}
+{% set remote_url_coverage_badge = remote_url_https + '/badges/' + default_branch + '/coverage.svg' %}
+{% set remote_url_pipeline_badge = remote_url_https + '/badges/' + default_branch + '/pipeline.svg' %}
 {% endif %}
 
 {% set cli_command = package_name | replace("_", "-") %}