Merge pull request #67 from GanjelaMJ98/MG-4136_fix_0

refactor: update poetry 1.2.2 and fix CI
Tinkoff · May 18, 2023 · d9840df · d9840df
2 parents 691811c + 14c08e0
commit d9840df
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/data-detecitve-airflow-publish.yml b/.github/workflows/data-detecitve-airflow-publish.yml
@@ -10,8 +10,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ 3.9 ]
-        poetry-version: [ 1.1.13 ]
+        python-version: [ '3.9' ]
+        poetry-version: [ '1.2.2' ]
         os: [ ubuntu-latest ]
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/.github/workflows/data-detective-airflow-test.yml b/.github/workflows/data-detective-airflow-test.yml
@@ -9,8 +9,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ 3.9, 3.10 ]
-        poetry-version: [ 1.1.13 ]
+        python-version: [ '3.9', '3.10' ]
+        poetry-version: [ '1.2.2']
         os: [ ubuntu-latest ]
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/data-detective-airflow/docker-compose.tests.yml b/data-detective-airflow/docker-compose.tests.yml
@@ -4,14 +4,16 @@ x-airflow: &airflow
   build:
     context: .
     target: dev
-  environment:
-    - AIRFLOW__DATABASE__SQL_ALCHEMY_CONN=postgresql+psycopg2://${META_USER}:${META_PASS}@metadb:5432/${META_USER}
-    - AIRFLOW__CORE__EXECUTOR=LocalExecutor
-    - AIRFLOW__WEBSERVER__SECRET_KEY=${SECRET_KEY}
-    - AIRFLOW__DATABASE__LOAD_DEFAULT_CONNECTIONS=False
-    - AIRFLOW__CORE__LOAD_EXAMPLES=False
-    - PYTHON_VERSION=${PYTHON_VERSION}
-    - POETRY_VERSION=${POETRY_VERSION}
+    args:
+          AIRFLOW__DATABASE__SQL_ALCHEMY_CONN: postgresql+psycopg2://${META_USER}:${META_PASS}@metadb:5432/${META_USER}
+          AIRFLOW__CORE__EXECUTOR: LocalExecutor
+          AIRFLOW__WEBSERVER__SECRET_KEY: ${SECRET_KEY}
+          AIRFLOW__DATABASE__LOAD_DEFAULT_CONNECTIONS: 'false'
+          AIRFLOW__CORE__LOAD_EXAMPLES: 'false'
+          PYTHON_VERSION: ${PYTHON_VERSION}
+          POETRY_VERSION: ${POETRY_VERSION}
+  env_file:
+    - .env
 
 services:
   ssh_service: