From 71b2577c5d10f8bae0bf6180c70a9a27d50c1e4e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 11:08:43 +0000 Subject: [PATCH 1/8] Bump tqdm from 4.66.6 to 4.67.0 (#5780) Bumps [tqdm](https://github.com/tqdm/tqdm) from 4.66.6 to 4.67.0. - [Release notes](https://github.com/tqdm/tqdm/releases) - [Commits](https://github.com/tqdm/tqdm/compare/v4.66.6...v4.67.0) --- updated-dependencies: - dependency-name: tqdm dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 7d9286be4..227cff3aa 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -501,7 +501,7 @@ tomli==2.0.1 # pytest tomlkit==0.11.6 # via pylint -tqdm==4.66.6 +tqdm==4.67.0 # via -r requirements.in traitlets==5.14.1 # via diff --git a/requirements.txt b/requirements.txt index 1a2661b5c..866c2da77 100644 --- a/requirements.txt +++ b/requirements.txt @@ -314,7 +314,7 @@ statsd==4.0.1 # via -r requirements.in tabulate==0.9.0 # via -r requirements.in -tqdm==4.66.6 +tqdm==4.67.0 # via -r requirements.in typing-extensions==4.11.0 # via From a00c3b24ef093bc867430ad4d499ae79205c176c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 11:08:59 +0000 Subject: [PATCH 2/8] Bump boto3 from 1.35.54 to 1.35.57 (#5779) Bumps [boto3](https://github.com/boto/boto3) from 1.35.54 to 1.35.57. - [Release notes](https://github.com/boto/boto3/releases) - [Commits](https://github.com/boto/boto3/compare/1.35.54...1.35.57) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 4 ++-- requirements.in | 2 +- requirements.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 227cff3aa..190f859bb 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -37,11 +37,11 @@ bigtree==0.22.1 # via -r requirements.in billiard==4.2.0 # via celery -boto3==1.35.54 +boto3==1.35.57 # via # -r requirements.in # moto -botocore==1.35.54 +botocore==1.35.57 # via # boto3 # moto diff --git a/requirements.in b/requirements.in index 67fb44c27..ffe51c232 100644 --- a/requirements.in +++ b/requirements.in @@ -26,7 +26,7 @@ dj-database-url==2.3.0 psycopg2-binary==2.9.10 psycogreen==1.0.2 -boto3==1.35.54 +boto3==1.35.57 notifications-python-client==10.0.0 diff --git a/requirements.txt b/requirements.txt index 866c2da77..fa3124f64 100644 --- a/requirements.txt +++ b/requirements.txt @@ -31,9 +31,9 @@ bigtree==0.22.1 # via -r requirements.in billiard==4.2.0 # via celery -boto3==1.35.54 +boto3==1.35.57 # via -r requirements.in -botocore==1.35.54 +botocore==1.35.57 # via # boto3 # s3transfer From 0a26424eafcd66283cfda6885e927c017669f7ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 11:09:15 +0000 Subject: [PATCH 3/8] Bump werkzeug from 3.1.1 to 3.1.3 (#5778) Bumps [werkzeug](https://github.com/pallets/werkzeug) from 3.1.1 to 3.1.3. - [Release notes](https://github.com/pallets/werkzeug/releases) - [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/werkzeug/compare/3.1.1...3.1.3) --- updated-dependencies: - dependency-name: werkzeug dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 2 +- requirements.in | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 190f859bb..82062c035 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -537,7 +537,7 @@ virtualenv==20.17.1 # via pre-commit wcwidth==0.2.5 # via prompt-toolkit -werkzeug==3.1.1 +werkzeug==3.1.3 # via # -r requirements.in # moto diff --git a/requirements.in b/requirements.in index ffe51c232..d4f371866 100644 --- a/requirements.in +++ b/requirements.in @@ -52,7 +52,7 @@ elastic-apm==6.23.0 # Testing and dev django-debug-toolbar==4.4.6 -werkzeug==3.1.1 # Required by runserver_plus - useful for local dev +werkzeug==3.1.3 # Required by runserver_plus - useful for local dev WSGIserver==1.3 gevent==24.10.3 diff --git a/requirements.txt b/requirements.txt index fa3124f64..0282bacb9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -343,7 +343,7 @@ virtualenv==20.25.1 # via pre-commit wcwidth==0.2.13 # via prompt-toolkit -werkzeug==3.1.1 +werkzeug==3.1.3 # via -r requirements.in whitenoise==6.8.2 # via -r requirements.in From 8a1f35730c56690c30b67f92dcbfd1746da6e2e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 11:09:35 +0000 Subject: [PATCH 4/8] Bump moto from 5.0.19 to 5.0.20 (#5777) Bumps [moto](https://github.com/getmoto/moto) from 5.0.19 to 5.0.20. - [Release notes](https://github.com/getmoto/moto/releases) - [Changelog](https://github.com/getmoto/moto/blob/master/CHANGELOG.md) - [Commits](https://github.com/getmoto/moto/compare/5.0.19...5.0.20) --- updated-dependencies: - dependency-name: moto dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.in | 2 +- requirements-dev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-dev.in b/requirements-dev.in index 3c1ee5063..1ad6c534a 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -13,7 +13,7 @@ requests-mock==1.12.1 pip-tools==7.4.1 piprot==0.9.11 pre-commit==3.8.0 -moto==5.0.19 +moto==5.0.20 # Code static analysis flake8==7.1.1 diff --git a/requirements-dev.txt b/requirements-dev.txt index 82062c035..46b12890e 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -248,7 +248,7 @@ mccabe==0.7.0 # pylint mohawk==1.1.0 # via -r requirements.in -moto==5.0.19 +moto==5.0.20 # via -r requirements-dev.in multidict==6.0.4 # via From 7bd44c2bb82eb298c0c0ba9ef5569ba82856add0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 11:09:53 +0000 Subject: [PATCH 5/8] Bump whitenoise from 6.7.0 to 6.8.2 (#5758) Bumps [whitenoise](https://github.com/evansd/whitenoise) from 6.7.0 to 6.8.2. - [Changelog](https://github.com/evansd/whitenoise/blob/main/docs/changelog.rst) - [Commits](https://github.com/evansd/whitenoise/compare/6.7.0...6.8.2) --- updated-dependencies: - dependency-name: whitenoise dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> From 729f3b38096a0a0c440a2423bb510a7cc3e469dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 11:10:10 +0000 Subject: [PATCH 6/8] Bump pytest-cov from 5.0.0 to 6.0.0 (#5756) Bumps [pytest-cov](https://github.com/pytest-dev/pytest-cov) from 5.0.0 to 6.0.0. - [Changelog](https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest-cov/compare/v5.0.0...v6.0.0) --- updated-dependencies: - dependency-name: pytest-cov dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> From a44693745ed646683f5b1b4b038d3ca174251a63 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 11:10:30 +0000 Subject: [PATCH 7/8] Bump bigtree from 0.21.3 to 0.22.1 (#5754) Bumps [bigtree](https://github.com/kayjan/bigtree) from 0.21.3 to 0.22.1. - [Release notes](https://github.com/kayjan/bigtree/releases) - [Changelog](https://github.com/kayjan/bigtree/blob/master/CHANGELOG.md) - [Commits](https://github.com/kayjan/bigtree/compare/0.21.3...0.22.1) --- updated-dependencies: - dependency-name: bigtree dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> From 7238a7f32c522c297ace0c055ad0afbdf1bb04be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 11:40:47 +0000 Subject: [PATCH 8/8] Bump flake8-bugbear from 24.8.19 to 24.10.31 (#5755) * Bump flake8-bugbear from 24.8.19 to 24.10.31 Bumps [flake8-bugbear](https://github.com/PyCQA/flake8-bugbear) from 24.8.19 to 24.10.31. - [Release notes](https://github.com/PyCQA/flake8-bugbear/releases) - [Commits](https://github.com/PyCQA/flake8-bugbear/compare/24.8.19...24.10.31) --- updated-dependencies: - dependency-name: flake8-bugbear dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Remove duplicates from legacy migration test * Add note about flake8 --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Christopher --- .pre-commit-config.yaml | 2 +- datahub/export_win/test/test_legacy_migration.py | 4 ---- docs/Dependabot.md | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 84ce3b486..eaacc50ef 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,5 @@ repos: - repo: https://github.com/pycqa/flake8 - rev: 3.8.3 + rev: 7.1.1 hooks: - id: flake8 diff --git a/datahub/export_win/test/test_legacy_migration.py b/datahub/export_win/test/test_legacy_migration.py index 361debe1d..9554a3669 100644 --- a/datahub/export_win/test/test_legacy_migration.py +++ b/datahub/export_win/test/test_legacy_migration.py @@ -288,7 +288,6 @@ 'export_experience': None, 'goods_vs_services': 1, 'has_hvo_specialist_involvement': False, - 'confirmation__comments': None, 'hq_team': 'team:1', 'hvc': None, 'hvo_programme': 'AER-01', @@ -340,7 +339,6 @@ 'export_experience': None, 'goods_vs_services': 1, 'has_hvo_specialist_involvement': False, - 'confirmation__comments': None, 'hq_team': 'team:1', 'hvc': None, 'hvo_programme': 'AER-01', @@ -392,7 +390,6 @@ 'export_experience': None, 'goods_vs_services': 1, 'has_hvo_specialist_involvement': False, - 'confirmation__comments': None, 'hq_team': '', 'hvc': None, 'hvo_programme': 'AER-01', @@ -445,7 +442,6 @@ 'export_experience': None, 'goods_vs_services': 1, 'has_hvo_specialist_involvement': False, - 'confirmation__comments': None, 'hq_team': 'team:1', 'hvc': None, 'hvo_programme': 'AER-01', diff --git a/docs/Dependabot.md b/docs/Dependabot.md index e1ec7c2ad..933463a3a 100644 --- a/docs/Dependabot.md +++ b/docs/Dependabot.md @@ -12,4 +12,4 @@ This is the process we have identified for dealing with Dependabot PRs that save 8. If you are satisfied that everything is in order and all the tests have passed, request reviews as normal. 9. Once merged, deploy to production as soon as possible. -If the OpenSearch version has been updated, the version used by [the e2e tests](https://github.com/uktrade/data-hub-frontend/blob/main/docker-compose.e2e.backend.yml#L58) needs to be updated to match. +If the main flake8 dependency is updated, the version used by the [pre-commit hook](https://github.com/uktrade/data-hub-api/blob/c5910876ae15598af25f4c191ec8d50c92139f9b/.pre-commit-config.yaml#L3) should also be updated. \ No newline at end of file