From b2e539be3e9b833abe047e8d38762069aa7afe28 Mon Sep 17 00:00:00 2001 From: Phil de Joux Date: Tue, 19 Nov 2024 15:47:46 -0500 Subject: [PATCH] Update test expectations with --accept in other tests --- .../Fields/ImpossibleVersionRangeLib/cabal.out | 7 +++++++ .../Check/NonConfCheck/PackageVersionsInternal/cabal.out | 5 ++++- .../NonConfCheck/PackageVersionsInternalSimple/cabal.out | 3 +++ .../Check/NonConfCheck/PackageVersionsLibInt/cabal.out | 6 ++++++ .../Check/NonConfCheck/PackageVersionsStraddle/cabal.out | 8 +++++++- .../PackageTests/Check/NonConfCheck/SetupBounds/cabal.out | 4 ++++ 6 files changed, 31 insertions(+), 2 deletions(-) diff --git a/cabal-testsuite/PackageTests/Check/ConfiguredPackage/Fields/ImpossibleVersionRangeLib/cabal.out b/cabal-testsuite/PackageTests/Check/ConfiguredPackage/Fields/ImpossibleVersionRangeLib/cabal.out index c037b09c0f5..9176ef50885 100644 --- a/cabal-testsuite/PackageTests/Check/ConfiguredPackage/Fields/ImpossibleVersionRangeLib/cabal.out +++ b/cabal-testsuite/PackageTests/Check/ConfiguredPackage/Fields/ImpossibleVersionRangeLib/cabal.out @@ -1,4 +1,11 @@ # cabal check The package will not build sanely due to these errors: Error: [impossible-dep] The package has an impossible version range for a dependency on an internal library: pkg:internal >1.0 && <2.0. This version range does not include the current package, and must be removed as the current package's library will always be used. +These warnings may cause trouble when distributing the package: +Warning: [trailing-zero-upper-bounds] On library, these packages have upper bounds with trailing zeros: + - pkg +Please avoid trailing zeros for upper bounds. There is more information at https://pvp.haskell.org/ +Warning: [greater-than-lower-bounds] On library, these packages have greater than (>) lower bounds: + - pkg +Please use greater than or equals (>=) for lower bounds. There is more information at https://pvp.haskell.org/ Error: Hackage would reject this package. diff --git a/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsInternal/cabal.out b/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsInternal/cabal.out index 37aa169b416..8e4746f0641 100644 --- a/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsInternal/cabal.out +++ b/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsInternal/cabal.out @@ -1,2 +1,5 @@ # cabal check -No errors or warnings could be found in the package. +These warnings may cause trouble when distributing the package: +Warning: [less-than-equals-upper-bounds] On library, these packages have less than or equals (<=) upper bounds: + - base +Please use less than (<) for upper bounds. There is more information at https://pvp.haskell.org/ diff --git a/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsInternalSimple/cabal.out b/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsInternalSimple/cabal.out index 2c1d8a72480..d9c4158226b 100644 --- a/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsInternalSimple/cabal.out +++ b/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsInternalSimple/cabal.out @@ -3,3 +3,6 @@ These warnings may cause trouble when distributing the package: Warning: [missing-upper-bounds] On executable 'prova', these packages miss upper bounds: - acme-box Please add them. There is more information at https://pvp.haskell.org/ +Warning: [trailing-zero-upper-bounds] On library, these packages have upper bounds with trailing zeros: + - text +Please avoid trailing zeros for upper bounds. There is more information at https://pvp.haskell.org/ diff --git a/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsLibInt/cabal.out b/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsLibInt/cabal.out index c9f531cbd6e..d5a6767b30d 100644 --- a/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsLibInt/cabal.out +++ b/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsLibInt/cabal.out @@ -3,3 +3,9 @@ These warnings may cause trouble when distributing the package: Warning: [missing-upper-bounds] On library 'int-lib', these packages miss upper bounds: - text Please add them. There is more information at https://pvp.haskell.org/ +Warning: [less-than-equals-upper-bounds] On library, these packages have less than or equals (<=) upper bounds: + - base +Please use less than (<) for upper bounds. There is more information at https://pvp.haskell.org/ +Warning: [greater-than-lower-bounds] On library 'int-lib', these packages have greater than (>) lower bounds: + - text +Please use greater than or equals (>=) for lower bounds. There is more information at https://pvp.haskell.org/ diff --git a/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsStraddle/cabal.out b/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsStraddle/cabal.out index 37aa169b416..464c0933ab8 100644 --- a/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsStraddle/cabal.out +++ b/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsStraddle/cabal.out @@ -1,2 +1,8 @@ # cabal check -No errors or warnings could be found in the package. +These warnings may cause trouble when distributing the package: +Warning: [less-than-equals-upper-bounds] On library, these packages have less than or equals (<=) upper bounds: + - base +Please use less than (<) for upper bounds. There is more information at https://pvp.haskell.org/ +Warning: [greater-than-lower-bounds] On library, these packages have greater than (>) lower bounds: + - base +Please use greater than or equals (>=) for lower bounds. There is more information at https://pvp.haskell.org/ diff --git a/cabal-testsuite/PackageTests/Check/NonConfCheck/SetupBounds/cabal.out b/cabal-testsuite/PackageTests/Check/NonConfCheck/SetupBounds/cabal.out index 895d3a63943..6ca7b6d2e4f 100644 --- a/cabal-testsuite/PackageTests/Check/NonConfCheck/SetupBounds/cabal.out +++ b/cabal-testsuite/PackageTests/Check/NonConfCheck/SetupBounds/cabal.out @@ -1,4 +1,8 @@ # cabal check +These warnings may cause trouble when distributing the package: +Warning: [greater-than-lower-bounds] On custom-setup, these packages have greater than (>) lower bounds: + - base +Please use greater than or equals (>=) for lower bounds. There is more information at https://pvp.haskell.org/ The following errors will cause portability problems on other environments: Error: [missing-bounds-setup] The dependency 'setup-depends: 'base' does not specify an upper bound on the version number. Each major release of the 'base' package changes the API in various ways and most packages will need some changes to compile with it. If you are not sure what upper bound to use then use the next major version. Error: Hackage would reject this package.