Merge pull request #1724 from rmartin16/template-whitespace

Support cookiecutter v2.6.0

changes/1663.bugfix.rst

@@ -0,0 +1 @@
+Creating new projects is now compatible with cookiecutter v2.6.0.

pyproject.toml

@@ -80,7 +80,7 @@ dependencies = [
     # If the package uses calver, we don't pin the upper version, as the upper version
     # provides no basis for determining API stability.
     #
-    "cookiecutter >= 2.3.1, < 2.6.0",  # See beeware/briefcase#1663 to bump <2.6.0 pin
+    "cookiecutter >= 2.6.0, < 3.0",
     "dmgbuild >= 1.6, < 2.0; sys_platform == 'darwin'",
     "GitPython >= 3.1, < 4.0",
     "platformdirs >= 2.6, < 5.0",

src/briefcase/bootstraps/pursuedpybear.py

@@ -49,33 +49,32 @@ def main():
 
     def pyproject_table_briefcase_app_extra_content(self):
         return """
-
 requires = [
     "ppb~=3.2.0",
 ]
 test_requires = [
-{%- if cookiecutter.test_framework == "pytest" %}
+{% if cookiecutter.test_framework == "pytest" %}
     "pytest",
-{%- endif %}
+{% endif %}
 ]
 """
 
     def pyproject_table_macOS(self):
-        return """
+        return """\
 universal_build = true
 requires = [
     "std-nslog~=1.0.0",
 ]
 """
 
     def pyproject_table_linux(self):
-        return """
+        return """\
 requires = [
 ]
 """
 
     def pyproject_table_linux_system_debian(self):
-        return """
+        return """\
 system_requires = [
 ]
 
@@ -89,7 +88,7 @@ def pyproject_table_linux_system_debian(self):
 """
 
     def pyproject_table_linux_system_rhel(self):
-        return """
+        return """\
 system_requires = [
 ]
 
@@ -104,7 +103,7 @@ def pyproject_table_linux_system_rhel(self):
 """
 
     def pyproject_table_linux_system_suse(self):
-        return """
+        return """\
 system_requires = [
 ]
 
@@ -119,7 +118,7 @@ def pyproject_table_linux_system_suse(self):
 """
 
     def pyproject_table_linux_system_arch(self):
-        return """
+        return """\
 system_requires = [
 ]
 
@@ -133,7 +132,7 @@ def pyproject_table_linux_system_arch(self):
 """
 
     def pyproject_table_linux_appimage(self):
-        return """
+        return """\
 manylinux = "manylinux_2_28"
 
 system_requires = [
@@ -144,29 +143,29 @@ def pyproject_table_linux_appimage(self):
 """
 
     def pyproject_table_linux_flatpak(self):
-        return """
+        return """\
 flatpak_runtime = "org.freedesktop.Platform"
 flatpak_runtime_version = "23.08"
 flatpak_sdk = "org.freedesktop.Sdk"
 """
 
     def pyproject_table_windows(self):
-        return """
+        return """\
 requires = [
 ]
 """
 
     def pyproject_table_iOS(self):
-        return """
+        return """\
 supported = false
 """
 
     def pyproject_table_android(self):
-        return """
+        return """\
 supported = false
 """
 
     def pyproject_table_web(self):
-        return """
+        return """\
 supported = false
 """

src/briefcase/bootstraps/pygame.py

@@ -59,33 +59,32 @@ def main():
 
     def pyproject_table_briefcase_app_extra_content(self):
         return """
-
 requires = [
     "pygame~=2.2",
 ]
 test_requires = [
-{%- if cookiecutter.test_framework == "pytest" %}
+{% if cookiecutter.test_framework == "pytest" %}
     "pytest",
-{%- endif %}
+{% endif %}
 ]
 """
 
     def pyproject_table_macOS(self):
-        return """
+        return """\
 universal_build = true
 requires = [
     "std-nslog~=1.0.0",
 ]
 """
 
     def pyproject_table_linux(self):
-        return """
+        return """\
 requires = [
 ]
 """
 
     def pyproject_table_linux_system_debian(self):
-        return """
+        return """\
 system_requires = [
 ]
 
@@ -94,7 +93,7 @@ def pyproject_table_linux_system_debian(self):
 """
 
     def pyproject_table_linux_system_rhel(self):
-        return """
+        return """\
 system_requires = [
 ]
 
@@ -103,7 +102,7 @@ def pyproject_table_linux_system_rhel(self):
 """
 
     def pyproject_table_linux_system_suse(self):
-        return """
+        return """\
 system_requires = [
 ]
 
@@ -112,7 +111,7 @@ def pyproject_table_linux_system_suse(self):
 """
 
     def pyproject_table_linux_system_arch(self):
-        return """
+        return """\
 system_requires = [
 ]
 
@@ -121,7 +120,7 @@ def pyproject_table_linux_system_arch(self):
 """
 
     def pyproject_table_linux_appimage(self):
-        return """
+        return """\
 manylinux = "manylinux_2_28"
 
 system_requires = [
@@ -132,29 +131,29 @@ def pyproject_table_linux_appimage(self):
 """
 
     def pyproject_table_linux_flatpak(self):
-        return """
+        return """\
 flatpak_runtime = "org.freedesktop.Platform"
 flatpak_runtime_version = "23.08"
 flatpak_sdk = "org.freedesktop.Sdk"
 """
 
     def pyproject_table_windows(self):
-        return """
+        return """\
 requires = [
 ]
 """
 
     def pyproject_table_iOS(self):
-        return """
+        return """\
 supported = false
 """
 
     def pyproject_table_android(self):
-        return """
+        return """\
 supported = false
 """
 
     def pyproject_table_web(self):
-        return """
+        return """\
 supported = false
 """

src/briefcase/bootstraps/pyside6.py

@@ -46,34 +46,33 @@ def main():
 
     def pyproject_table_briefcase_app_extra_content(self):
         return """
-
 requires = [
     "PySide6-Essentials~=6.5",
     # "PySide6-Addons~=6.5",
 ]
 test_requires = [
-{%- if cookiecutter.test_framework == "pytest" %}
+{% if cookiecutter.test_framework == "pytest" %}
     "pytest",
-{%- endif %}
+{% endif %}
 ]
 """
 
     def pyproject_table_macOS(self):
-        return """
+        return """\
 universal_build = true
 requires = [
     "std-nslog~=1.0.0",
 ]
 """
 
     def pyproject_table_linux(self):
-        return """
+        return """\
 requires = [
 ]
 """
 
     def pyproject_table_linux_system_debian(self):
-        return """
+        return """\
 system_requires = [
 ]
 
@@ -102,7 +101,7 @@ def pyproject_table_linux_system_debian(self):
 """
 
     def pyproject_table_linux_system_rhel(self):
-        return """
+        return """\
 system_requires = [
 ]
 
@@ -112,7 +111,7 @@ def pyproject_table_linux_system_rhel(self):
 """
 
     def pyproject_table_linux_system_suse(self):
-        return """
+        return """\
 system_requires = [
 ]
 
@@ -123,7 +122,7 @@ def pyproject_table_linux_system_suse(self):
 """
 
     def pyproject_table_linux_system_arch(self):
-        return """
+        return """\
 system_requires = [
 ]
 
@@ -133,7 +132,7 @@ def pyproject_table_linux_system_arch(self):
 """
 
     def pyproject_table_linux_appimage(self):
-        return """
+        return """\
 manylinux = "manylinux_2_28"
 
 system_requires = [
@@ -145,29 +144,29 @@ def pyproject_table_linux_appimage(self):
 """
 
     def pyproject_table_linux_flatpak(self):
-        return """
+        return """\
 flatpak_runtime = "org.kde.Platform"
 flatpak_runtime_version = "6.6"
 flatpak_sdk = "org.kde.Sdk"
 """
 
     def pyproject_table_windows(self):
-        return """
+        return """\
 requires = [
 ]
 """
 
     def pyproject_table_iOS(self):
-        return """
+        return """\
 supported = false
 """
 
     def pyproject_table_android(self):
-        return """
+        return """\
 supported = false
 """
 
     def pyproject_table_web(self):
-        return """
+        return """\
 supported = false
 """