Converting tests to the new-style

This commit is contained in:
Joe Rickerby
2020-05-02 16:54:19 +01:00
parent c38bc9064a
commit 616e9dd6eb
62 changed files with 750 additions and 103 deletions
+3
View File
@@ -0,0 +1,3 @@
from .base import TemplateProject # noqa
from .c import CTemplateProject # noqa
from .setuptools import SetuptoolsTemplateProject # noqa
+8 -9
View File
@@ -1,29 +1,28 @@
import os
import io
import jinja2
from typing import Union, Dict, Any
from typing import Union, Dict, Any, Optional
FilesDict = Dict[str, Union[str, jinja2.Template]]
TemplateContext = Dict[str, Any]
class TemplateProject:
default_files: FilesDict = {}
files: FilesDict
context: Dict[str, Any]
template_context: TemplateContext
def __init__(self, *, extra_files: FilesDict):
self.files = self.default_files.copy()
self.files.update(extra_files)
self.context = {}
def __init__(self):
self.files = {}
self.template_context = {}
def generate(self, path):
def generate(self, path: str):
for filename, content in self.files.items():
file_path = os.path.join(path, filename)
os.makedirs(os.path.dirname(file_path), exist_ok=True)
with io.open(file_path, 'w', encoding='utf8') as f:
if isinstance(content, jinja2.Template):
content = content.render(self.context)
content = content.render(self.template_context)
f.write(content)
+65 -63
View File
@@ -1,81 +1,83 @@
import textwrap
import jinja2
from .base import TemplateProject
from .setuptools import SetuptoolsTemplateProject
class CTemplateProject(TemplateProject):
default_files = {
'spam.c': jinja2.Template(textwrap.dedent(r'''
#include <Python.h>
spam_c_template = r'''
#include <Python.h>
{{ spam_c_top_level_add }}
{{ spam_c_top_level_add }}
static PyObject *
spam_system(PyObject *self, PyObject *args)
{
const char *command;
int sts;
static PyObject *
spam_system(PyObject *self, PyObject *args)
{
const char *command;
int sts;
if (!PyArg_ParseTuple(args, "s", &command))
return NULL;
if (!PyArg_ParseTuple(args, "s", &command))
return NULL;
sts = system(command);
sts = system(command);
{{ spam_c_function_add | indent(4) }}
{{ spam_c_function_add | indent(4) }}
return PyLong_FromLong(sts);
}
return PyLong_FromLong(sts);
}
/* Module initialization */
/* Module initialization */
#if PY_MAJOR_VERSION >= 3
#define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void)
#define MOD_DEF(m, name, doc, methods, module_state_size) \
static struct PyModuleDef moduledef = { \
PyModuleDef_HEAD_INIT, name, doc, module_state_size, methods, }; \
m = PyModule_Create(&moduledef);
#define MOD_RETURN(m) return m;
#else
#define MOD_INIT(name) PyMODINIT_FUNC init##name(void)
#define MOD_DEF(m, name, doc, methods, module_state_size) \
m = Py_InitModule3(name, methods, doc);
#define MOD_RETURN(m) return;
#endif
#if PY_MAJOR_VERSION >= 3
#define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void)
#define MOD_DEF(m, name, doc, methods, module_state_size) \
static struct PyModuleDef moduledef = { \
PyModuleDef_HEAD_INIT, name, doc, module_state_size, methods, }; \
m = PyModule_Create(&moduledef);
#define MOD_RETURN(m) return m;
#else
#define MOD_INIT(name) PyMODINIT_FUNC init##name(void)
#define MOD_DEF(m, name, doc, methods, module_state_size) \
m = Py_InitModule3(name, methods, doc);
#define MOD_RETURN(m) return;
#endif
static PyMethodDef module_methods[] = {
{"system", (PyCFunction)spam_system, METH_VARARGS,
"Execute a shell command."},
{NULL} /* Sentinel */
};
static PyMethodDef module_methods[] = {
{"system", (PyCFunction)spam_system, METH_VARARGS,
"Execute a shell command."},
{NULL} /* Sentinel */
};
MOD_INIT(spam)
{
PyObject* m;
MOD_INIT(spam)
{
PyObject* m;
MOD_DEF(m,
"spam",
"Example module",
module_methods,
-1)
MOD_DEF(m,
"spam",
"Example module",
module_methods,
-1)
MOD_RETURN(m)
}
''')),
'setup.py': jinja2.Template(textwrap.dedent(r'''
from setuptools import setup, Extension
MOD_RETURN(m)
}
'''
{{ setup_py_add }}
setup(
name="spam",
ext_modules=[Extension("spam", sources=["spam.c"])],
version="0.1.0",
{{ setup_py_setup_args_add | indent(4) }}
)
'''))
}
class CTemplateProject(SetuptoolsTemplateProject):
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'])],
'''
def __init__(self, spam_c_top_level_add, spam_c_function_add, setup_py_add,
setup_py_setup_args_add, extra_files):
super().__init__(extra_files)
self.context = {}
super().__init__(
setup_py_add=setup_py_add,
setup_py_setup_args_add=setup_py_setup_args_add,
setup_cfg_add=setup_cfg_add
)
self.files.update({
'spam.c': jinja2.Template(spam_c_template),
})
self.template_context.update({
'spam_c_top_level_add': spam_c_top_level_add,
'spam_c_function_add': spam_c_function_add,
})
+38
View File
@@ -0,0 +1,38 @@
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,
})