Update click version

This commit is contained in:
sonny 2021-05-12 20:20:45 +02:00
parent 8157eb1b3a
commit a924c5400b
3 changed files with 35 additions and 26 deletions

51
poetry.lock generated
View file

@ -25,10 +25,6 @@ category = "dev"
optional = false optional = false
python-versions = ">=3.6" python-versions = ">=3.6"
[package.extras]
colorama = ["colorama (>=0.4.3)"]
d = ["aiohttp (>=3.3.2)", "aiohttp-cors"]
[package.dependencies] [package.dependencies]
appdirs = "*" appdirs = "*"
click = ">=7.1.2" click = ">=7.1.2"
@ -39,6 +35,10 @@ toml = ">=0.10.1"
typed-ast = ">=1.4.0" typed-ast = ">=1.4.0"
typing-extensions = ">=3.7.4" typing-extensions = ">=3.7.4"
[package.extras]
colorama = ["colorama (>=0.4.3)"]
d = ["aiohttp (>=3.3.2)", "aiohttp-cors"]
[[package]] [[package]]
name = "certifi" name = "certifi"
version = "2020.12.5" version = "2020.12.5"
@ -57,10 +57,21 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
[[package]] [[package]]
name = "click" name = "click"
version = "7.1.2" version = "8.0.0"
description = "Composable command line interface toolkit" description = "Composable command line interface toolkit"
category = "main" category = "main"
optional = false optional = false
python-versions = ">=3.6"
[package.dependencies]
colorama = {version = "*", markers = "platform_system == \"Windows\""}
[[package]]
name = "colorama"
version = "0.4.4"
description = "Cross-platform colored terminal text."
category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
[[package]] [[package]]
@ -146,16 +157,16 @@ category = "main"
optional = false optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
[package.extras]
security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"]
socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7)", "win-inet-pton"]
[package.dependencies] [package.dependencies]
certifi = ">=2017.4.17" certifi = ">=2017.4.17"
chardet = ">=3.0.2,<5" chardet = ">=3.0.2,<5"
idna = ">=2.5,<3" idna = ">=2.5,<3"
urllib3 = ">=1.21.1,<1.27" urllib3 = ">=1.21.1,<1.27"
[package.extras]
security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"]
socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"]
[[package]] [[package]]
name = "sentry-sdk" name = "sentry-sdk"
version = "0.19.5" version = "0.19.5"
@ -164,6 +175,10 @@ category = "main"
optional = true optional = true
python-versions = "*" python-versions = "*"
[package.dependencies]
certifi = "*"
urllib3 = ">=1.10.0"
[package.extras] [package.extras]
aiohttp = ["aiohttp (>=3.5)"] aiohttp = ["aiohttp (>=3.5)"]
beam = ["apache-beam (>=2.12)"] beam = ["apache-beam (>=2.12)"]
@ -180,10 +195,6 @@ sanic = ["sanic (>=0.8)"]
sqlalchemy = ["sqlalchemy (>=1.2)"] sqlalchemy = ["sqlalchemy (>=1.2)"]
tornado = ["tornado (>=5)"] tornado = ["tornado (>=5)"]
[package.dependencies]
certifi = "*"
urllib3 = ">=1.10.0"
[[package]] [[package]]
name = "toml" name = "toml"
version = "0.10.2" version = "0.10.2"
@ -219,15 +230,15 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4"
[package.extras] [package.extras]
brotli = ["brotlipy (>=0.6.0)"] brotli = ["brotlipy (>=0.6.0)"]
secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"] secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"]
socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7,<2.0)"] socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
[extras] [extras]
sentry = ["sentry_sdk"] sentry = ["sentry_sdk"]
[metadata] [metadata]
lock-version = "1.0" lock-version = "1.1"
python-versions = "^3.7" python-versions = "^3.7"
content-hash = "c068a970d2c0953cbb7ec9a46be718dc83ebac533aea3ac6687014638ee5b1fd" content-hash = "c6e88eebf5df5b98f893f4823ecab7443c497b6c2a1f303775470b6ffba0d43b"
[metadata.files] [metadata.files]
appdirs = [ appdirs = [
@ -249,8 +260,12 @@ chardet = [
{file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"}, {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"},
] ]
click = [ click = [
{file = "click-7.1.2-py2.py3-none-any.whl", hash = "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc"}, {file = "click-8.0.0-py3-none-any.whl", hash = "sha256:e90e62ced43dc8105fb9a26d62f0d9340b5c8db053a814e25d95c19873ae87db"},
{file = "click-7.1.2.tar.gz", hash = "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"}, {file = "click-8.0.0.tar.gz", hash = "sha256:7d8c289ee437bcb0316820ccee14aefcb056e58d31830ecab8e47eda6540e136"},
]
colorama = [
{file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
{file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
] ]
coverage = [ coverage = [
{file = "coverage-5.3.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:fabeeb121735d47d8eab8671b6b031ce08514c86b7ad8f7d5490a7b6dcd6267d"}, {file = "coverage-5.3.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:fabeeb121735d47d8eab8671b6b031ce08514c86b7ad8f7d5490a7b6dcd6267d"},

View file

@ -7,7 +7,7 @@ license = "GPL-3.0"
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = "^3.7" python = "^3.7"
click = "^7.1.2" click = "8.0"
python-dotenv = "^0.15.0" python-dotenv = "^0.15.0"
requests = "^2.25.1" requests = "^2.25.1"
sentry_sdk = {version = "^0.19.5", optional = true} sentry_sdk = {version = "^0.19.5", optional = true}

View file

@ -1,10 +1,9 @@
import json import json
from unittest import TestCase, skipIf from unittest import TestCase
from unittest.mock import call, patch from unittest.mock import call, patch
from click.testing import CliRunner from click.testing import CliRunner
from pkg_resources import get_distribution
from requests import HTTPError from requests import HTTPError
from transip_client.cli import DEFAULT_API_URL, run from transip_client.cli import DEFAULT_API_URL, run
@ -282,11 +281,6 @@ class RunTestCase(TestCase):
headers={"Authorization": "Bearer TOKEN"}, headers={"Authorization": "Bearer TOKEN"},
) )
# see https://click.palletsprojects.com/en/master/changelog/#version-8-0
@skipIf(
get_distribution("click").version < "8",
"Multiple arguments through env variables not supported",
)
def test_multi_arg_env_var(self): def test_multi_arg_env_var(self):
self.mocked_dns.return_value = b"111.420\n" self.mocked_dns.return_value = b"111.420\n"
self.mocked_get.return_value.json.side_effect = [ self.mocked_get.return_value.json.side_effect = [