From 33f210b85c4e6a9f4d9415604b731da8b02b2134 Mon Sep 17 00:00:00 2001
From: Joe Rickerby <joerick@mac.com>
Date: Sun, 3 May 2020 10:37:41 +0100
Subject: [PATCH] Remove 'setuptools' template project

---
 test/template_projects/__init__.py   |  1 -
 test/template_projects/c.py          | 37 +++++++++++++++++++--------
 test/template_projects/setuptools.py | 38 ----------------------------
 3 files changed, 27 insertions(+), 49 deletions(-)
 delete mode 100644 test/template_projects/setuptools.py

diff --git a/test/template_projects/__init__.py b/test/template_projects/__init__.py
index d9346449..d83df0e4 100644
--- a/test/template_projects/__init__.py
+++ b/test/template_projects/__init__.py
@@ -1,3 +1,2 @@
 from .base import TemplateProject  # noqa
 from .c import CTemplateProject  # noqa
-from .setuptools import SetuptoolsTemplateProject  # noqa
diff --git a/test/template_projects/c.py b/test/template_projects/c.py
index e1a24ca7..151cc574 100644
--- a/test/template_projects/c.py
+++ b/test/template_projects/c.py
@@ -1,5 +1,5 @@
 import jinja2
-from .setuptools import SetuptoolsTemplateProject
+from .base import TemplateProject
 
 
 spam_c_template = r'''
@@ -59,25 +59,42 @@ MOD_INIT(spam)
 }
 '''
 
+setup_py_template = r'''
+from setuptools import setup, Extension
 
-class CTemplateProject(SetuptoolsTemplateProject):
+{{ setup_py_add }}
+
+setup(
+    ext_modules=[Extension('spam', sources=['spam.c'])],
+    {{ setup_py_setup_args_add | indent(4) }}
+)
+'''
+
+setup_cfg_template = r'''
+[metadata]
+name = spam
+version = 0.1.0
+
+{{ setup_cfg_add }}
+'''
+
+
+class CTemplateProject(TemplateProject):
     def __init__(self, *, spam_c_top_level_add='', spam_c_function_add='', setup_py_add='',
                  setup_py_setup_args_add='', setup_cfg_add=''):
-        setup_py_setup_args_add += '''
-            ext_modules=[Extension('spam', sources=['spam.c'])],
-        '''
 
-        super().__init__(
-            setup_py_add=setup_py_add,
-            setup_py_setup_args_add=setup_py_setup_args_add,
-            setup_cfg_add=setup_cfg_add
-        )
+        super().__init__()
 
         self.files.update({
             'spam.c': jinja2.Template(spam_c_template),
+            'setup.py': jinja2.Template(setup_py_template),
+            'setup.cfg': jinja2.Template(setup_cfg_template),
         })
 
         self.template_context.update({
             'spam_c_top_level_add': spam_c_top_level_add,
             'spam_c_function_add': spam_c_function_add,
+            'setup_py_add': setup_py_add,
+            'setup_py_setup_args_add': setup_py_setup_args_add,
+            'setup_cfg_add': setup_cfg_add,
         })
diff --git a/test/template_projects/setuptools.py b/test/template_projects/setuptools.py
deleted file mode 100644
index 6dcbfe23..00000000
--- a/test/template_projects/setuptools.py
+++ /dev/null
@@ -1,38 +0,0 @@
-
-import jinja2
-from .base import TemplateProject
-
-
-setup_py_template = r'''
-from setuptools import setup, Extension
-
-{{ setup_py_add }}
-
-setup(
-    {{ setup_py_setup_args_add | indent(4) }}
-)
-'''
-
-setup_cfg_template = r'''
-[metadata]
-name = spam
-version = 0.1.0
-
-{{ setup_cfg_add }}
-'''
-
-
-class SetuptoolsTemplateProject(TemplateProject):
-    def __init__(self, *, setup_py_add='', setup_py_setup_args_add='', setup_cfg_add=''):
-        super().__init__()
-
-        self.files.update({
-            'setup.py': jinja2.Template(setup_py_template),
-            'setup.cfg': jinja2.Template(setup_cfg_template),
-        })
-
-        self.template_context.update({
-            'setup_py_add': setup_py_add,
-            'setup_py_setup_args_add': setup_py_setup_args_add,
-            'setup_cfg_add': setup_cfg_add,
-        })