Skip to content

Commit e8a90e5

Browse files
authored
Devo 562 airflow 2 updates (#261)
* Update python and packages * Fix failing tests * Fix deprecation warnings * Update version * Try different variable name * Add try/except statement * Add back sqlalchemy * Remove try statement * Try adding db init * Undo db init * Add dagrun to model import * Fix failing tests * Add session rollback * Rollback at the end * Try db init * Remove rollback and add back deprecation warning fixes
1 parent 3d4b318 commit e8a90e5

File tree

6 files changed

+1256
-816
lines changed

6 files changed

+1256
-816
lines changed

.circleci/config.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ orbs:
66
jobs:
77
build-and-test:
88
docker:
9-
- image: cimg/python:3.7.11
9+
- image: cimg/python:3.9.10
1010
environment:
1111
PIPENV_VENV_IN_PROJECT: true
1212
SLUGIFY_USES_TEXT_UNIDECODE: yes
@@ -15,6 +15,9 @@ jobs:
1515
- python/install-packages:
1616
args: --dev
1717
pkg-manager: pipenv
18+
- run:
19+
command: pipenv run airflow db init
20+
name: Init Airflow
1821
- run:
1922
command: pipenv run pylint tulflow -E
2023
name: Lint
@@ -24,7 +27,7 @@ jobs:
2427

2528
build-and-deploy:
2629
docker:
27-
- image: cimg/python:3.7.11
30+
- image: cimg/python:3.9.10
2831
environment:
2932
PIPENV_VENV_IN_PROJECT: true
3033
SLUGIFY_USES_TEXT_UNIDECODE: yes

Pipfile

+20-18
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,28 @@ moto = "*"
1212
requests-mock = "*"
1313

1414
[packages]
15-
apache-airflow-backport-providers-amazon = "*"
16-
apache-airflow-backport-providers-slack = "*"
17-
apache-airflow-backport-providers-ftp = "*"
18-
apache-airflow-backport-providers-sftp = "*"
19-
apache-airflow-backport-providers-ssh = "*"
20-
cryptography = "==3.3.2"
21-
sqlalchemy = "==1.3.23"
22-
setuptools = "*"
23-
wheel = "*"
24-
sickle = ">=0.7.0"
25-
pexpect = "*"
26-
xmltodict = "*"
27-
apache-airflow = "==1.10.15"
28-
lxml = "==4.7.1"
29-
requests = "*"
15+
apache-airflow = "==2.3.0"
16+
apache-airflow-providers-amazon = "*"
17+
apache-airflow-providers-slack = "*"
18+
apache-airflow-providers-ftp = "*"
19+
apache-airflow-providers-sftp = "*"
20+
apache-airflow-providers-ssh = "*"
21+
cryptography = "*"
3022
flask-openid = "==1.3.0"
3123
flask-sqlalchemy = "==2.4.4"
32-
Werkzeug = "==0.16.1"
33-
marshmallow = "==2.21.0"
24+
lxml = "==4.8.0"
25+
marshmallow = "==3.15.0"
26+
numpy= "==1.22.4"
27+
pexpect = "*"
28+
requests = "*"
29+
setuptools = "*"
30+
sickle = ">=0.7.0"
31+
sqlalchemy = "==1.4.9"
32+
werkzeug = "==1.0.1"
33+
wheel = "*"
3434
wtforms = "==2.3.3"
35+
xmltodict = "*"
36+
3537

3638
[requires]
37-
python_version = "3.7"
39+
python_version = "3.9"

0 commit comments

Comments
 (0)