Merge pull request #296 from allenai/minor-fixes

Fixing import and requirements.txt versions bump.
allenai · Jun 15, 2021 · 29f5cf2 · 29f5cf2
2 parents ca82aca + 4561b24
commit 29f5cf2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/allenact_plugins/ithor_plugin/ithor_util.py b/allenact_plugins/ithor_plugin/ithor_util.py
@@ -7,7 +7,7 @@
 
 import Xlib
 import Xlib.display
-import ai2thor
+import ai2thor.controller
 
 
 @contextmanager

diff --git a/conda/environment-base.yml b/conda/environment-base.yml
@@ -27,12 +27,12 @@ dependencies:
   - pyparsing=2.4.7
   - python=3.6.12
   - python-dateutil=2.8.1
-  - pytorch>=1.6.0,<1.7.0
+  - pytorch>=1.6.0,!=1.8.0
+  - torchvision>=0.7.0
   - requests=2.25.1
   - setproctitle
   - six=1.15.0
   - tensorboardx=2.1
-  - torchvision>=0.7.0
   - tqdm
   - urllib3=1.26.2
   - pip:

diff --git a/requirements.txt b/requirements.txt
@@ -15,7 +15,7 @@ moviepy==1.0.3
 networkx==2.5
 numpy==1.19.5
 opencv-python==4.5.1.48
-Pillow==8.1.1
+Pillow==8.2.0
 proglog==0.1.9
 protobuf==3.14.0
 pyglet==1.5.0
@@ -26,7 +26,7 @@ scipy==1.5.4
 setproctitle==1.2.1
 six==1.15.0
 tensorboardX==2.1
-torch==1.6.0
-torchvision==0.7.0
+torch>=1.6.0,!=1.8.0
+torchvision>=0.7.0
 tqdm==4.56.0
-urllib3==1.26.4
+urllib3==1.26.5