Merge pull request #5149 from phadej/update-deps

Upgrade Tasty to 1.0 and update appveyor.yml.

Cabal/Cabal.cabal

@@ -491,7 +491,7 @@ test-suite unit-tests
     directory,
     filepath,
     integer-logarithms >= 1.0.2 && <1.1,
-    tasty,
+    tasty >= 1.0 && < 1.1,
     tasty-hunit,
     tasty-quickcheck,
     tagged,
@@ -511,7 +511,7 @@ test-suite parser-tests
     base-compat >=0.9.3 && <0.10,
     bytestring,
     filepath,
-    tasty,
+    tasty >= 1.0 && < 1.1,
     tasty-hunit,
     tasty-quickcheck,
     tasty-golden >=2.3.1.1 && <2.4,
@@ -537,7 +537,7 @@ test-suite check-tests
     base,
     bytestring,
     filepath,
-    tasty,
+    tasty >= 1.0 && < 1.1,
     tasty-golden >=2.3.1.1 && <2.4,
     Diff >=0.3.4 && <0.4,
     Cabal

appveyor.yml

@@ -53,7 +53,7 @@ build_script:
   - cd ..\cabal-testsuite
   - dist\build\cabal-tests\cabal-tests.exe -j3 --skip-setup-tests --with-cabal=..\cabal-install\dist\build\cabal\cabal.exe
   - cd ..\cabal-install
-  - ..\cabal test unit-tests --show-details=streaming --test-option=--pattern=!FileMonitor --test-option=--hide-successes
+  - ..\cabal test unit-tests --show-details=streaming --test-option="--pattern=! /FileMonitor/" --test-option=--hide-successes
   - ..\cabal test integration-tests2 --show-details=streaming --test-option=--hide-successes
   - ..\cabal test solver-quickcheck --show-details=streaming --test-option=--hide-successes --test-option=--quickcheck-tests=1000
   - ..\cabal test memory-usage-tests --show-details=streaming

cabal-install/cabal-install.cabal

@@ -631,7 +631,7 @@ executable cabal
         random,
         tagged,
         tar,
-        tasty >= 0.12,
+        tasty >= 1.0 && < 1.1,
         tasty-hunit >= 0.10,
         tasty-quickcheck,
         time,
@@ -691,8 +691,7 @@ Test-Suite unit-tests
         zlib,
         network-uri,
         network,
-        -- we need this upper bound for appveyor
-        tasty >= 0.12 && <1,
+        tasty >= 1.0 && < 1.1,
         tasty-hunit >= 0.10,
         tasty-quickcheck,
         tagged,
@@ -724,7 +723,7 @@ Test-Suite memory-usage-tests
         containers,
         deepseq,
         tagged,
-        tasty >= 0.12,
+        tasty >= 1.0 && < 1.1,
         tasty-hunit >= 0.10
 
   ghc-options: -threaded
@@ -754,7 +753,7 @@ Test-Suite solver-quickcheck
         hashable,
         random,
         tagged,
-        tasty >= 0.12,
+        tasty >= 1.0 && <1.1,
         tasty-quickcheck,
         QuickCheck >= 2.8.2,
         pretty-show >= 1.6.15
@@ -783,7 +782,7 @@ test-suite integration-tests2
         directory,
         edit-distance,
         filepath,
-        tasty >= 0.12,
+        tasty >= 1.0 && < 1.1,
         tasty-hunit >= 0.10,
         tagged
 

cabal-testsuite/cabal-testsuite.cabal

@@ -39,7 +39,7 @@ library
     base,
     bytestring,
     transformers,
-    optparse-applicative >=0.13 && <0.15,
+    optparse-applicative >=0.14 && <0.15,
     process,
     directory,
     filepath,

cabal.project

@@ -5,6 +5,10 @@ constraints: unix >= 2.7.1.0
 -- Uncomment to allow picking up extra local unpacked deps:
 --optional-packages: */
 
+-- Remove after hackage-repo-tool release
+allow-newer:
+  hackage-repo-tool:optparse-applicative
+
 program-options
   -- So us hackers get all the assertion failures early:
   --