update jinja conditions to fix whitespace and new lines for citation text

Author: fdiblen

template/CONTRIBUTING.md.jinja

@@ -45,8 +45,8 @@ In case you feel like you've made a valuable contribution, but you don't know ho
 
 To create a release you need write permission on the repository.
 
-{% if AddCitation %}1. Check the author list in [`CITATION.cff`](CITATION.cff){% endif %}
-1. Bump the version using `bump-my-version bump <major|minor|patch>`. For example, `bump-my-version bump major` will increase major version numbers everywhere it's needed (code, meta, etc.) in the repo. Alternatively the version can be manually changed in {{ package_name }}/__init__.py, pyproject.toml, {% if AddCitation %}CITATION.cff{% endif %} and docs/conf.py (and other places it was possibly added).
+{% if AddCitation -%}1. Check the author list in [`CITATION.cff`](CITATION.cff){%- endif %}
+1. Bump the version using `bump-my-version bump <major|minor|patch>`. For example, `bump-my-version bump major` will increase major version numbers everywhere it's needed (code, meta, etc.) in the repo. Alternatively the version can be manually changed in {{ package_name }}/__init__.py, pyproject.toml, {% if AddCitation %}CITATION.cff{%- endif -%} and docs/conf.py (and other places it was possibly added).
 1. Update the `CHANGELOG.md` to include changes made
 1. Go to the [GitHub release page]({{ repository_url }}/releases)
 1. Press draft a new release button

template/MANIFEST.in.jinja

@@ -1,4 +1,4 @@
-{% if AddCitation %}include CITATION.cff{% endif %}
+{% if AddCitation -%}include CITATION.cff{%- endif %}
 include LICENSE
 include NOTICE
 include README.md

template/README.dev.md.jinja

@@ -134,7 +134,7 @@ This section describes how to make a release in 3 parts:
 ### (1/3) Preparation
 
 1. Update the <CHANGELOG.md> (don't forget to update links at bottom of page)
-{% if AddCitation %}1. Verify that the information in [`CITATION.cff`](CITATION.cff) is correct.{% endif %}
+{% if AddCitation -%}1. Verify that the information in [`CITATION.cff`](CITATION.cff) is correct.{%- endif %}
 1. Make sure the [version has been updated](#versioning).
 1. Run the unit tests with `pytest -v`
 

template/README.md.jinja

@@ -16,7 +16,9 @@
 | Documentation                      | [![Documentation Status](https://readthedocs.org/projects/{{package_name}}/badge/?version=latest)](https://{{package_name}}.readthedocs.io/en/latest/?badge=latest) |
 | **GitHub Actions**                 |   |
 | Build                              | [![build]({{repository_url}}/actions/workflows/build.yml/badge.svg)]({{repository_url}}/actions/workflows/build.yml) |
-{% if AddCitation %}| Citation data consistency          | [![cffconvert]({{repository_url}}/actions/workflows/cffconvert.yml/badge.svg)]({{repository_url}}/actions/workflows/cffconvert.yml) |{% endif %}
+{% if AddCitation -%}
+| Citation data consistency          | [![cffconvert]({{repository_url}}/actions/workflows/cffconvert.yml/badge.svg)]({{repository_url}}/actions/workflows/cffconvert.yml) |
+{%- endif -%}
 | SonarCloud                         | [![sonarcloud]({{repository_url}}/actions/workflows/sonarcloud.yml/badge.svg)]({{repository_url}}/actions/workflows/sonarcloud.yml) |
 | MarkDown link checker              | [![markdown-link-check]({{repository_url}}/actions/workflows/markdown-link-check.yml/badge.svg)]({{repository_url}}/actions/workflows/markdown-link-check.yml) |
 

template/project_setup.md.jinja

@@ -90,13 +90,13 @@ help you decide which tool to use for packaging.
 - Document changes to your software package
 - [Relevant section in the guide](https://guide.esciencecenter.nl/#/best_practices/releases?id=changelogmd)
 
-{% if AddCitation %}
+{% if AddCitation -%}
 ## CITATION.cff
 
 - To allow others to cite your software, add a `CITATION.cff` file
 - It only makes sense to do this once there is something to cite (e.g., a software release with a DOI).
 - Follow the [making software citable](https://guide.esciencecenter.nl/#/citable_software/making_software_citable) section in the guide.
-{% endif %}
+{%- endif -%}
 
 ## CODE_OF_CONDUCT.md
 

template/pyproject.toml.jinja

@@ -149,10 +149,10 @@ filename = "src/{{ package_name }}/__init__.py"
 [[tool.bumpversion.files]]
 filename = "pyproject.toml"
 
-{% if AddCitation %}
+{% if AddCitation -%}
 [[tool.bumpversion.files]]
 filename = "CITATION.cff"
-{% endif %}
+{%- endif %}
 
 [[tool.bumpversion.files]]
 filename = "docs/conf.py"