Don't use pyenv shims in search path

- Fixes #27

Signed-off-by: Dan Ryan <dan@danryan.co>

news/27.feature.rst

@@ -0,0 +1 @@
+Pyenv paths will now be ordered respecting global version settings and pyenv shims will be removed from the search path.

src/pythonfinder/models/path.py

@@ -144,7 +144,12 @@ def _setup_pyenv(self):
         self.path_order = (
             before_path + [p.as_posix() for p in root_paths] + after_path
         )
+        pyenv_shim_path = os.path.join(PYENV_ROOT, "shims")
+        if pyenv_shim_path in self.path_order:
+            self.path_order.remove(pyenv_shim_path)
         self.paths.update(self.pyenv_finder.roots)
+        if pyenv_shim_path in self.paths:
+            del self.paths[pyenv_shim_path]
         self._register_finder("pyenv", self.pyenv_finder)
 
     def _setup_windows(self):

src/pythonfinder/models/pyenv.py

@@ -44,6 +44,19 @@ def expanded_paths(self):
             if path is not None
         )
 
+    def get_version_order(self):
+        version_order_file = self.root.joinpath("version").read_text(encoding="utf-8")
+        version_paths = [
+            p for p in self.root.glob("versions/*")
+            if not (p.parent.name == "envs" or p.name == "envs")
+        ]
+        versions = {v.name: v for v in version_paths}
+        version_order = [versions[v] for v in version_order_file.splitlines() if v in versions]
+        for version in version_order:
+            version_paths.remove(version)
+        version_order += version_paths
+        return version_order
+
     @classmethod
     def version_from_bin_dir(cls, base_dir, name=None):
         py_version = None
@@ -59,9 +72,7 @@ def version_from_bin_dir(cls, base_dir, name=None):
     def get_versions(self):
         versions = defaultdict()
         bin_ = sysconfig._INSTALL_SCHEMES[sysconfig._get_default_scheme()]["scripts"]
-        for p in self.root.glob("versions/*"):
-            if p.parent.name == "envs" or p.name == "envs":
-                continue
+        for p in self.get_version_order():
             bin_dir = Path(bin_.format(base=p.as_posix()))
             version_path = None
             if bin_dir.exists():