use parser::PythonVersion in red_knot

Author: ntBre

Cargo.lock

@@ -16,7 +16,7 @@ red_knot_python_semantic = { workspace = true }
 red_knot_project = { workspace = true, features = ["zstd"] }
 red_knot_server = { workspace = true }
 ruff_db = { workspace = true, features = ["os", "cache"] }
-ruff_python_parser = { workspace = true }
+ruff_python_parser = { workspace = true, features = ["clap"] }
 
 anyhow = { workspace = true }
 chrono = { workspace = true }

crates/red_knot/Cargo.toml

@@ -1,10 +1,10 @@
 use crate::logging::Verbosity;
-use crate::python_version::PythonVersion;
 use clap::{ArgAction, ArgMatches, Error, Parser};
 use red_knot_project::metadata::options::{EnvironmentOptions, Options, TerminalOptions};
 use red_knot_project::metadata::value::{RangedValue, RelativePathBuf};
 use red_knot_python_semantic::lint;
 use ruff_db::system::SystemPathBuf;
+use ruff_python_parser::python_version::PythonVersion;
 
 #[derive(Debug, Parser)]
 #[command(
@@ -94,9 +94,7 @@ impl CheckCommand {
 
         Options {
             environment: Some(EnvironmentOptions {
-                python_version: self
-                    .python_version
-                    .map(|version| RangedValue::cli(version.into())),
+                python_version: self.python_version.map(RangedValue::cli),
                 venv_path: self.venv_path.map(RelativePathBuf::cli),
                 typeshed: self.typeshed.map(RelativePathBuf::cli),
                 extra_paths: self.extra_search_path.map(|extra_search_paths| {

crates/red_knot/src/args.rs

@@ -21,7 +21,6 @@ use salsa::plumbing::ZalsaDatabase;
 
 mod args;
 mod logging;
-mod python_version;
 mod version;
 
 #[allow(clippy::print_stdout, clippy::unnecessary_wraps, clippy::print_stderr)]

crates/red_knot/src/main.rs

@@ -19,6 +19,7 @@ ruff_text_size = { workspace = true }
 
 bitflags = { workspace = true }
 bstr = { workspace = true }
+clap = { workspace = true, optional = true }
 compact_str = { workspace = true }
 memchr = { workspace = true }
 rustc-hash = { workspace = true }

crates/red_knot/src/python_version.rs

@@ -166,3 +166,35 @@ mod schemars {
         }
     }
 }
+
+#[cfg(feature = "clap")]
+mod clap {
+    use clap::builder::PossibleValue;
+
+    impl clap::ValueEnum for super::PythonVersion {
+        fn value_variants<'a>() -> &'a [Self] {
+            &[
+                Self::PY37,
+                Self::PY38,
+                Self::PY39,
+                Self::PY310,
+                Self::PY311,
+                Self::PY312,
+                Self::PY313,
+            ]
+        }
+
+        fn to_possible_value(&self) -> Option<PossibleValue> {
+            match (self.major, self.minor) {
+                (3, 7) => Some(PossibleValue::new("3.7")),
+                (3, 8) => Some(PossibleValue::new("3.8")),
+                (3, 9) => Some(PossibleValue::new("3.9")),
+                (3, 10) => Some(PossibleValue::new("3.10")),
+                (3, 11) => Some(PossibleValue::new("3.11")),
+                (3, 12) => Some(PossibleValue::new("3.12")),
+                (3, 13) => Some(PossibleValue::new("3.13")),
+                _ => None,
+            }
+        }
+    }
+}