diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 58bc12423..78f9f7772 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -22,7 +22,7 @@ jobs: --health-retries 5 strategy: matrix: - python-version: [3.6, 3.7] + python-version: [3.7, 3.8, 3.9] steps: - uses: actions/checkout@v2 diff --git a/requirement/main.txt b/requirement/main.txt index 8eb51d627..bd221418a 100644 --- a/requirement/main.txt +++ b/requirement/main.txt @@ -6,7 +6,7 @@ python-dateutil==2.8.1 boto3==1.14.45 click==7.1.2 inflection==0.5.0 -numpy==1.19.0 +numpy==1.21.1 sqlalchemy-postgres-copy==0.5.0 retrying==1.3.3 Dickens==1.0.1 @@ -14,7 +14,7 @@ signalled-timeout==1.0.0 s3fs==0.4.2 wrapt==1.12.1 argcmdr==0.7.0 -sqlparse==0.3.1 +sqlparse==0.4.2 pebble==4.5.3 adjustText==0.7.3 graphviz==0.14 diff --git a/src/tests/catwalk_tests/test_integration.py b/src/tests/catwalk_tests/test_integration.py index 105675ae2..564e2b3fe 100644 --- a/src/tests/catwalk_tests/test_integration.py +++ b/src/tests/catwalk_tests/test_integration.py @@ -12,7 +12,7 @@ matrix_metadata_creator, ) -from unittest.mock import patch, create_autospec, MagicMock +from unittest.mock import patch, MagicMock def test_ModelTrainTester_generate_tasks(db_engine_with_results_schema, project_storage, sample_timechop_splits, sample_grid_config): @@ -85,11 +85,11 @@ def setup_model_train_tester(project_storage, replace, additional_bigtrain_class 'test_store': test_matrix_store } - predictor = MagicMock(spec_set=create_autospec(Predictor)) - trainer = MagicMock(spec_set=create_autospec(ModelTrainer)) - evaluator = MagicMock(spec_set=create_autospec(ModelEvaluator)) - individual_importance_calculator = MagicMock(spec_set=create_autospec(IndividualImportanceCalculator)) - protected_groups_generator = MagicMock(spec_set=create_autospec(ProtectedGroupsGenerator)) + predictor = MagicMock(spec_set=Predictor) + trainer = MagicMock(spec_set=ModelTrainer) + evaluator = MagicMock(spec_set=ModelEvaluator) + individual_importance_calculator = MagicMock(spec_set=IndividualImportanceCalculator) + protected_groups_generator = MagicMock(spec_set=ProtectedGroupsGenerator) train_tester = ModelTrainTester( matrix_storage_engine=matrix_storage_engine, model_trainer=trainer,