From bb97f31beead3e4294957d458bccabbd1aa585cc Mon Sep 17 00:00:00 2001
From: Stella Laurenzo <stellaraccident@gmail.com>
Date: Mon, 5 Feb 2024 12:21:43 -0800
Subject: [PATCH] Fixup paths.

---
 core/mypy.ini   | 2 +-
 core/setup.py   | 9 +++------
 models/setup.py | 6 +-----
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/core/mypy.ini b/core/mypy.ini
index ab19d5522..4323710ff 100644
--- a/core/mypy.ini
+++ b/core/mypy.ini
@@ -1,4 +1,4 @@
 [mypy]
 
-mypy_path = $MYPY_CONFIG_FILE_DIR/python
+mypy_path = $MYPY_CONFIG_FILE_DIR
 packages = shark_turbine.aot,shark_turbine.dynamo,shark_turbine.support
diff --git a/core/setup.py b/core/setup.py
index 53a7b8c5d..f1aeda8c4 100644
--- a/core/setup.py
+++ b/core/setup.py
@@ -12,12 +12,13 @@
 from setuptools import find_namespace_packages, setup
 
 THIS_DIR = os.path.realpath(os.path.dirname(__file__))
-VERSION_INFO_FILE = os.path.join(THIS_DIR, "version_info.json")
+REPO_DIR = os.path.dirname(THIS_DIR)
+VERSION_INFO_FILE = os.path.join(REPO_DIR, "version_info.json")
 
 
 with open(
     os.path.join(
-        THIS_DIR,
+        REPO_DIR,
         "README.md",
     ),
     "rt",
@@ -38,7 +39,6 @@ def load_version_info():
         "shark_turbine",
         "shark_turbine.*",
     ],
-    where="python",
 )
 
 print("Found packages:", packages)
@@ -90,9 +90,6 @@ def initialize_options(self):
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python :: 3",
     ],
-    package_dir={
-        "": "python",
-    },
     packages=packages,
     entry_points={
         "torch_dynamo_backends": [
diff --git a/models/setup.py b/models/setup.py
index 264197b9f..cf0ed2d6b 100644
--- a/models/setup.py
+++ b/models/setup.py
@@ -9,7 +9,7 @@
 
 
 TURBINE_MODELS_DIR = os.path.realpath(os.path.dirname(__file__))
-TURBINE_ROOT_DIR = Path(TURBINE_MODELS_DIR).parent.parent
+TURBINE_ROOT_DIR = Path(TURBINE_MODELS_DIR).parent
 print(TURBINE_ROOT_DIR)
 VERSION_INFO_FILE = os.path.join(TURBINE_ROOT_DIR, "version_info.json")
 
@@ -47,15 +47,11 @@ def load_version_info():
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python :: 3",
     ],
-    package_dir={
-        "": f"{str(TURBINE_ROOT_DIR)}/python",
-    },
     packages=find_namespace_packages(
         include=[
             "turbine_models",
             "turbine_models.*",
         ],
-        where=f"{str(TURBINE_ROOT_DIR)}/python",
     ),
     install_requires=[
         "Shark-Turbine",