From a842a88222535feaebc03172a2701df48a13fcc4 Mon Sep 17 00:00:00 2001 From: dorschw <81086590+dorschw@users.noreply.github.com> Date: Thu, 14 Nov 2024 09:24:33 +0200 Subject: [PATCH] add `setuptools` (#4666) * add `setuptools` * changelog --- .changelog/4666.yml | 4 ++++ poetry.lock | 24 ++++++++++++------------ pyproject.toml | 3 ++- 3 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 .changelog/4666.yml diff --git a/.changelog/4666.yml b/.changelog/4666.yml new file mode 100644 index 00000000000..d3b89711e10 --- /dev/null +++ b/.changelog/4666.yml @@ -0,0 +1,4 @@ +changes: +- description: Fixed an issue where SDK commands would fail in some system setups. + type: fix +pr_number: 4666 diff --git a/poetry.lock b/poetry.lock index 951dd56c3f5..3564837ac9f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -4400,23 +4400,23 @@ files = [ [[package]] name = "setuptools" -version = "75.1.0" +version = "75.5.0" description = "Easily download, build, install, upgrade, and uninstall Python packages" optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" files = [ - {file = "setuptools-75.1.0-py3-none-any.whl", hash = "sha256:35ab7fd3bcd95e6b7fd704e4a1539513edad446c097797f2985e0e4b960772f2"}, - {file = "setuptools-75.1.0.tar.gz", hash = "sha256:d59a21b17a275fb872a9c3dae73963160ae079f1049ed956880cd7c09b120538"}, + {file = "setuptools-75.5.0-py3-none-any.whl", hash = "sha256:87cb777c3b96d638ca02031192d40390e0ad97737e27b6b4fa831bea86f2f829"}, + {file = "setuptools-75.5.0.tar.gz", hash = "sha256:5c4ccb41111392671f02bb5f8436dfc5a9a7185e80500531b133f5775c4163ef"}, ] [package.extras] -check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1)", "ruff (>=0.5.2)"] -core = ["importlib-metadata (>=6)", "importlib-resources (>=5.10.2)", "jaraco.collections", "jaraco.functools", "jaraco.text (>=3.7)", "more-itertools", "more-itertools (>=8.8)", "packaging", "packaging (>=24)", "platformdirs (>=2.6.2)", "tomli (>=2.0.1)", "wheel (>=0.43.0)"] +check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1)", "ruff (>=0.7.0)"] +core = ["importlib-metadata (>=6)", "jaraco.collections", "jaraco.functools (>=4)", "jaraco.text (>=3.7)", "more-itertools", "more-itertools (>=8.8)", "packaging", "packaging (>=24.2)", "platformdirs (>=4.2.2)", "tomli (>=2.0.1)", "wheel (>=0.43.0)"] cover = ["pytest-cov"] doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "pyproject-hooks (!=1.1)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier", "towncrier (<24.7)"] enabler = ["pytest-enabler (>=2.2)"] -test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "jaraco.test", "packaging (>=23.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"] -type = ["importlib-metadata (>=7.0.2)", "jaraco.develop (>=7.21)", "mypy (==1.11.*)", "pytest-mypy"] +test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "jaraco.test (>=5.5)", "packaging (>=24.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"] +type = ["importlib-metadata (>=7.0.2)", "jaraco.develop (>=7.21)", "mypy (>=1.12,<1.14)", "pytest-mypy"] [[package]] name = "shellingham" @@ -4796,13 +4796,13 @@ urllib3 = ">=2" [[package]] name = "types-setuptools" -version = "69.5.0.20240522" +version = "75.3.0.20241112" description = "Typing stubs for setuptools" optional = false python-versions = ">=3.8" files = [ - {file = "types-setuptools-69.5.0.20240522.tar.gz", hash = "sha256:c5a97601b2d040d3b9fcd0633730f0a8c86ebef208552525c97301427f261549"}, - {file = "types_setuptools-69.5.0.20240522-py3-none-any.whl", hash = "sha256:e27231cbc80648cfaee4921d2f1150107fdf8d33666958abf2aba0191a82688b"}, + {file = "types-setuptools-75.3.0.20241112.tar.gz", hash = "sha256:f9e1ebd17a56f606e16395c4ee4efa1cdc394b9a2a0ee898a624058b4b62ef8f"}, + {file = "types_setuptools-75.3.0.20241112-py3-none-any.whl", hash = "sha256:78cb5fef4a6056d2f37114d27da90f4655a306e4e38042d7034a8a880bc3f5dd"}, ] [[package]] @@ -5422,4 +5422,4 @@ generate-unit-tests = ["klara"] [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.13" -content-hash = "432652c106ed2738f998d706e3537ec614ce8a2836c310fa74eb572bdbe9f641" +content-hash = "af510a626ef88465ad8458b2ff0d43bf70ae22244aec13be86b5f84bc0f0ca2b" diff --git a/pyproject.toml b/pyproject.toml index 376464532aa..014c4d0ccb4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -106,6 +106,7 @@ toml = "^0.10.2" werkzeug = "^2.2.0" # Added as mitmproxy8 -> flask<2.1 loguru = "^0.7.2" pygithub = "^2.2.0" +setuptools = "^75.5.0" [tool.poetry.extras] build = ["gsutil"] @@ -129,7 +130,7 @@ pytest-loguru = "^0.4.0" [tool.poetry.group.types.dependencies] types-requests = "^2.31.0.20240311" types-mock = "^4.0.15" -types-setuptools = "^69.2.0.20240317" +types-setuptools = "^75" types-ujson = "^5.6.0.0" types-decorator = "^5.1.8" types-toml = "^0.10.8.7"