Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update pyproject-toml to 0.8 (#8351) 

`build-system` is now also optional upstream.

Closes #8343
This commit is contained in:
konsti 2023-10-30 11:05:37 +01:00 committed by GitHub
parent f483ed4240
commit cf74debf42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -1801,9 +1801,9 @@ dependencies = [
[[package]] [[package]]
name = "pyproject-toml" name = "pyproject-toml"
version = "0.7.0" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "569e259cd132eb8cec5df8b672d187c5260f82ad352156b5da9549d4472e64b0" checksum = "0774c13ff0b8b7ebb4791c050c497aefcfe3f6a222c0829c7017161ed38391ff"
dependencies = [ dependencies = [
"indexmap", "indexmap",
"pep440_rs", "pep440_rs",

2
crates/ruff_linter/Cargo.toml
View File

@ -53,7 +53,7 @@ path-absolutize = { workspace = true, features = [
] } ] }
pathdiff = { version = "0.2.1" } pathdiff = { version = "0.2.1" }
pep440_rs = { version = "0.3.12", features = ["serde"] } pep440_rs = { version = "0.3.12", features = ["serde"] }
pyproject-toml = { version = "0.7.0" } pyproject-toml = { version = "0.8.0" }
quick-junit = { version = "0.3.2" } quick-junit = { version = "0.3.2" }
regex = { workspace = true } regex = { workspace = true }
result-like = { version = "0.4.6" } result-like = { version = "0.4.6" }

13
crates/ruff_linter/src/pyproject_toml.rs
View File

@ -1,8 +1,7 @@
use colored::Colorize; use colored::Colorize;
use log::warn; use log::warn;
use pyproject_toml::{BuildSystem, Project}; use pyproject_toml::PyProjectToml;
use ruff_text_size::{TextRange, TextSize}; use ruff_text_size::{TextRange, TextSize};
use serde::{Deserialize, Serialize};
use ruff_diagnostics::Diagnostic; use ruff_diagnostics::Diagnostic;
use ruff_source_file::SourceFile; use ruff_source_file::SourceFile;
@ -13,16 +12,6 @@ use crate::rules::ruff::rules::InvalidPyprojectToml;
use crate::settings::LinterSettings; use crate::settings::LinterSettings;
use crate::IOError; use crate::IOError;
/// Unlike [`pyproject_toml::PyProjectToml`], in our case `build_system` is also optional
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
#[serde(rename_all = "kebab-case")]
struct PyProjectToml {
/// Build-related data
build_system: Option<BuildSystem>,
/// Project metadata
project: Option<Project>,
}
pub fn lint_pyproject_toml(source_file: SourceFile, settings: &LinterSettings) -> Vec<Message> { pub fn lint_pyproject_toml(source_file: SourceFile, settings: &LinterSettings) -> Vec<Message> {
let Some(err) = toml::from_str::<PyProjectToml>(source_file.source_text()).err() else { let Some(err) = toml::from_str::<PyProjectToml>(source_file.source_text()).err() else {
return Vec::default(); return Vec::default();