fix: put the binary under bin directly (#1254)

Signed-off-by: Frost Ming <[email protected]> Signed-off-by: Frost Ming <[email protected]>
tensorchord · Dec 2, 2022 · 5cbed88 · 5cbed88
1 parent c7fd12b
commit 5cbed88
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 32 deletions.
diff --git a/envd/cmd.py b/envd/cmd.py
diff --git a/setup.py b/setup.py
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import os
-import shutil
 from setuptools.command.sdist import sdist
 from setuptools import setup, Extension, find_packages
 from setuptools.command.build_ext import build_ext
@@ -35,7 +34,7 @@ def build_envd_if_not_found():
                 errno = subprocess.call(
                     ["make", "build-release", "GIT_TAG={}".format(tag)]
                 )
-        except:
+        except OSError:
             logging.warning(".GIT_TAG_INFO not found")
             logging.info("start building envd from source")
             errno = subprocess.call(["make", "build-release"])
@@ -51,10 +50,7 @@ def build_extension(self, ext: Extension) -> None:
         if not isinstance(ext, EnvdExtension):
             return super().build_extension(ext)
 
-        bin_path = os.path.join(self.build_lib, "envd", "bin")
         build_envd_if_not_found()
-        os.makedirs(bin_path, exist_ok=True)
-        shutil.copy("bin/envd", bin_path)
 
 
 class SdistCommand(sdist):
@@ -108,11 +104,7 @@ def get_version():
     packages=find_packages(),
     include_package_data=True,
     python_requires=">=3.6",
-    entry_points={
-        "console_scripts": [
-            "envd=envd.cmd:envd",
-        ],
-    },
+    data_files=[("bin", ["bin/envd"])],
     classifiers=classifiers,
     zip_safe=False,
     ext_modules=[