ソースを参照

Fix install repos (#4035)

Lin Manhui 6 ヶ月 前
コミット
6cbfe76c0d
2 ファイル変更6 行追加5 行削除
  1. 4 0
      paddlex/repo_manager/meta.py
  2. 2 5
      paddlex/repo_manager/repo.py

+ 4 - 0
paddlex/repo_manager/meta.py

@@ -165,6 +165,10 @@ REPO_META = {
     },
 }
 
+REPO_DIST_NAMES = {
+    item["dist_name"] for item in REPO_META.values() if "dist_name" in item
+}
+
 
 def get_repo_meta(repo_name):
     """get_repo_meta"""

+ 2 - 5
paddlex/repo_manager/repo.py

@@ -28,7 +28,7 @@ from ..utils.install import (
     install_packages_from_requirements_file,
     uninstall_packages,
 )
-from .meta import REPO_DOWNLOAD_BASE, get_repo_meta
+from .meta import REPO_DIST_NAMES, REPO_DOWNLOAD_BASE, get_repo_meta
 from .utils import (
     fetch_repo_using_git,
     install_external_deps,
@@ -362,9 +362,6 @@ class RepositoryGroupInstaller(object):
         return sorted_repos
 
     def _normalize_deps(self, deps, headline=None):
-        repo_pkgs = set(
-            repo.dist_name for repo in self.repos if repo.dist_name is not None
-        )
         lines = []
         if headline is not None:
             lines.append(headline)
@@ -380,7 +377,7 @@ class RepositoryGroupInstaller(object):
             # If `line` is not an empty line or a comment, it must be a requirement specifier.
             # Other forms may cause a parse error.
             req = Requirement(line_s)
-            if req.name in repo_pkgs:
+            if req.name in REPO_DIST_NAMES:
                 # Skip repo packages
                 continue
             elif req.name.replace("_", "-") in (