christianlight/tutor
6
0
Fork 0
mirror of https://github.com/ChristianLight/tutor.git synced 2024-12-12 06:07:56 +00:00
Code Issues Releases Activity
e9585bdc80
tutor/tutor.spec

71 lines
2.0 KiB
RPMSpec
Raw Normal View History

Add all plugins (with data) to binary bundle All existing plugins are added to the binary bundle, in their latest version, so that users don't need to pip install tutor. Also, the tutor MANIFEST.in file was removed to simplify the management of package data. Close #242.
2019-08-20 15:01:34 +00:00
# -*- mode: python -*-
import importlib
import os
import pkg_resources
Fix broken ui command in tutor binary "tutor ui" was failing miserably, printing a lot of garbled characters in the shell. In fact, a FileNotFound error was being raised and automatically caught by the ui command. When removing the catch all, this was the error that was raised: FileNotFoundError: [Errno 2] No such file or directory: '/tmp/_MEIimsqmq/wcwidth/version.json' │ This is resolved on SO: https://stackoverflow.com/questions/62155242/pyinstaller-cant-find-wcwidth-version-json-when-running-executable
2020-06-19 14:29:29 +00:00
import wcwidth
Add all plugins (with data) to binary bundle All existing plugins are added to the binary bundle, in their latest version, so that users don't need to pip install tutor. Also, the tutor MANIFEST.in file was removed to simplify the management of package data. Close #242.
2019-08-20 15:01:34 +00:00
block_cipher = None
datas = [("./tutor/templates", "./tutor/templates")]
hidden_imports = []
Fix broken ui command in tutor binary "tutor ui" was failing miserably, printing a lot of garbled characters in the shell. In fact, a FileNotFound error was being raised and automatically caught by the ui command. When removing the catch all, this was the error that was raised: FileNotFoundError: [Errno 2] No such file or directory: '/tmp/_MEIimsqmq/wcwidth/version.json' │ This is resolved on SO: https://stackoverflow.com/questions/62155242/pyinstaller-cant-find-wcwidth-version-json-when-running-executable
2020-06-19 14:29:29 +00:00
# Fix missing wcwidth/version.json file
datas.append((os.path.dirname(wcwidth.__file__), 'wcwidth'))
Add all plugins (with data) to binary bundle All existing plugins are added to the binary bundle, in their latest version, so that users don't need to pip install tutor. Also, the tutor MANIFEST.in file was removed to simplify the management of package data. Close #242.
2019-08-20 15:01:34 +00:00
# Auto-discover plugins and include patches & templates folders
for entrypoint in pkg_resources.iter_entry_points("tutor.plugin.v0"):
plugin_name = entrypoint.name
plugin = entrypoint.load()
plugin_root = os.path.dirname(plugin.__file__)
plugin_root_module_name = os.path.basename(plugin_root)
hidden_imports.append(entrypoint.module_name)
for folder in ["patches", "templates"]:
path = os.path.join(plugin_root, folder)
if os.path.exists(path):
datas.append((path, os.path.join(plugin_root_module_name, folder)))
Add the lts plugin to the tutor binary
2019-12-25 00:09:53 +00:00
# Fix lts import: if we don't declare some modules, pyinstaller does not find them
hidden_imports.append("tutorlts.__about__")
hidden_imports.append("Crypto.Cipher.AES")
hidden_imports.append("Crypto.Cipher.PKCS1_OAEP")
Fix binary SHA256 import
2019-12-25 00:16:17 +00:00
hidden_imports.append("Crypto.Hash.SHA256")
Add the lts plugin to the tutor binary
2019-12-25 00:09:53 +00:00
hidden_imports.append("Crypto.PublicKey.RSA")
hidden_imports.append("Crypto.Random")
hidden_imports.append("Crypto.Signature.PKCS1_v1_5")
Improve job running in local and k8s Running jobs was previously done with "exec". This was because it allowed us to avoid copying too much container specification information from the docker-compose/deployments files to the jobs files. However, this was limiting: - In order to run a job, the corresponding container had to be running. This was particularly painful in Kubernetes, where containers are crashing as long as migrations are not correctly run. - Containers in which we need to run jobs needed to be present in the docker-compose/deployments files. This is unnecessary, for example when mysql is disabled, or in the case of the certbot container. Now, we create dedicated jobs files, both for local and k8s deployment. This introduces a little redundancy, but not too much. Note that dependent containers are not listed in the docker-compose.jobs.yml file, so an actual platform is still supposed to be running when we launch the jobs. This also introduces a subtle change: now, jobs go through the container entrypoint prior to running. This is probably a good thing, as it will avoid forgetting about incorrect environment variables. In k8s, we find ourselves interacting way too much with the kubectl utility. Parsing output from the CLI is a pain. So we need to switch to the native kubernetes client library.
2020-03-25 17:47:36 +00:00
hidden_imports.append("kubernetes")
Add the lts plugin to the tutor binary
2019-12-25 00:09:53 +00:00
hidden_imports.append("uuid")
Add all plugins (with data) to binary bundle All existing plugins are added to the binary bundle, in their latest version, so that users don't need to pip install tutor. Also, the tutor MANIFEST.in file was removed to simplify the management of package data. Close #242.
2019-08-20 15:01:34 +00:00
# The following was initially generated with:
# pyinstaller --onefile --name=tutor --add-data=./tutor/templates:./tutor/templates ./bin/main.py
a = Analysis(
["bin/main.py"],
pathex=[os.path.abspath(".")],
binaries=[],
datas=datas,
hiddenimports=hidden_imports,
hookspath=[],
runtime_hooks=[],
excludes=[],
win_no_prefer_redirects=False,
win_private_assemblies=False,
cipher=block_cipher,
noarchive=False,
)
pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
exe = EXE(
pyz,
a.scripts,
a.binaries,
a.zipfiles,
a.datas,
[],
name="tutor",
debug=False,
bootloader_ignore_signals=False,
strip=False,
upx=True,
runtime_tmpdir=None,
console=True,
)
Copy Permalink