From 30e973402b487978ec67e5cffa54c672522e100d Mon Sep 17 00:00:00 2001 From: krateng Date: Wed, 9 Mar 2022 22:10:07 +0100 Subject: [PATCH] Adjusted development instructions to new system --- DEVELOPMENT.md | 2 +- dev/install_dependencies_alpine.sh | 4 +++ .../dev/install_dependencies_alpine.sh.jinja | 4 +++ dev/update_dist_files.py | 26 +++++++++++++++++++ dev/update_files.py | 24 ----------------- 5 files changed, 35 insertions(+), 25 deletions(-) create mode 100644 dev/install_dependencies_alpine.sh create mode 100644 dev/templates/dev/install_dependencies_alpine.sh.jinja create mode 100644 dev/update_dist_files.py delete mode 100644 dev/update_files.py diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 748cc39..c8224f9 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -14,7 +14,7 @@ To avoid cluttering your system, consider using a [virtual environment](https:// Your system needs several packages installed. On Alpine, this can be done with ```console - sh ./install/install_dependencies.sh + sh ./dev/install_dependencies_alpine.sh ``` For other distros, try to find the equivalents of the packages listed or simply check your error output. diff --git a/dev/install_dependencies_alpine.sh b/dev/install_dependencies_alpine.sh new file mode 100644 index 0000000..64a3a71 --- /dev/null +++ b/dev/install_dependencies_alpine.sh @@ -0,0 +1,4 @@ +apk add \ + gcc python3-dev libxml2-dev libxslt-dev libffi-dev libc-dev py3-pip linux-headers \ + python3 tzdata \ + vips diff --git a/dev/templates/dev/install_dependencies_alpine.sh.jinja b/dev/templates/dev/install_dependencies_alpine.sh.jinja new file mode 100644 index 0000000..8824fbb --- /dev/null +++ b/dev/templates/dev/install_dependencies_alpine.sh.jinja @@ -0,0 +1,4 @@ +apk add \ + {{ tool.osreqs.alpine.build | join(' ') }} \ + {{ tool.osreqs.alpine.run | join(' ') }} \ + {{ tool.osreqs.alpine.opt | join(' ') }} diff --git a/dev/update_dist_files.py b/dev/update_dist_files.py new file mode 100644 index 0000000..08c2132 --- /dev/null +++ b/dev/update_dist_files.py @@ -0,0 +1,26 @@ +import toml +import os +import jinja2 + +with open("pyproject.toml") as filed: + data = toml.load(filed) + +templatedir = "./dev/templates" + +for root,dirs,files in os.walk(templatedir): + + relpath = os.path.relpath(root,start=templatedir) + for f in files: + + srcfile = os.path.join(root,f) + trgfile = os.path.join(relpath,f.replace(".jinja","")) + + + with open(srcfile) as templatefiled: + template = jinja2.Template(templatefiled.read()) + + result = template.render(**data) + + with open(trgfile,"w") as filed: + filed.write(result) + filed.write('\n') diff --git a/dev/update_files.py b/dev/update_files.py deleted file mode 100644 index 02e5810..0000000 --- a/dev/update_files.py +++ /dev/null @@ -1,24 +0,0 @@ -import toml -import os -import jinja2 - -from pprint import pprint - -with open("pyproject.toml") as filed: - data = toml.load(filed) - -templatedir = "./dev/templates" - -for templatefile in os.listdir(templatedir): - - srcfile = os.path.join(templatedir,templatefile) - trgfile = os.path.join(".",templatefile.replace(".jinja","")) - - with open(srcfile) as templatefiled: - template = jinja2.Template(templatefiled.read()) - - result = template.render(**data) - - with open(trgfile,"w") as filed: - filed.write(result) - filed.write('\n')