Merge branch 'develop' into feature/bump_requests

baobabsoluciones · Aug 28, 2024 · 5ee8939 · 5ee8939
2 parents 6d5c680 + 3c2a88b
commit 5ee8939
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 5 deletions.
diff --git a/.github/workflows/test_cornflow_client.yml b/.github/workflows/test_cornflow_client.yml
@@ -11,9 +11,10 @@ on:
   push:
     branches:
       - master
-      - development
+      - develop
     paths:
       - 'libs/client/**'
+      - '.github/workflows/test_cornflow_client.yml'
       - '!libs/client/README.rst'
       - '!libs/client/setup.py'
 

diff --git a/.github/workflows/test_cornflow_dags.yml b/.github/workflows/test_cornflow_dags.yml
@@ -10,9 +10,10 @@ on:
   push:
     branches:
       - master
-      - development
+      - develop
     paths:
       - 'cornflow-dags/**'
+      - '.github/workflows/test_cornflow_dags.yml'
       - '!cornflow-dags/README.rst'
 
 jobs:  

diff --git a/.github/workflows/test_cornflow_server.yml b/.github/workflows/test_cornflow_server.yml
@@ -11,9 +11,10 @@ on:
   push:
     branches:
       - master
-      - development
+      - develop
     paths: 
       - 'cornflow-server/**'
+      - '.github/workflows/test_cornflow_server.yml'
       - '!cornflow-server/docs/**'
       - '!cornflow-server/README.rst'
 

diff --git a/codecov.yml b/codecov.yml
@@ -22,4 +22,31 @@ flag_management:
     - name: dags-tests 
       paths: 
         - cornflow-dags/
-
+
+comment:
+  layout: "header, diff, flags, components"
+
+component_management:
+  default_rules:
+    statuses:
+      - type: project
+        target: auto
+        threshold: 5%
+        branches:
+          - "!master"
+  individual_components:
+    - component_id: server
+      name: server
+      paths:
+        - cornflow-server/**
+        - "!cornflow-server/cornflow/tests/**"
+    - component_id: client
+      name: client
+      paths:
+        - libs/client/**
+        - "!libs/client/tests/**"
+    - component_id: dags
+      name: dags
+      paths:
+        - cornflow-dags/**
+        - "!cornflow-dags/tests/**"
diff --git a/cornflow-dags/.coveragerc b/cornflow-dags/.coveragerc
@@ -1,4 +1,6 @@
 [run]
+branch = True
+
 omit =
     */tests/*
 

diff --git a/cornflow-dags/requirements.txt b/cornflow-dags/requirements.txt
@@ -9,3 +9,4 @@ xmltodict<=0.13.0
 openpyxl<=3.1.2
 pyomo<=6.6.2
 tsplib95<=0.7.1
+numpy<2.0.0
diff --git a/cornflow-server/.coveragerc b/cornflow-server/.coveragerc
@@ -1,4 +1,6 @@
 [run]
+branch = True
+
 omit =
     */tests/*
 

diff --git a/docs/source/main/install.rst b/docs/source/main/install.rst
@@ -94,6 +94,7 @@ Then we export the variables that we need to run airflow::
   export AIRFLOW__API__AUTH_BACKEND=airflow.api.auth.backend.basic_auth
   export AIRFLOW__WEBSERVER__SECRET_KEY=e9adafa751fd35adfc1fdd3285019be15eea0758f76e38e1e37a1154fb36
   export AIRFLOW_CONN_CF_URI=http://service_user:Service_password1@localhost:5000
+  export AIRFLOW_HOME=./airflow_config/
   airflow webserver -p 8080 &
   airflow scheduler &
 
@@ -195,4 +196,4 @@ Troubleshooting
 
 To install all the dependencies, additional packages may be needed. For example, in Ubuntu 20.04, the following packages are needed::
 
-  sudo apt-get install libpq-dev python3-dev python3.10-venv build-essential
+  sudo apt-get install libpq-dev python3-dev python3.10-venv build-essential
diff --git a/libs/client/.coveragerc b/libs/client/.coveragerc
@@ -1,4 +1,6 @@
 [run]
+branch = True
+
 omit =
     */tests/*