changed vcs configuration

pybamm-team · Jul 26, 2024 · ef3ef2f · ef3ef2f
1 parent 621b05b
commit ef3ef2f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/cookiecutter.json b/cookiecutter.json
@@ -18,7 +18,7 @@
     "backend": [
         "hatch"
     ],
-    "hatch_vcs": false,
+    "vcs": false,
     "mypy": false,
     "__year": "{% now 'utc', '%Y' %}",
     "__project_slug": "{{ cookiecutter.project_name | lower | replace('-', '_') | replace('.', '_') }}",
@@ -43,7 +43,7 @@
         "backend": {
             "__prompt__": "Choose a build backend",
             "hatch": "Hatchling (recommended for pure Python projects)",
-              "hatch_vcs": "Enable hatch version control (vcs)?"
+              "vcs": "Enable hatch version control (vcs)?"
         },
         "mypy": "Use mypy and static types"
     }

diff --git a/{{cookiecutter.project_name}}/pyproject.toml b/{{cookiecutter.project_name}}/pyproject.toml
@@ -2,7 +2,7 @@
 {%- if cookiecutter.backend == "hatch" %}
 requires = [
   "hatchling",
-{%- if cookiecutter.hatch_vcs == true %}
+{%- if cookiecutter.backend == "hatch" and cookiecutter.vcs == true %}
   "hatch-vcs",
 {%- endif %}
 ]
@@ -88,7 +88,7 @@ SPM = "{{ cookiecutter.__project_slug }}.models.input.SPM:SPM"
 {# keep this line here for newline #}
 {%- if cookiecutter.backend == "hatch" %}
 [tool.hatch]
-{%- if cookiecutter.hatch_vcs == true %}
+{%- if cookiecutter.backend == "hatch" and cookiecutter.vcs == true %}
 version.source = "vcs"
 build.hooks.vcs.version-file = "src/{{ cookiecutter.__project_slug }}/_version.py"
 {%- endif %}
@@ -97,7 +97,7 @@ envs.default.dependencies = [
 ]
 {%- endif %}
 
-{%- if cookiecutter.hatch_vcs == false %}
+{%- if cookiecutter.backend == "hatch" and cookiecutter.vcs == false %}
 [tool.hatch.version]
 path = "src/{{ cookiecutter.__project_slug }}/__init__.py"
 {%- endif %}

diff --git a/{{cookiecutter.project_name}}/src/{{cookiecutter.__project_slug}}/__init__.py b/{{cookiecutter.project_name}}/src/{{cookiecutter.__project_slug}}/__init__.py
@@ -7,7 +7,7 @@
 from __future__ import annotations
 {%- endif %}
 
-{%- if cookiecutter.hatch_vcs %}
+{%- if cookiecutter.vcs %}
 from ._version import version as __version__
 {%- else %}
 __version__ = "0.1.0"
@@ -20,7 +20,7 @@
 {%- else %}
 __all__ = [
 {%- endif %}
-{%- if cookiecutter.hatch_vcs %}
+{%- if cookiecutter.vcs %}
     "__version__",
 {%- endif %}
     "pybamm",

diff --git a/...cutter.hatch_vcs %}_version.py{% endif %} → ...cookiecutter.vcs %}_version.py{% endif %} b/...cutter.hatch_vcs %}_version.py{% endif %} → ...cookiecutter.vcs %}_version.py{% endif %}