From b872a54e8e4f5818394592a2d20d2caa1f28cb83 Mon Sep 17 00:00:00 2001
From: josiah <jklaivins@gmail.com>
Date: Thu, 28 Dec 2023 16:21:03 +0000
Subject: [PATCH] smoal updates

---
 fastrl.Dockerfile |  4 +++-
 setup.py          | 17 +++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/fastrl.Dockerfile b/fastrl.Dockerfile
index bb35654..1822427 100644
--- a/fastrl.Dockerfile
+++ b/fastrl.Dockerfile
@@ -37,10 +37,12 @@ RUN pip3 install torch>=2.0.0
 # --pre --upgrade
 RUN pip3 show torch
 
-
 COPY --chown=$CONTAINER_USER:$CONTAINER_GROUP extra/pip_requirements.txt /home/$CONTAINER_USER/extra/pip_requirements.txt
 RUN pip3 install -r extra/pip_requirements.txt
 
+WORKDIR /home/$CONTAINER_USER/fastrl
+RUN git clone https://github.com/josiahls/data.git \
+    && cd data && pip3 install -e .
 
 # Install Dev Reqs
 COPY --chown=$CONTAINER_USER:$CONTAINER_GROUP extra/dev_requirements.txt /home/$CONTAINER_USER/extra/dev_requirements.txt
diff --git a/setup.py b/setup.py
index c7999bf..ff4c35e 100644
--- a/setup.py
+++ b/setup.py
@@ -4,6 +4,7 @@
 from setuptools.command.develop import develop
 from setuptools.command.install import install
 import setuptools
+import os
 assert parse_version(setuptools.__version__)>=parse_version('36.2')
 
 # note: all settings are in settings.ini; edit there, not here
@@ -38,8 +39,10 @@
 class CustomInstall(install):
     def run(self):
         # Ensure that torchdata is cloned and installed before proceeding
+        print('Cloning torchdata')
         subprocess.check_call(["git", "clone", TORCHDATA_GIT_REPO])
-        subprocess.check_call(["pip", "install", "./data"])
+        print('Installing torchdata')
+        subprocess.check_call(["pip", "install","-vvv", "./data"])
         # Call the standard install.
         install.run(self)
 
@@ -47,8 +50,10 @@ class CustomDevelop(develop):
     def run(self):
         # Ensure that torchdata is cloned but not installed
         if not os.path.exists('data'):
+            print('Cloning torchdata')
             subprocess.check_call(["git", "clone", TORCHDATA_GIT_REPO])
-        subprocess.check_call(["pip", "install", "-e", "./data"])
+        print('Installing torchdata')
+        subprocess.check_call(["pip", "install","-vvv", "-e", "./data"])
         # Call the standard develop.
         develop.run(self)
 
@@ -72,9 +77,9 @@ def run(self):
     long_description_content_type = 'text/markdown',
     zip_safe = False,
     entry_points = { 'console_scripts': cfg.get('console_scripts','').split() },
-    # cmdclass={
-    #     'install': CustomInstall,
-    #     'develop': CustomDevelop,
-    # },
+    cmdclass={
+        'install': CustomInstall,
+        'develop': CustomDevelop,
+    },
     **setup_cfg)