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

57
Jenkinsfile vendored
View File

@@ -34,37 +34,34 @@ pipeline {
} }
stage('Build') { stage('Build') {
steps { steps {
withCredentials([sshUserPrivateKey(credentialsId: 'gitea-ssh', keyFileVariable: 'GIT_KEYFILE')]) { sh '''
sh ''' if command -v sudo >/dev/null 2>&1 && sudo -n true >/dev/null 2>&1; then
export GIT_SSH_COMMAND="ssh -i $GIT_KEYFILE -o StrictHostKeyChecking=accept-new" sudo apt-get update -y
if command -v sudo >/dev/null 2>&1 && sudo -n true >/dev/null 2>&1; then sudo apt-get install -y python3-venv python3-pip make build-essential libpq-dev \
sudo apt-get update -y libpango-1.0-0 libpangocairo-1.0-0 libcairo2 libgdk-pixbuf-2.0-0 libffi-dev shared-mime-info
sudo apt-get install -y python3-venv python3-pip make build-essential libpq-dev \ fi
libpango-1.0-0 libpangocairo-1.0-0 libcairo2 libgdk-pixbuf-2.0-0 libffi-dev shared-mime-info python3 -m venv .venv || {
fi python3 -m pip --version >/dev/null 2>&1 || {
python3 -m venv .venv || { curl -fsSL https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py
python3 -m pip --version >/dev/null 2>&1 || { python3 /tmp/get-pip.py --user
curl -fsSL https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py
python3 /tmp/get-pip.py --user
}
python3 -m pip install --user virtualenv
python3 -m virtualenv .venv
} }
. .venv/bin/activate python3 -m pip install --user virtualenv
pip install coverage python3 -m virtualenv .venv
pip install --upgrade pip "setuptools==69.5.1" wheel }
PIP_INDEX_URL=${PIP_INDEX_URL:-https://pypi.mandelblog.com/mandel/testing/+simple/} \ . .venv/bin/activate
PIP_EXTRA_INDEX_URL=${PIP_EXTRA_INDEX_URL:-https://pypi.mandelblog.com/root/pypi/+simple/} \ pip install coverage
pip install --no-build-isolation --pre --editable . setuptools wheel --upgrade --upgrade-strategy=eager --use-deprecated=legacy-resolver pip install --upgrade pip "setuptools==69.5.1" wheel
cp "${JOB_BASE_NAME}/ocyan.json" "${JOB_BASE_NAME}/${JOB_BASE_NAME}.json" PIP_INDEX_URL=${PIP_INDEX_URL:-https://pypi.mandelblog.com/mandel/testing/+simple/} \
pip install ruff vdt.versionplugin.wheel PIP_EXTRA_INDEX_URL=${PIP_EXTRA_INDEX_URL:-https://pypi.mandelblog.com/root/pypi/+simple/} \
pip install --upgrade "setuptools==69.5.1" wheel pip install --no-build-isolation --pre --editable . setuptools wheel --upgrade --upgrade-strategy=eager --use-deprecated=legacy-resolver
manage.py migrate --no-input --skip-checks cp "${JOB_BASE_NAME}/ocyan.json" "${JOB_BASE_NAME}/${JOB_BASE_NAME}.json"
manage.py loaddemodata || true pip install ruff vdt.versionplugin.wheel
manage.py collectstatic --no-input --verbosity=0 pip install --upgrade "setuptools==69.5.1" wheel
pip install "httpx<0.28" manage.py migrate --no-input --skip-checks
''' manage.py loaddemodata || true
} manage.py collectstatic --no-input --verbosity=0
pip install "httpx<0.28"
'''
} }
} }
stage('Lint') { stage('Lint') {

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": [