From ce1767968d18d1ab3b118bffdee272e5f3118f9c Mon Sep 17 00:00:00 2001 From: Kaxil Naik Date: Mon, 24 Jan 2022 15:03:34 +0530 Subject: [PATCH] Fix CI issues and Bump dev requirements --- dev-requirements.txt | 9 ++++----- tests/conftest.py | 6 +++--- tests/test_plugin.py | 1 + 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 958b7da..4c913bb 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -4,11 +4,10 @@ wheel # We need our back-ported fixes to Airflow for our tests to pass # We need to specify the astro version here, otherwise it would install the one from pypi repo instead --extra-index-url=https://pip.astronomer.io/simple/ ---constraint=https://raw.githubusercontent.com/astronomer/ap-airflow/master/1.10.7/buster/include/pip-constraints.txt -astronomer-certified==1.10.7.* +--constraint=https://raw.githubusercontent.com/astronomer/ap-airflow/master/2.2.3/bullseye/build-time-pip-constraints.txt +astronomer-certified==2.2.3.* -e .[test] -attrs<20.0 -marshmallow-sqlalchemy==0.23.0 -marshmallow<=2.21.0 +marshmallow-sqlalchemy~=0.26.1 +marshmallow~=3.14.0 diff --git a/tests/conftest.py b/tests/conftest.py index b3f8e35..0cb66ad 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -35,10 +35,10 @@ def app(): os.environ['AIRFLOW__CORE__SQL_ALCHEMY_CONN'] = 'sqlite:///testdb.sqlite' os.environ['AIRFLOW__WEBSERVER__RBAC'] = 'True' from airflow.utils.db import initdb - from airflow.www_rbac.app import create_app + from airflow.www.app import create_app - initdb(rbac=True) - app, _ = create_app(testing=True) + initdb() + app = create_app(testing=True) app.test_client_class = FlaskLoginClient return app diff --git a/tests/test_plugin.py b/tests/test_plugin.py index 85237ff..5b7d219 100644 --- a/tests/test_plugin.py +++ b/tests/test_plugin.py @@ -5,6 +5,7 @@ def test_plugin_registered(): """Verify that the plugin is registered""" + plugins_manager.ensure_plugins_loaded() assert len(plugins_manager.plugins) == 1 assert plugins_manager.plugins[0].name == 'astronomer_version_check' assert plugins_manager.plugins[0].flask_blueprints != []