From b13cdaad633fce34d4536d57ea147d3417e3dd6c Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Wed, 19 Jul 2023 16:06:01 -0400 Subject: [PATCH] Upgrade click to 8.1.6 (#15272) * Revert "Exclude click 8.1.4 to solve mypy issues (#15201)" This reverts commit 411e4e4201598f73883d522d6a61b582ac6e7ed1. * Upgrade click to 8.1.5 * Apply suggestions from code review Co-authored-by: Florent Clarret --------- Co-authored-by: Florent Clarret --- datadog_checks_dev/hatch.toml | 4 ---- datadog_checks_dev/pyproject.toml | 3 +-- ddev/hatch.toml | 4 ---- ddev/pyproject.toml | 1 + 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/datadog_checks_dev/hatch.toml b/datadog_checks_dev/hatch.toml index 809fa9273f3c3..e4e3ffa2cf4c9 100644 --- a/datadog_checks_dev/hatch.toml +++ b/datadog_checks_dev/hatch.toml @@ -7,10 +7,6 @@ mypy-args = [ "datadog_checks/dev/tooling/commands/release/trello/testable.py", "datadog_checks/dev/tooling/commands/release/trello/status.py", ] -# TODO remove once https://github.com/pallets/click/issues/2558 is solved -mypy-deps = [ - "click~=8.1,!=8.1.4", -] [envs.default] e2e-env = false diff --git a/datadog_checks_dev/pyproject.toml b/datadog_checks_dev/pyproject.toml index 609c71f68bf6c..17c14abcfce56 100644 --- a/datadog_checks_dev/pyproject.toml +++ b/datadog_checks_dev/pyproject.toml @@ -63,8 +63,7 @@ cli = [ "atomicwrites", "beautifulsoup4>=4.9.3", "build>=0.7.0", - # TODO remove when https://github.com/pallets/click/issues/2558 is solved and unpin the version in the hatch files for ddev and datadog_checks_dev - "click~=8.1,!=8.1.4", + "click~=8.1.6", "codespell", "colorama", "datamodel-code-generator~=0.21.1", diff --git a/ddev/hatch.toml b/ddev/hatch.toml index 60c7db65736e3..174ef100f206d 100644 --- a/ddev/hatch.toml +++ b/ddev/hatch.toml @@ -3,10 +3,6 @@ check-types = true mypy-args = [ "src/ddev", ] -# TODO remove once https://github.com/pallets/click/issues/2558 is solved -mypy-deps = [ - "click~=8.1,!=8.1.4", -] [envs.default] python = "3.9" diff --git a/ddev/pyproject.toml b/ddev/pyproject.toml index 05bf1f2c42f17..62e575a126934 100644 --- a/ddev/pyproject.toml +++ b/ddev/pyproject.toml @@ -26,6 +26,7 @@ classifiers = [ "Programming Language :: Python :: 3.9", ] dependencies = [ + "click~=8.1.6", "datadog-checks-dev[cli]~=22.0", "hatch>=1.6.3", "httpx",