From 4231c285a8c9ad93e05a84dd17897e5d42aa68a7 Mon Sep 17 00:00:00 2001 From: lucaw Date: Thu, 24 Mar 2022 15:11:17 -0700 Subject: [PATCH] New way to specify pip requirements for projects on github. --- allenact/setup.py | 2 +- allenact_plugins/clip_plugin/extra_requirements.txt | 2 +- allenact_plugins/setup.py | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/allenact/setup.py b/allenact/setup.py index 149920ff2..f9413b2e6 100644 --- a/allenact/setup.py +++ b/allenact/setup.py @@ -31,7 +31,7 @@ def parse_req_file(fname, initial=None): continue if line[0] == "[": # Add new key for current extras (if missing in dict) - cline = line[1:-1] + cline = line[1:-1].strip() if cline not in reqs: reqs[cline] = [] else: diff --git a/allenact_plugins/clip_plugin/extra_requirements.txt b/allenact_plugins/clip_plugin/extra_requirements.txt index 69f498c50..c90057808 100644 --- a/allenact_plugins/clip_plugin/extra_requirements.txt +++ b/allenact_plugins/clip_plugin/extra_requirements.txt @@ -3,4 +3,4 @@ torchvision ftfy regex tqdm -clip @ git+git://github.com/openai/clip@e184f608c5d5e58165682f7c332c3a8b4c1545f2#egg=clip +clip @ git+https://github.com/openai/clip@e184f608c5d5e58165682f7c332c3a8b4c1545f2#egg=clip diff --git a/allenact_plugins/setup.py b/allenact_plugins/setup.py index 916814b5b..3559d9288 100644 --- a/allenact_plugins/setup.py +++ b/allenact_plugins/setup.py @@ -111,6 +111,8 @@ def run_setup(): "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", ], keywords=["reinforcement learning", "embodied-AI", "AI", "RL", "SLAM"], url="https://github.com/allenai/allenact", @@ -121,7 +123,7 @@ def run_setup(): install_requires=[ "gym>=0.17.0,<0.20.0", "torch>=1.6.0,!=1.8.0,<2.0.0", - "torchvision>=0.7.0,<0.10.0", + "torchvision>=0.7.0", "numpy>=1.19.1", "wheel>=0.36.2", f"allenact=={__version__}",