diff --git a/Jenkinsfile b/Jenkinsfile index 18d53e09..24575b91 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,11 +9,12 @@ pythonPipeline { test_module_name = 'worldcereal' wipeout_workspace = true python_version = ["3.10"] - extras_require = "jenkins" + extras_require = "dev,train" upload_dev_wheels = false pipeline_triggers = [cron('H H(0-6) * * *')] pep440 = true pre_test_script = 'pre_test_script.sh' + pre_install_script = 'jenkins_pre_install_script.sh' extra_env_variables = [ "OPENEO_AUTH_METHOD=client_credentials", "OPENEO_OIDC_DEVICE_CODE_MAX_POLL_TIME=5", diff --git a/jenkins_pre_install_script.sh b/jenkins_pre_install_script.sh new file mode 100644 index 00000000..5dde333f --- /dev/null +++ b/jenkins_pre_install_script.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +# Install git +dnf install git -y + +# # Install openeo-gfmap and presto-worldcereal +# dir=$(pwd) +# GFMAP_URL="https://github.com/Open-EO/openeo-gfmap.git" +# PRESTO_URL="https://github.com/WorldCereal/presto-worldcereal.git" + +# su - jenkins -c "cd $dir && \ +# source venv310/bin/activate && \ +# git clone $GFMAP_URL && \ +# cd openeo-gfmap || { echo 'Directory not found! Exiting...'; exit 1; } && \ +# pip install . && \ +# cd .. +# git clone -b croptype $PRESTO_URL && \ +# cd presto-worldcereal || { echo 'Directory not found! Exiting...'; exit 1; } && \ +# pip install . +# " + +# For now only presto-worldcereal as gfmap is up to date on pypi +dir=$(pwd) + +su - jenkins -c "cd $dir && \ + source venv310/bin/activate && \ + pip install git+https://github.com/WorldCereal/presto-worldcereal.git@croptype +" \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 3d03a88a..80a9544c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -71,15 +71,6 @@ train = [ "ipywidgets==8.1.3", "duckdb==1.1.0" ] -jenkins = [ - "pytest>=7.4.0", - "matplotlib>=3.3.0", - "catboost==1.2.5", - "scikit-learn==1.5.0", - "torch==2.3.1", - "ipywidgets==8.1.3", - "duckdb==1.1.0" -] [tool.pytest.ini_options] testpaths = [