Use Manifest::simple in tests (#638)

This commit is contained in:
Charlie Marsh 2023-12-13 12:41:29 -05:00 committed by GitHub
parent eb1a630db2
commit 2da6563a64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -117,13 +117,7 @@ async fn resolve(
async fn black() -> Result<()> { async fn black() -> Result<()> {
colored::control::set_override(false); colored::control::set_override(false);
let manifest = Manifest::new( let manifest = Manifest::simple(vec![Requirement::from_str("black<=23.9.1").unwrap()]);
vec![Requirement::from_str("black<=23.9.1").unwrap()],
vec![],
vec![],
vec![],
None,
);
let options = ResolutionOptions::new( let options = ResolutionOptions::new(
ResolutionMode::default(), ResolutionMode::default(),
PreReleaseMode::default(), PreReleaseMode::default(),
@ -141,13 +135,9 @@ async fn black() -> Result<()> {
async fn black_colorama() -> Result<()> { async fn black_colorama() -> Result<()> {
colored::control::set_override(false); colored::control::set_override(false);
let manifest = Manifest::new( let manifest = Manifest::simple(vec![
vec![Requirement::from_str("black[colorama]<=23.9.1").unwrap()], Requirement::from_str("black[colorama]<=23.9.1").unwrap()
vec![], ]);
vec![],
vec![],
None,
);
let options = ResolutionOptions::new( let options = ResolutionOptions::new(
ResolutionMode::default(), ResolutionMode::default(),
PreReleaseMode::default(), PreReleaseMode::default(),
@ -166,13 +156,9 @@ async fn black_colorama() -> Result<()> {
async fn black_tensorboard() -> Result<()> { async fn black_tensorboard() -> Result<()> {
colored::control::set_override(false); colored::control::set_override(false);
let manifest = Manifest::new( let manifest = Manifest::simple(vec![
vec![Requirement::from_str("black[tensorboard]<=23.9.1").unwrap()], Requirement::from_str("black[tensorboard]<=23.9.1").unwrap()
vec![], ]);
vec![],
vec![],
None,
);
let options = ResolutionOptions::new( let options = ResolutionOptions::new(
ResolutionMode::default(), ResolutionMode::default(),
PreReleaseMode::default(), PreReleaseMode::default(),
@ -190,13 +176,7 @@ async fn black_tensorboard() -> Result<()> {
async fn black_python_310() -> Result<()> { async fn black_python_310() -> Result<()> {
colored::control::set_override(false); colored::control::set_override(false);
let manifest = Manifest::new( let manifest = Manifest::simple(vec![Requirement::from_str("black<=23.9.1").unwrap()]);
vec![Requirement::from_str("black<=23.9.1").unwrap()],
vec![],
vec![],
vec![],
None,
);
let options = ResolutionOptions::new( let options = ResolutionOptions::new(
ResolutionMode::default(), ResolutionMode::default(),
PreReleaseMode::default(), PreReleaseMode::default(),
@ -292,13 +272,7 @@ async fn black_flake8() -> Result<()> {
async fn black_lowest() -> Result<()> { async fn black_lowest() -> Result<()> {
colored::control::set_override(false); colored::control::set_override(false);
let manifest = Manifest::new( let manifest = Manifest::simple(vec![Requirement::from_str("black>21").unwrap()]);
vec![Requirement::from_str("black>21").unwrap()],
vec![],
vec![],
vec![],
None,
);
let options = ResolutionOptions::new( let options = ResolutionOptions::new(
ResolutionMode::Lowest, ResolutionMode::Lowest,
PreReleaseMode::default(), PreReleaseMode::default(),
@ -316,13 +290,7 @@ async fn black_lowest() -> Result<()> {
async fn black_lowest_direct() -> Result<()> { async fn black_lowest_direct() -> Result<()> {
colored::control::set_override(false); colored::control::set_override(false);
let manifest = Manifest::new( let manifest = Manifest::simple(vec![Requirement::from_str("black>21").unwrap()]);
vec![Requirement::from_str("black>21").unwrap()],
vec![],
vec![],
vec![],
None,
);
let options = ResolutionOptions::new( let options = ResolutionOptions::new(
ResolutionMode::LowestDirect, ResolutionMode::LowestDirect,
PreReleaseMode::default(), PreReleaseMode::default(),
@ -388,13 +356,7 @@ async fn black_ignore_preference() -> Result<()> {
async fn black_disallow_prerelease() -> Result<()> { async fn black_disallow_prerelease() -> Result<()> {
colored::control::set_override(false); colored::control::set_override(false);
let manifest = Manifest::new( let manifest = Manifest::simple(vec![Requirement::from_str("black<=20.0").unwrap()]);
vec![Requirement::from_str("black<=20.0").unwrap()],
vec![],
vec![],
vec![],
None,
);
let options = ResolutionOptions::new( let options = ResolutionOptions::new(
ResolutionMode::default(), ResolutionMode::default(),
PreReleaseMode::Disallow, PreReleaseMode::Disallow,
@ -414,13 +376,7 @@ async fn black_disallow_prerelease() -> Result<()> {
async fn black_allow_prerelease_if_necessary() -> Result<()> { async fn black_allow_prerelease_if_necessary() -> Result<()> {
colored::control::set_override(false); colored::control::set_override(false);
let manifest = Manifest::new( let manifest = Manifest::simple(vec![Requirement::from_str("black<=20.0").unwrap()]);
vec![Requirement::from_str("black<=20.0").unwrap()],
vec![],
vec![],
vec![],
None,
);
let options = ResolutionOptions::new( let options = ResolutionOptions::new(
ResolutionMode::default(), ResolutionMode::default(),
PreReleaseMode::IfNecessary, PreReleaseMode::IfNecessary,
@ -440,13 +396,7 @@ async fn black_allow_prerelease_if_necessary() -> Result<()> {
async fn pylint_disallow_prerelease() -> Result<()> { async fn pylint_disallow_prerelease() -> Result<()> {
colored::control::set_override(false); colored::control::set_override(false);
let manifest = Manifest::new( let manifest = Manifest::simple(vec![Requirement::from_str("pylint==2.3.0").unwrap()]);
vec![Requirement::from_str("pylint==2.3.0").unwrap()],
vec![],
vec![],
vec![],
None,
);
let options = ResolutionOptions::new( let options = ResolutionOptions::new(
ResolutionMode::default(), ResolutionMode::default(),
PreReleaseMode::Disallow, PreReleaseMode::Disallow,
@ -464,13 +414,7 @@ async fn pylint_disallow_prerelease() -> Result<()> {
async fn pylint_allow_prerelease() -> Result<()> { async fn pylint_allow_prerelease() -> Result<()> {
colored::control::set_override(false); colored::control::set_override(false);
let manifest = Manifest::new( let manifest = Manifest::simple(vec![Requirement::from_str("pylint==2.3.0").unwrap()]);
vec![Requirement::from_str("pylint==2.3.0").unwrap()],
vec![],
vec![],
vec![],
None,
);
let options = ResolutionOptions::new( let options = ResolutionOptions::new(
ResolutionMode::default(), ResolutionMode::default(),
PreReleaseMode::Allow, PreReleaseMode::Allow,
@ -488,16 +432,10 @@ async fn pylint_allow_prerelease() -> Result<()> {
async fn pylint_allow_explicit_prerelease_without_marker() -> Result<()> { async fn pylint_allow_explicit_prerelease_without_marker() -> Result<()> {
colored::control::set_override(false); colored::control::set_override(false);
let manifest = Manifest::new( let manifest = Manifest::simple(vec![
vec![ Requirement::from_str("pylint==2.3.0").unwrap(),
Requirement::from_str("pylint==2.3.0").unwrap(), Requirement::from_str("isort>=5.0.0").unwrap(),
Requirement::from_str("isort>=5.0.0").unwrap(), ]);
],
vec![],
vec![],
vec![],
None,
);
let options = ResolutionOptions::new( let options = ResolutionOptions::new(
ResolutionMode::default(), ResolutionMode::default(),
PreReleaseMode::Explicit, PreReleaseMode::Explicit,
@ -515,16 +453,10 @@ async fn pylint_allow_explicit_prerelease_without_marker() -> Result<()> {
async fn pylint_allow_explicit_prerelease_with_marker() -> Result<()> { async fn pylint_allow_explicit_prerelease_with_marker() -> Result<()> {
colored::control::set_override(false); colored::control::set_override(false);
let manifest = Manifest::new( let manifest = Manifest::simple(vec![
vec![ Requirement::from_str("pylint==2.3.0").unwrap(),
Requirement::from_str("pylint==2.3.0").unwrap(), Requirement::from_str("isort>=5.0.0b").unwrap(),
Requirement::from_str("isort>=5.0.0b").unwrap(), ]);
],
vec![],
vec![],
vec![],
None,
);
let options = ResolutionOptions::new( let options = ResolutionOptions::new(
ResolutionMode::default(), ResolutionMode::default(),
PreReleaseMode::Explicit, PreReleaseMode::Explicit,