salt/mandelstudio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use published template engine package release

Browse Source
This commit is contained in:
Mandel Olaiya
2026-03-31 01:47:16 +02:00
parent 138a9644be
commit 80d8477ba8
2 changed files with 28 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Jenkinsfile vendored
View File

@@ -34,9 +34,7 @@ pipeline {
} }
stage('Build') { stage('Build') {
steps { steps {
withCredentials([sshUserPrivateKey(credentialsId: 'gitea-ssh', keyFileVariable: 'GIT_KEYFILE')]) {
sh ''' sh '''
export GIT_SSH_COMMAND="ssh -i $GIT_KEYFILE -o StrictHostKeyChecking=accept-new"
if command -v sudo >/dev/null 2>&1 && sudo -n true >/dev/null 2>&1; then if command -v sudo >/dev/null 2>&1 && sudo -n true >/dev/null 2>&1; then
sudo apt-get update -y sudo apt-get update -y
sudo apt-get install -y python3-venv python3-pip make build-essential libpq-dev \ sudo apt-get install -y python3-venv python3-pip make build-essential libpq-dev \
@@ -66,7 +64,6 @@ pipeline {
''' '''
} }
} }
}
stage('Lint') { stage('Lint') {
steps { steps {
sh ''' sh '''

12
setup.py
View File

@@ -4,21 +4,11 @@ import json
from setuptools import find_packages, setup from setuptools import find_packages, setup
install_requires: list = ["setuptools", "ocyan.main"] install_requires: list = ["setuptools", "ocyan.main"]
PINNED_PLUGIN_INSTALL_REQUIRES = {
"ocyan.plugin.template_engine": (
"ocyan.plugin.template_engine @ "
"git+ssh://git@git.mandelblog.com:2222/mandel-plugins/"
"ocyan.plugin.template_engine.git@00923e5586286af81337b357412862cb7a31b5e0"
)
}
# Add frets dependencies # Add frets dependencies
with open("mandelstudio/ocyan.json", encoding="utf-8") as fp: with open("mandelstudio/ocyan.json", encoding="utf-8") as fp:
config = json.loads(fp.read()) config = json.loads(fp.read())
install_requires.extend( install_requires.extend(config["ocyan_plugins"])
PINNED_PLUGIN_INSTALL_REQUIRES.get(plugin, plugin)
for plugin in config["ocyan_plugins"]
)
extras_require: dict = { extras_require: dict = {
"test": [ "test": [