From 75648e9117180e9103485442bee1518e96bebb32 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 19:48:42 +0000 Subject: [PATCH 1/2] build(deps-dev): bump sphinx from 6.2.1 to 7.2.6 Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 6.2.1 to 7.2.6. - [Release notes](https://github.com/sphinx-doc/sphinx/releases) - [Changelog](https://github.com/sphinx-doc/sphinx/blob/master/CHANGES.rst) - [Commits](https://github.com/sphinx-doc/sphinx/compare/v6.2.1...v7.2.6) --- updated-dependencies: - dependency-name: sphinx dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- poetry.lock | 18 +++++++++--------- pyproject.toml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/poetry.lock b/poetry.lock index 3bf3ff3b..9f431515 100644 --- a/poetry.lock +++ b/poetry.lock @@ -3188,25 +3188,25 @@ files = [ [[package]] name = "sphinx" -version = "6.2.1" +version = "7.2.6" description = "Python documentation generator" optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" files = [ - {file = "Sphinx-6.2.1.tar.gz", hash = "sha256:6d56a34697bb749ffa0152feafc4b19836c755d90a7c59b72bc7dfd371b9cc6b"}, - {file = "sphinx-6.2.1-py3-none-any.whl", hash = "sha256:97787ff1fa3256a3eef9eda523a63dbf299f7b47e053cfcf684a1c2a8380c912"}, + {file = "sphinx-7.2.6-py3-none-any.whl", hash = "sha256:1e09160a40b956dc623c910118fa636da93bd3ca0b9876a7b3df90f07d691560"}, + {file = "sphinx-7.2.6.tar.gz", hash = "sha256:9a5160e1ea90688d5963ba09a2dcd8bdd526620edbb65c328728f1b2228d5ab5"}, ] [package.dependencies] alabaster = ">=0.7,<0.8" babel = ">=2.9" colorama = {version = ">=0.4.5", markers = "sys_platform == \"win32\""} -docutils = ">=0.18.1,<0.20" +docutils = ">=0.18.1,<0.21" imagesize = ">=1.3" importlib-metadata = {version = ">=4.8", markers = "python_version < \"3.10\""} Jinja2 = ">=3.0" packaging = ">=21.0" -Pygments = ">=2.13" +Pygments = ">=2.14" requests = ">=2.25.0" snowballstemmer = ">=2.0" sphinxcontrib-applehelp = "*" @@ -3214,12 +3214,12 @@ sphinxcontrib-devhelp = "*" sphinxcontrib-htmlhelp = ">=2.0.0" sphinxcontrib-jsmath = "*" sphinxcontrib-qthelp = "*" -sphinxcontrib-serializinghtml = ">=1.1.5" +sphinxcontrib-serializinghtml = ">=1.1.9" [package.extras] docs = ["sphinxcontrib-websupport"] lint = ["docutils-stubs", "flake8 (>=3.5.0)", "flake8-simplify", "isort", "mypy (>=0.990)", "ruff", "sphinx-lint", "types-requests"] -test = ["cython", "filelock", "html5lib", "pytest (>=4.6)"] +test = ["cython (>=3.0)", "filelock", "html5lib", "pytest (>=4.6)", "setuptools (>=67.0)"] [[package]] name = "sphinxcontrib-applehelp" @@ -3732,4 +3732,4 @@ multiview = ["cosypose"] [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.11" -content-hash = "a58768177de00db9c0da8da6d529bc03a7281ed0db456ca561f7ebb84000d8f2" +content-hash = "1ef32acfc0612eb8f97960e0f40d5789a2619fc8db9f70089ad42fa533b799cb" diff --git a/pyproject.toml b/pyproject.toml index 4e7a09ee..81e35f76 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -81,7 +81,7 @@ optional = true [tool.poetry.group.docs.dependencies] myst-parser = "^2.0.0" -sphinx = "^6.2.1" +sphinx = "^7.2.6" [[tool.poetry.source]] name = "torch_cpu" From 973ea80755e130f45db7a5111b16586c12059947 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 19:49:22 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .../pose_estimators/cosypose/cosypose/integrated/detector.py | 1 + happypose/pose_estimators/megapose/inference/detector.py | 1 + 2 files changed, 2 insertions(+) diff --git a/happypose/pose_estimators/cosypose/cosypose/integrated/detector.py b/happypose/pose_estimators/cosypose/cosypose/integrated/detector.py index 3a2a6d96..a968a1b1 100644 --- a/happypose/pose_estimators/cosypose/cosypose/integrated/detector.py +++ b/happypose/pose_estimators/cosypose/cosypose/integrated/detector.py @@ -12,6 +12,7 @@ device = torch.device("cuda" if torch.cuda.is_available() else "cpu") + class Detector(DetectorModule): def __init__(self, model, ds_name): super().__init__() diff --git a/happypose/pose_estimators/megapose/inference/detector.py b/happypose/pose_estimators/megapose/inference/detector.py index e15aee69..84b01dbc 100644 --- a/happypose/pose_estimators/megapose/inference/detector.py +++ b/happypose/pose_estimators/megapose/inference/detector.py @@ -31,6 +31,7 @@ device = torch.device("cuda" if torch.cuda.is_available() else "cpu") + class Detector(DetectorModule): def __init__(self, model: torch.nn.Module) -> None: super().__init__()