Skip to content
Snippets Groups Projects
Commit e5b946b4 authored by Apertis CI robot's avatar Apertis CI robot
Browse files

Merge updates from debian/trixie

parents 69d90397 4f6596b8
No related tags found
1 merge request!6Update from debian/trixie for apertis/v2026dev2
Hide whitespace changes
Inline Side-by-side
CHANGES
+ 33
− 0
View file @ e5b946b4
0.3.30
* Improve Arbitrary UUID instance
Previously "small" UUIDs were generated, e.g.
```
00000001-0000-0001-0000-000000000001
00000002-0000-0000-0000-000200000002
00000004-0000-0004-0000-000400000001
00000005-0000-0000-0000-000500000007
00000001-0000-000d-0000-00050000000e
```
but now they are uniformly random
```
c4683284-bfe3-224b-29a6-1e7f11ceef65
7bf6564d-5dcf-3e37-b13d-867085f54dae
5b006243-0a70-9321-6594-20dde3d72112
2d8ed56e-ed20-7258-7c1f-b46fa9b87946
f1503184-9d3c-aacd-e9a7-36c655b70f41
```
0.3.29.1
* Support `OneTuple-0.4`
0.3.29
* Support `primitive-0.8`
* Use `data-array-byte` shim package for instances for `Data.Array.Byte.ByteArray`
0.3.28
* Add instances for `Data.Array.Byte.ByteArray` (`base-4.17`)
......
debian/changelog
+ 35
− 0
View file @ e5b946b4
haskell-quickcheck-instances (0.3.30-2) unstable; urgency=medium
* Declare compliance with Debian policy 4.7.0
* Sourceful upload for GHC 9.6
-- Ilias Tsitsimpis <iliastsi@debian.org> Sun, 06 Oct 2024 11:08:19 +0300
haskell-quickcheck-instances (0.3.30-1) unstable; urgency=medium
* New upstream release
-- Clint Adams <clint@debian.org> Sat, 21 Oct 2023 12:28:46 -0400
haskell-quickcheck-instances (0.3.29.1-3) unstable; urgency=medium
* Patch for newer dependencies.
-- Clint Adams <clint@debian.org> Mon, 18 Sep 2023 10:05:32 -0400
haskell-quickcheck-instances (0.3.29.1-2) unstable; urgency=medium
* Fix Build-Depends.
-- Clint Adams <clint@debian.org> Mon, 18 Sep 2023 09:59:27 -0400
haskell-quickcheck-instances (0.3.29.1-1) unstable; urgency=medium
[ Ilias Tsitsimpis ]
* Declare compliance with Debian policy 4.6.2
[ Clint Adams ]
* New upstream release
-- Clint Adams <clint@debian.org> Mon, 18 Sep 2023 09:54:39 -0400
haskell-quickcheck-instances (0.3.28-1+apertis0) apertis; urgency=medium
* Sync from debian/bookworm.
......
debian/control
+ 7
− 7
View file @ e5b946b4
......@@ -12,10 +12,10 @@ Build-Depends:
ghc-prof,
haskell-devscripts (>= 0.13),
libghc-onetuple-dev (>= 0.3),
libghc-onetuple-dev (<< 0.4),
libghc-onetuple-dev (<< 0.5),
libghc-onetuple-prof,
libghc-quickcheck2-dev (>= 2.14.1),
libghc-quickcheck2-dev (<< 2.14.3),
libghc-quickcheck2-dev (<< 2.14.4),
libghc-quickcheck2-prof,
libghc-case-insensitive-dev (>= 1.2.0.4),
libghc-case-insensitive-dev (<< 1.3),
......@@ -33,7 +33,7 @@ Build-Depends:
libghc-old-time-dev (<< 1.2),
libghc-old-time-prof,
libghc-primitive-dev (>= 0.6.4.0),
libghc-primitive-dev (<< 0.8),
libghc-primitive-dev (<< 0.9),
libghc-primitive-prof,
libghc-scientific-dev (>= 0.3.6.2),
libghc-scientific-dev (<< 0.4),
......@@ -42,7 +42,7 @@ Build-Depends:
libghc-splitmix-dev (<< 0.2),
libghc-splitmix-prof,
libghc-strict-dev (>= 0.4),
libghc-strict-dev (<< 0.5),
libghc-strict-dev (<< 0.6),
libghc-strict-prof,
libghc-tagged-dev (>= 0.8.6),
libghc-tagged-dev (<< 0.9),
......@@ -51,7 +51,7 @@ Build-Depends:
libghc-text-short-dev (<< 0.2),
libghc-text-short-prof,
libghc-these-dev (>= 1.1.1.1),
libghc-these-dev (<< 1.2),
libghc-these-dev (<< 1.3),
libghc-these-prof,
libghc-time-compat-dev (>= 1.9.4),
libghc-time-compat-dev (<< 1.10),
......@@ -62,7 +62,7 @@ Build-Depends:
libghc-unordered-containers-dev (>= 0.2.2.0),
libghc-unordered-containers-dev (<< 0.3),
libghc-unordered-containers-prof,
libghc-uuid-types-dev (>= 1.0.3),
libghc-uuid-types-dev (>= 1.0.4),
libghc-uuid-types-dev (<< 1.1),
libghc-uuid-types-prof,
libghc-vector-dev (>= 0.12.3.1),
......@@ -88,7 +88,7 @@ Build-Depends-Indep: ghc-doc,
libghc-unordered-containers-doc,
libghc-uuid-types-doc,
libghc-vector-doc,
Standards-Version: 4.6.1
Standards-Version: 4.7.0
Homepage: https://github.com/haskellari/qc-instances
Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-quickcheck-instances
Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-quickcheck-instances]
......
quickcheck-instances.cabal
+ 21
− 16
View file @ e5b946b4
name: quickcheck-instances
version: 0.3.28
version: 0.3.30
synopsis: Common quickcheck instances
description:
QuickCheck instances.
......@@ -12,9 +12,6 @@ description:
within another library module, so that you don't
impose these instances on down-stream consumers of
your code.
.
For information on writing a test-suite with Cabal
see <https://www.haskell.org/cabal/users-guide/developing-packages.html#test-suites>
license: BSD3
license-file: LICENSE
......@@ -39,10 +36,12 @@ tested-with:
|| ==8.4.4
|| ==8.6.5
|| ==8.8.4
|| ==8.10.4
|| ==8.10.7
|| ==9.0.2
|| ==9.2.4
|| ==9.4.1
|| ==9.2.8
|| ==9.4.7
|| ==9.6.3
|| ==9.8.1
source-repository head
type: git
......@@ -84,36 +83,39 @@ library
other-modules: Test.QuickCheck.Instances.CustomPrelude
hs-source-dirs: src
build-depends:
base >=4.5 && <4.18
, QuickCheck >=2.14.1 && <2.14.3
base >=4.5 && <4.20
, QuickCheck >=2.14.1 && <2.14.4
, splitmix >=0.0.2 && <0.2
build-depends:
array >=0.4.0.0 && <0.6
, bytestring >=0.9.2.1 && <0.12
, bytestring >=0.9.2.1 && <0.13
, case-insensitive >=1.2.0.4 && <1.3
, containers >=0.4.2.1 && <0.7
, data-fix >=0.3 && <0.4
, hashable >=1.2.7.0 && <1.5
, integer-logarithms >=1.0.3 && <1.1
, old-time >=1.1.0.0 && <1.2
, OneTuple >=0.3 && <0.4
, primitive >=0.6.4.0 && <0.8
, OneTuple >=0.3 && <0.5
, primitive >=0.6.4.0 && <0.9
, scientific >=0.3.6.2 && <0.4
, strict >=0.4 && <0.5
, strict >=0.4 && <0.6
, tagged >=0.8.6 && <0.9
, text >=1.2.3.0 && <1.3 || >=2.0 && <2.1
, these >=1.1.1.1 && <1.2
, text >=1.2.3.0 && <1.3 || >=2.0 && <2.2
, these >=1.1.1.1 && <1.3
, time-compat >=1.9.4 && <1.10
, transformers >=0.3.0.0 && <0.7
, transformers-compat >=0.6.5 && <0.8
, unordered-containers >=0.2.2.0 && <0.3
, uuid-types >=1.0.3 && <1.1
, uuid-types >=1.0.4 && <1.1
, vector >=0.12.3.1 && <0.14
-- version is irrelevant.
build-depends: time
if impl(ghc >=8.0 && <9.4)
build-depends: data-array-byte >=0.1.0.1 && <0.2
if !impl(ghc >=8.0)
build-depends: semigroups >=0.18.5 && <0.21
......@@ -150,6 +152,9 @@ test-suite self-test
, tagged
, uuid-types
if impl(ghc >=8.0 && <9.4)
build-depends: data-array-byte
benchmark bytestring-gen
default-language: Haskell2010
type: exitcode-stdio-1.0
......
src/Test/QuickCheck/Instances/Array/Byte.hs
+ 1
− 1
View file @ e5b946b4
......@@ -3,7 +3,7 @@
{-# OPTIONS_GHC -fno-warn-orphans #-}
module Test.QuickCheck.Instances.Array.Byte () where
#if MIN_VERSION_base(4,17,0)
#if !MIN_VERSION_primitive(0,8,0) && MIN_VERSION_base(4,9,0)
import Prelude ()
import Test.QuickCheck.Instances.CustomPrelude
......
src/Test/QuickCheck/Instances/Solo.hs
+ 8
− 3
View file @ e5b946b4
......@@ -5,13 +5,18 @@ module Test.QuickCheck.Instances.Solo () where
import Prelude ()
import Test.QuickCheck.Instances.CustomPrelude
#if MIN_VERSION_OneTuple(0,4,0)
import Data.Tuple.Solo (Solo (MkSolo), getSolo)
#else
import Data.Tuple.Solo (Solo (Solo), getSolo)
#define MkSolo Solo
#endif
import Test.QuickCheck
instance Arbitrary1 Solo where
liftArbitrary = fmap Solo
liftShrink shr = map Solo . shr . getSolo
liftArbitrary = fmap MkSolo
liftShrink shr = map MkSolo . shr . getSolo
instance Arbitrary a => Arbitrary (Solo a) where
arbitrary = arbitrary1
......@@ -21,4 +26,4 @@ instance CoArbitrary a => CoArbitrary (Solo a) where
coarbitrary = coarbitrary . getSolo
instance Function a => Function (Solo a) where
function = functionMap getSolo Solo
function = functionMap getSolo MkSolo
src/Test/QuickCheck/Instances/UUID.hs
+ 10
− 6
View file @ e5b946b4
......@@ -6,9 +6,10 @@ module Test.QuickCheck.Instances.UUID () where
import Prelude ()
import Test.QuickCheck.Instances.CustomPrelude
import Data.Word (Word32)
import Data.Word (Word64)
import Test.QuickCheck
import Test.QuickCheck.Gen (chooseUpTo)
import qualified Data.UUID.Types as UUID
......@@ -16,16 +17,19 @@ import qualified Data.UUID.Types as UUID
-- uuid
-------------------------------------------------------------------------------
uuidFromWords :: (Word32, Word32, Word32, Word32) -> UUID.UUID
uuidFromWords (a,b,c,d) = UUID.fromWords a b c d
uuidFromWords64 :: (Word64, Word64) -> UUID.UUID
uuidFromWords64 (a,b) = UUID.fromWords64 a b
uniformWord64 :: Gen Word64
uniformWord64 = chooseUpTo maxBound
-- | Uniform distribution.
instance Arbitrary UUID.UUID where
arbitrary = uuidFromWords <$> arbitrary
shrink = map uuidFromWords . shrink . UUID.toWords
arbitrary = UUID.fromWords64 <$> uniformWord64 <*> uniformWord64
shrink = map uuidFromWords64 . shrink . UUID.toWords64
instance CoArbitrary UUID.UUID where
coarbitrary = coarbitrary . UUID.toWords
instance Function UUID.UUID where
function = functionMap UUID.toWords uuidFromWords
function = functionMap UUID.toWords64 uuidFromWords64
test/Tests.hs
+ 9
− 0
View file @ e5b946b4
{-# LANGUAGE CPP #-}
module Main (main) where
import Data.Proxy (Proxy (..))
......@@ -6,8 +7,13 @@ import Test.QuickCheck.Instances ()
import qualified Data.Tree as Tree
import qualified Data.Primitive as Prim
import Data.UUID.Types (UUID)
#if MIN_VERSION_base(4,9,0)
import qualified Data.Array.Byte as AB
#endif
-- | Example law: == (and thus ===) should be reflexive.
eqReflexive
:: (Eq a, Show a)
......@@ -22,3 +28,6 @@ main = do
quickCheck $ eqReflexive (Proxy :: Proxy (Tree.Tree Int))
quickCheck $ eqReflexive (Proxy :: Proxy UUID)
quickCheck $ eqReflexive (Proxy :: Proxy Prim.ByteArray)
#if MIN_VERSION_base(4,9,0)
quickCheck $ eqReflexive (Proxy :: Proxy AB.ByteArray)
#endif
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
Apertis Website Terms of Use Privacy Policy