Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.0 port of the 2.4 #5119 hack #6109

Merged
merged 1 commit into from
Jun 25, 2019
+12 −38
Merged

3.0 port of the 2.4 #5119 hack #6109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Cabal/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@

# 2.4.0.0 [Mikhail Glushenkov](mailto:mikhail.glushenkov@gmail.com) September 2018

* Due to [#5119](https://github.com/haskell/cabal/issues/5119), the
`cabal check` warning for bounds on internal libraries has been
disabled.
# 2.4.0.0 (current development version)
* Due to [#5119](https://github.com/haskell/cabal/issues/5119), the
`cabal check` warning for bounds on internal libraries has been
disabled.
Expand Down
5 changes: 4 additions & 1 deletion Cabal/Distribution/PackageDescription/Check.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,10 @@ checkFields pkg =
++ "for example 'tested-with: GHC==6.10.4, GHC==6.12.3' and not "
++ "'tested-with: GHC==6.10.4 && ==6.12.3'."

, check (not (null depInternalLibraryWithExtraVersion)) $
-- Disabled due to #5119: we generate loads of spurious instances of
-- this warning. Re-enabling this check should be part of the fix to
-- #5119.
, check (False && not (null depInternalLibraryWithExtraVersion)) $
PackageBuildWarning $
"The package has an extraneous version range for a dependency on an "
++ "internal library: "
Expand Down
2 changes: 0 additions & 2 deletions cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,9 @@ Building library 'mylib' instantiated with
Database = Includes2-0.1.0.0-inplace-postgresql:Database.PostgreSQL
for Includes2-0.1.0.0..
Configuring library for Includes2-0.1.0.0..
Warning: The package has an extraneous version range for a dependency on an internal library: Includes2 -any && ==0.1.0.0 && ==0.1.0.0 && ==0.1.0.0. This version range includes the current package but isn't needed as the current package's library will always be used.
Preprocessing library for Includes2-0.1.0.0..
Building library for Includes2-0.1.0.0..
Configuring executable 'exe' for Includes2-0.1.0.0..
Warning: The package has an extraneous version range for a dependency on an internal library: Includes2 -any && ==0.1.0.0. This version range includes the current package but isn't needed as the current package's library will always be used.
Preprocessing executable 'exe' for Includes2-0.1.0.0..
Building executable 'exe' for Includes2-0.1.0.0..
# Includes2 exe
Expand Down
1 change: 0 additions & 1 deletion cabal-testsuite/PackageTests/BuildTools/Internal/cabal.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@ Configuring library for foo-0.1.0.0..
Preprocessing library for foo-0.1.0.0..
Building library for foo-0.1.0.0..
Configuring executable 'hello-world' for foo-0.1.0.0..
Warning: The package has an extraneous version range for a dependency on an internal library: foo -any && ==0.1.0.0. This version range includes the current package but isn't needed as the current package's library will always be used.
Preprocessing executable 'hello-world' for foo-0.1.0.0..
Building executable 'hello-world' for foo-0.1.0.0..
13 changes: 0 additions & 13 deletions cabal-testsuite/PackageTests/InternalVersions/BuildDependsExtra/setup.cabal.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
# Setup configure
Resolving dependencies...
Configuring build-depends-extra-version-0.1.0.0...
Warning: The package has an extraneous version range for a dependency on an internal library: build-depends-extra-version >=0.0.0.1. This version range includes the current package but isn't needed as the current package's library will always be used.
# Setup sdist
Distribution quality errors:
The package has an extraneous version range for a dependency on an internal library: build-depends-extra-version >=0.0.0.1. This version range includes the current package but isn't needed as the current package's library will always be used.
Distribution quality warnings:
No 'maintainer' field.
No 'description' field.
A 'license-file' is not specified.
Note: the public hackage server would reject this package.
Building source dist for build-depends-extra-version-0.1.0.0...
Preprocessing library for build-depends-extra-version-0.1.0.0..
Preprocessing executable 'bar' for build-depends-extra-version-0.1.0.0..
Source tarball created: setup.cabal.dist/work/dist/build-depends-extra-version-0.1.0.0.tar.gz
13 changes: 0 additions & 13 deletions cabal-testsuite/PackageTests/InternalVersions/BuildDependsExtra/setup.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,2 @@
# Setup configure
Configuring build-depends-extra-version-0.1.0.0...
Warning: The package has an extraneous version range for a dependency on an internal library: build-depends-extra-version >=0.0.0.1. This version range includes the current package but isn't needed as the current package's library will always be used.
# Setup sdist
Distribution quality errors:
The package has an extraneous version range for a dependency on an internal library: build-depends-extra-version >=0.0.0.1. This version range includes the current package but isn't needed as the current package's library will always be used.
Distribution quality warnings:
No 'maintainer' field.
No 'description' field.
A 'license-file' is not specified.
Note: the public hackage server would reject this package.
Building source dist for build-depends-extra-version-0.1.0.0...
Preprocessing library for build-depends-extra-version-0.1.0.0..
Preprocessing executable 'bar' for build-depends-extra-version-0.1.0.0..
Source tarball created: setup.dist/work/dist/build-depends-extra-version-0.1.0.0.tar.gz
6 changes: 4 additions & 2 deletions cabal-testsuite/PackageTests/InternalVersions/BuildDependsExtra/setup.test.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@ import Test.Cabal.Prelude
-- Test unneed version bound on internal build-tools deps
main = setupAndCabalTest $ do
setup' "configure" []
assertOutputContains "extraneous version range"
=<< setup' "sdist" []
-- Hack alert: had to squelch this warning because of #5119.
-- assertOutputContains "extraneous version range"
-- =<< setup' "sdist" []
return ()
3 changes: 0 additions & 3 deletions cabal-testsuite/PackageTests/Regression/T5309/cabal.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Configuring executable 'exe-no-lib' for T5309-1.0.0.0..
Preprocessing executable 'exe-no-lib' for T5309-1.0.0.0..
Building executable 'exe-no-lib' for T5309-1.0.0.0..
Configuring executable 'exe-with-lib' for T5309-1.0.0.0..
Warning: The package has an extraneous version range for a dependency on an internal library: T5309 -any && ==1.0.0.0, T5309 -any && ==1.0.0.0, T5309 -any && ==1.0.0.0. This version range includes the current package but isn't needed as the current package's library will always be used.
Preprocessing executable 'exe-with-lib' for T5309-1.0.0.0..
Building executable 'exe-with-lib' for T5309-1.0.0.0..
# cabal v2-test
Expand All @@ -29,7 +28,6 @@ Test suite test-no-lib: PASS
Test suite logged to: <ROOT>/cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/T5309-1.0.0.0/t/test-no-lib/test/T5309-1.0.0.0-test-no-lib.log
1 of 1 test suites (1 of 1 test cases) passed.
Configuring test suite 'test-with-lib' for T5309-1.0.0.0..
Warning: The package has an extraneous version range for a dependency on an internal library: T5309 -any && ==1.0.0.0, T5309 -any && ==1.0.0.0, T5309 -any && ==1.0.0.0. This version range includes the current package but isn't needed as the current package's library will always be used.
Preprocessing test suite 'test-with-lib' for T5309-1.0.0.0..
Building test suite 'test-with-lib' for T5309-1.0.0.0..
Running 1 test suites...
Expand All @@ -49,7 +47,6 @@ Running 1 benchmarks...
Benchmark bench-no-lib: RUNNING...
Benchmark bench-no-lib: FINISH
Configuring benchmark 'bench-with-lib' for T5309-1.0.0.0..
Warning: The package has an extraneous version range for a dependency on an internal library: T5309 -any && ==1.0.0.0, T5309 -any && ==1.0.0.0, T5309 -any && ==1.0.0.0. This version range includes the current package but isn't needed as the current package's library will always be used.
Preprocessing benchmark 'bench-with-lib' for T5309-1.0.0.0..
Building benchmark 'bench-with-lib' for T5309-1.0.0.0..
Running 1 benchmarks...
Expand Down
1 change: 0 additions & 1 deletion cabal-testsuite/PackageTests/Regression/T5677/cabal.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,5 @@ Preprocessing library for prog-0..
Building library instantiated with Sig = impl-0-inplace:Sig
for prog-0..
Configuring executable 'prog' for prog-0..
Warning: The package has an extraneous version range for a dependency on an internal library: prog -any && ==0. This version range includes the current package but isn't needed as the current package's library will always be used.
Preprocessing executable 'prog' for prog-0..
Building executable 'prog' for prog-0..
2 changes: 0 additions & 2 deletions cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/cabal.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ Configuring library for my-0.1..
Preprocessing library for my-0.1..
Building library for my-0.1..
Configuring test suite 'test-Short' for my-0.1..
Warning: The package has an extraneous version range for a dependency on an internal library: my -any && ==0.1, my -any && ==0.1. This version range includes the current package but isn't needed as the current package's library will always be used.
Preprocessing test suite 'test-Short' for my-0.1..
Building test suite 'test-Short' for my-0.1..
Running 1 test suites...
Expand All @@ -18,7 +17,6 @@ Test suite test-Short: PASS
Test suite logged to: <ROOT>/cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/my-0.1/t/test-Short/test/my-0.1-test-Short.log
1 of 1 test suites (1 of 1 test cases) passed.
Configuring test suite 'test-Foo' for my-0.1..
Warning: The package has an extraneous version range for a dependency on an internal library: my -any && ==0.1, my -any && ==0.1. This version range includes the current package but isn't needed as the current package's library will always be used.
Preprocessing test suite 'test-Foo' for my-0.1..
Building test suite 'test-Foo' for my-0.1..
Running 1 test suites...
Expand Down