Fixing CI/CD pipeline errors

digital-land · Oct 8, 2024 · 13f980e · 13f980e
1 parent 317ce8b
commit 13f980e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 37 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -44,11 +44,6 @@ jobs:
 
       - run: |
           pip install -r requirements/dev-requirements.txt
-        if: ${{ matrix.environment == 'development' }}
-
-      - run: |
-          pip install -r requirements/requirements.txt
-        if: ${{ matrix.environment != 'development' }}
 
       - run: |
           make dags/config.json

diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt
@@ -20,6 +20,10 @@ alembic==1.13.2
     # via
     #   -r requirements/requirements.txt
     #   apache-airflow
+annotated-types==0.7.0
+    # via
+    #   -r requirements/requirements.txt
+    #   pydantic
 anyio==4.4.0
     # via
     #   -r requirements/requirements.txt
@@ -305,7 +309,7 @@ googleapis-common-protos==1.63.2
     #   -r requirements/requirements.txt
     #   opentelemetry-exporter-otlp-proto-grpc
     #   opentelemetry-exporter-otlp-proto-http
-greenlet==3.0.3
+greenlet==3.1.1
     # via
     #   -r requirements/requirements.txt
     #   sqlalchemy
@@ -560,6 +564,12 @@ pycparser==2.22
     # via
     #   -r requirements/requirements.txt
     #   cffi
+pydantic==2.9.2
+    # via -r requirements/requirements.txt
+pydantic-core==2.23.4
+    # via
+    #   -r requirements/requirements.txt
+    #   pydantic
 pygments==2.18.0
     # via
     #   -r requirements/requirements.txt
@@ -742,6 +752,8 @@ typing-extensions==4.12.2
     #   flask-limiter
     #   limits
     #   opentelemetry-sdk
+    #   pydantic
+    #   pydantic-core
 tzdata==2024.1
     # via
     #   -r requirements/requirements.txt

diff --git a/requirements/requirements.in b/requirements/requirements.in
@@ -1,6 +1,4 @@
 apache-airflow==2.9.2
 apache-airflow-providers-amazon
 boto
-pydantic
-pytest
-moto
+pydantic
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    pip-compile --output-file=requirements/requirements.txt requirements/requirements.in
@@ -65,6 +65,8 @@ asgiref==3.8.1
     #   apache-airflow-providers-http
 asn1crypto==1.5.1
     # via scramp
+async-timeout==4.0.3
+    # via aiohttp
 attrs==24.2.0
     # via
     #   aiohttp
@@ -82,15 +84,13 @@ boto==2.49.0
 boto3==1.35.3
     # via
     #   apache-airflow-providers-amazon
-    #   moto
     #   pyathena
     #   redshift-connector
     #   watchtower
 botocore==1.35.3
     # via
     #   apache-airflow-providers-amazon
     #   boto3
-    #   moto
     #   pyathena
     #   redshift-connector
     #   s3transfer
@@ -127,9 +127,7 @@ cron-descriptor==1.4.3
 croniter==3.0.3
     # via apache-airflow
 cryptography==43.0.0
-    # via
-    #   apache-airflow
-    #   moto
+    # via apache-airflow
 deprecated==1.2.14
     # via
     #   apache-airflow
@@ -146,6 +144,8 @@ docutils==0.21.2
     # via python-daemon
 email-validator==2.2.0
     # via flask-appbuilder
+exceptiongroup==1.2.2
+    # via anyio
 flask==2.2.5
     # via
     #   apache-airflow
@@ -199,6 +199,8 @@ googleapis-common-protos==1.63.2
     # via
     #   opentelemetry-exporter-otlp-proto-grpc
     #   opentelemetry-exporter-otlp-proto-http
+greenlet==3.1.1
+    # via sqlalchemy
 grpcio==1.65.5
     # via opentelemetry-exporter-otlp-proto-grpc
 gunicorn==23.0.0
@@ -217,15 +219,15 @@ idna==3.7
     #   requests
     #   yarl
 importlib-metadata==8.0.0
-    # via opentelemetry-api
+    # via
+    #   apache-airflow
+    #   opentelemetry-api
 importlib-resources==6.4.4
     # via limits
 inflection==0.5.1
     # via
     #   apache-airflow-providers-amazon
     #   connexion
-iniconfig==2.0.0
-    # via pytest
 itsdangerous==2.2.0
     # via
     #   apache-airflow
@@ -237,7 +239,6 @@ jinja2==3.1.4
     #   apache-airflow
     #   flask
     #   flask-babel
-    #   moto
     #   python-nvd3
 jmespath==1.0.1
     # via
@@ -297,8 +298,6 @@ methodtools==0.4.7
     # via apache-airflow
 more-itertools==10.4.0
     # via apache-airflow-providers-common-sql
-moto==5.0.16
-    # via -r requirements/requirements.in
 multidict==6.0.5
     # via
     #   aiohttp
@@ -342,17 +341,14 @@ packaging==24.1
     #   limits
     #   marshmallow
     #   marshmallow-sqlalchemy
-    #   pytest
     #   redshift-connector
     #   sqlalchemy-redshift
 pathspec==0.12.1
     # via apache-airflow
 pendulum==3.0.0
     # via apache-airflow
 pluggy==1.5.0
-    # via
-    #   apache-airflow
-    #   pytest
+    # via apache-airflow
 ply==3.11
     # via jsonpath-ng
 prison==0.2.1
@@ -380,8 +376,6 @@ pyjwt==2.9.0
     #   apache-airflow
     #   flask-appbuilder
     #   flask-jwt-extended
-pytest==8.3.3
-    # via -r requirements/requirements.in
 python-daemon==3.0.1
     # via apache-airflow
 python-dateutil==2.9.0.post0
@@ -390,7 +384,6 @@ python-dateutil==2.9.0.post0
     #   botocore
     #   croniter
     #   flask-appbuilder
-    #   moto
     #   pendulum
     #   pyathena
     #   time-machine
@@ -410,7 +403,6 @@ pyyaml==6.0.2
     #   apispec
     #   clickclick
     #   connexion
-    #   responses
 redshift-connector==2.1.3
     # via apache-airflow-providers-amazon
 referencing==0.35.1
@@ -422,15 +414,11 @@ requests==2.32.3
     #   apache-airflow
     #   apache-airflow-providers-http
     #   connexion
-    #   moto
     #   opentelemetry-exporter-otlp-proto-http
     #   redshift-connector
     #   requests-toolbelt
-    #   responses
 requests-toolbelt==1.0.0
     # via apache-airflow-providers-http
-responses==0.25.3
-    # via moto
 rfc3339-validator==0.1.4
     # via apache-airflow
 rich==13.7.1
@@ -495,6 +483,8 @@ time-machine==2.15.0
 typing-extensions==4.12.2
     # via
     #   alembic
+    #   anyio
+    #   asgiref
     #   flask-limiter
     #   limits
     #   opentelemetry-sdk
@@ -512,7 +502,6 @@ urllib3==2.2.2
     # via
     #   botocore
     #   requests
-    #   responses
 watchtower==3.3.1
     # via apache-airflow-providers-amazon
 werkzeug==2.2.3
@@ -523,7 +512,6 @@ werkzeug==2.2.3
     #   flask-appbuilder
     #   flask-jwt-extended
     #   flask-login
-    #   moto
 wirerope==0.4.7
     # via methodtools
 wrapt==1.16.0
@@ -532,8 +520,6 @@ wtforms==3.1.2
     # via
     #   flask-appbuilder
     #   flask-wtf
-xmltodict==0.13.0
-    # via moto
 yarl==1.9.4
     # via aiohttp
 zipp==3.20.0