diff --git a/Jenkinsfile b/Jenkinsfile index 4813ac5..5750d7b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,37 +34,34 @@ pipeline { } stage('Build') { steps { - withCredentials([sshUserPrivateKey(credentialsId: 'gitea-ssh', keyFileVariable: 'GIT_KEYFILE')]) { - 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 - sudo apt-get update -y - sudo apt-get install -y python3-venv python3-pip make build-essential libpq-dev \ - libpango-1.0-0 libpangocairo-1.0-0 libcairo2 libgdk-pixbuf-2.0-0 libffi-dev shared-mime-info - fi - python3 -m venv .venv || { - python3 -m pip --version >/dev/null 2>&1 || { - 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 + sh ''' + if command -v sudo >/dev/null 2>&1 && sudo -n true >/dev/null 2>&1; then + sudo apt-get update -y + sudo apt-get install -y python3-venv python3-pip make build-essential libpq-dev \ + libpango-1.0-0 libpangocairo-1.0-0 libcairo2 libgdk-pixbuf-2.0-0 libffi-dev shared-mime-info + fi + python3 -m venv .venv || { + python3 -m pip --version >/dev/null 2>&1 || { + curl -fsSL https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py + python3 /tmp/get-pip.py --user } - . .venv/bin/activate - pip install coverage - pip install --upgrade pip "setuptools==69.5.1" wheel - PIP_INDEX_URL=${PIP_INDEX_URL:-https://pypi.mandelblog.com/mandel/testing/+simple/} \ - PIP_EXTRA_INDEX_URL=${PIP_EXTRA_INDEX_URL:-https://pypi.mandelblog.com/root/pypi/+simple/} \ - pip install --no-build-isolation --pre --editable . setuptools wheel --upgrade --upgrade-strategy=eager --use-deprecated=legacy-resolver - cp "${JOB_BASE_NAME}/ocyan.json" "${JOB_BASE_NAME}/${JOB_BASE_NAME}.json" - pip install ruff vdt.versionplugin.wheel - pip install --upgrade "setuptools==69.5.1" wheel - manage.py migrate --no-input --skip-checks - manage.py loaddemodata || true - manage.py collectstatic --no-input --verbosity=0 - pip install "httpx<0.28" - ''' - } + python3 -m pip install --user virtualenv + python3 -m virtualenv .venv + } + . .venv/bin/activate + pip install coverage + pip install --upgrade pip "setuptools==69.5.1" wheel + PIP_INDEX_URL=${PIP_INDEX_URL:-https://pypi.mandelblog.com/mandel/testing/+simple/} \ + PIP_EXTRA_INDEX_URL=${PIP_EXTRA_INDEX_URL:-https://pypi.mandelblog.com/root/pypi/+simple/} \ + pip install --no-build-isolation --pre --editable . setuptools wheel --upgrade --upgrade-strategy=eager --use-deprecated=legacy-resolver + cp "${JOB_BASE_NAME}/ocyan.json" "${JOB_BASE_NAME}/${JOB_BASE_NAME}.json" + pip install ruff vdt.versionplugin.wheel + pip install --upgrade "setuptools==69.5.1" wheel + 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') { diff --git a/setup.py b/setup.py index 003ca17..cc914e1 100644 --- a/setup.py +++ b/setup.py @@ -4,21 +4,11 @@ import json from setuptools import find_packages, setup 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 with open("mandelstudio/ocyan.json", encoding="utf-8") as fp: config = json.loads(fp.read()) - install_requires.extend( - PINNED_PLUGIN_INSTALL_REQUIRES.get(plugin, plugin) - for plugin in config["ocyan_plugins"] - ) + install_requires.extend(config["ocyan_plugins"]) extras_require: dict = { "test": [