Skip to content

Commit

Permalink
Merge pull request #1063 from AndreaCossu/master
Browse files Browse the repository at this point in the history
Moved extra dependencies to setup.py
  • Loading branch information
AndreaCossu committed Jun 14, 2022
2 parents 58d3b86 + 666f817 commit 5064e77
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
3 changes: 3 additions & 0 deletions extra_dependencies.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# this file is currently not used due to a problem with setuptools
# the extra dependencies are currently specified in the setup.py file

# FORMAT
# Put your extra requirements here in the following format
#
Expand Down
10 changes: 9 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ def get_version(rel_path):


def get_extra_requires(path, add_all=True):
"""Currently not used. Dependencies are
hard-coded below. We currently have a problem
with setuptools and external extra dependency file"""
with open(path) as fp:
extra_deps = defaultdict(set)
for line in fp:
Expand Down Expand Up @@ -76,6 +79,11 @@ def get_extra_requires(path, add_all=True):
'quadprog',
'setuptools<=59.5.0'
],
extras_require=get_extra_requires('extra_dependencies.txt', add_all=True)
# extras_require=get_extra_requires('extra_dependencies.txt',
# add_all=True)
extras_require={'extra': ['higher', 'ctrl-benchmark'], 'rl': ['gym'],
'detection': ['pycocotools', 'lvis'],
'all': ['higher', 'ctrl-benchmark', 'gym',
'pycocotools', 'lvis']}
)

0 comments on commit 5064e77

Please sign in to comment.