Updated requirements and configs

WorldCereal · Oct 10, 2024 · da6f50f · da6f50f
1 parent 42bc74e
commit da6f50f
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 16 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -18,12 +18,12 @@ jobs:
       with:
         python-version: 3.9
         cache: 'pip'
-    - name: Install openEO-GFMAP from source
-      run: |
-        git clone https://github.com/Open-EO/openeo-gfmap.git
-        cd openeo-gfmap
-        pip install .
-        cd ..
+    # - name: Install openEO-GFMAP from source
+    #   run: |
+    #     git clone https://github.com/Open-EO/openeo-gfmap.git
+    #     cd openeo-gfmap
+    #     pip install .
+    #     cd ..
     - name: Install Presto from source
       run: |
         git clone -b croptype https://github.com/WorldCereal/presto-worldcereal.git

diff --git a/pyproject.toml b/pyproject.toml
@@ -42,12 +42,10 @@ dependencies = [
     "loguru>=0.7.2",  
     "netcdf4<=1.6.4",  
     "numpy<2.0.0",  
-    "openeo>=0.22.0",  
-    "openeo>=0.31.0",  
-    "openeo-gfmap",  
+    "openeo==0.31.0",  
+    "openeo-gfmap==0.2.0",  
     "pyarrow",  
     "pydantic>=2.6",  
-    "pytest-depends",  
     "rioxarray>=0.13.0",  
     "scipy",  
     "xarray>=2022.3.0"
@@ -60,6 +58,7 @@ dependencies = [
 [project.optional-dependencies]
 dev = [
   "pytest>=7.4.0",
+  "pytest-depends",  
   "matplotlib>=3.3.0"
 ]
 train = [

diff --git a/tests/pre_test_script.sh b/tests/pre_test_script.sh
@@ -3,17 +3,28 @@
 # Install git
 dnf install git -y
 
-# Install openeo-gfmap and presto-worldcereal
+# # 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)
-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 .