Skip to content

Commit

Permalink
clean dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
nim65s committed Oct 25, 2023
1 parent 3b43062 commit 249fcef
Show file tree
Hide file tree
Showing 10 changed files with 147 additions and 139 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/conda-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
if: steps.cache.outputs.cache-hit != 'true'

- name: Install happypose
run: pip install -e .
run: pip install -e ".[render,evaluation]"

- name: Download pre-trained models required for tests
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/poetry-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
cache: poetry

- name: Install happypose
run: poetry install --with dev -E render -E cpu
run: poetry install --with dev -E render -E cpu -E evaluation

- name: Download pre-trained models required for tests
run: |
Expand Down
12 changes: 0 additions & 12 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
[submodule "happypose/pose_estimators/cosypose/deps/bop_toolkit_challenge"]
path = happypose/pose_estimators/cosypose/deps/bop_toolkit_challenge
url = https://github.com/ylabbe/bop_toolkit_challenge20.git
[submodule "happypose/pose_estimators/cosypose/deps/bop_toolkit_cosypose"]
path = happypose/pose_estimators/cosypose/deps/bop_toolkit_cosypose
url = https://github.com/ylabbe/bop_toolkit_cosypose.git
[submodule "happypose/pose_estimators/cosypose/deps/job-runner"]
path = happypose/pose_estimators/cosypose/deps/job-runner
url = https://github.com/ylabbe/job-runner.git
[submodule "deps/bop_toolkit_challenge"]
path = deps/bop_toolkit_challenge
url = https://github.com/thodan/bop_toolkit
[submodule "deps/bop_renderer"]
path = deps/bop_renderer
url = https://github.com/thodan/bop_renderer/
1 change: 0 additions & 1 deletion deps/bop_toolkit_challenge
Submodule bop_toolkit_challenge deleted from 26bad9
3 changes: 0 additions & 3 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,3 @@ dependencies:
- pip
- pytorch::pytorch==1.11.0
- torchvision==0.12.0
- pip:
- pybullet
- panda3d
Submodule bop_toolkit_challenge deleted from f11499
Submodule bop_toolkit_cosypose deleted from b13081
1 change: 0 additions & 1 deletion happypose/pose_estimators/cosypose/deps/job-runner
Submodule job-runner deleted from eda91f
256 changes: 141 additions & 115 deletions poetry.lock

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ version = "0.1.0"
addict = "^2.4.0"
beautifulsoup4 = "^4.12.2"
bokeh = "^3.2.2"
bop_toolkit_lib = {path = "deps/bop_toolkit_challenge"}
cosypose = {path = "happypose/pose_estimators/cosypose"}
bop_toolkit_lib = {git = "https://github.com/thodan/bop_toolkit", optional = true}
cosypose = {optional = true, path = "happypose/pose_estimators/cosypose"}
httpx = "^0.25.0"
imageio = "^2.31.4"
ipython = "^8.12.2"
Expand Down Expand Up @@ -64,6 +64,8 @@ webdataset = "^0.2.57"

[tool.poetry.extras]
cpu = ["torch", "torchvision"]
evaluation = ["bop_toolkit_lib"]
multiview = ["cosypose"]
render = ["panda3d", "pybullet"]

[tool.poetry.group.dev]
Expand All @@ -73,7 +75,6 @@ optional = true
black = "^23.9.1"
coverage = {extras = ["toml"], version = "^7.2.5"}
pre-commit = "^3.2.1"
pytest = "^7.4.2"
ruff = "^0.0.290"

[tool.poetry.group.docs]
Expand Down

0 comments on commit 249fcef

Please sign in to comment.