Skip to content
New issue

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

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

Already on GitHub? # to your account

Updated configuration files, added a comment to test/AddressSpec.hs file #55

Merged
merged 31 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
612fda1
Update stack.yaml
Oleksandr-Zhabenko Aug 6, 2024
43c8cbc
Update stack.yaml
Oleksandr-Zhabenko Aug 6, 2024
ea06750
Changed yaml files to use string-random-0.1.4.3
Oleksandr-Zhabenko Aug 6, 2024
3db18be
Changed yaml files to use text-2.0.2
Oleksandr-Zhabenko Aug 6, 2024
7377bd9
Changed yaml files
Oleksandr-Zhabenko Aug 6, 2024
ee555ba
Changed yaml files
Oleksandr-Zhabenko Aug 6, 2024
573877b
Changed yaml files
Oleksandr-Zhabenko Aug 6, 2024
0466c8a
Changed yaml files
Oleksandr-Zhabenko Aug 6, 2024
dfddd5d
Changed yaml files
Oleksandr-Zhabenko Aug 6, 2024
57c1849
Changed package.yaml file
Oleksandr-Zhabenko Aug 6, 2024
8ff4d44
Changed yaml files
Oleksandr-Zhabenko Aug 6, 2024
fdbed5d
Added stack-lts-2* yaml files
Oleksandr-Zhabenko Aug 6, 2024
70c3869
Changed workflow yaml file
Oleksandr-Zhabenko Aug 6, 2024
f808628
Changed workflow yaml file
Oleksandr-Zhabenko Aug 6, 2024
f8f3b10
Changed workflow yaml file
Oleksandr-Zhabenko Aug 6, 2024
f12afa3
Changed workflow yaml file
Oleksandr-Zhabenko Aug 6, 2024
71a8c5e
Changed stack.yaml file
Oleksandr-Zhabenko Aug 6, 2024
bd203f6
Changed stack.yaml file
Oleksandr-Zhabenko Aug 6, 2024
fde1717
Changed stack.yaml file
Oleksandr-Zhabenko Aug 6, 2024
e90da2b
Changed stack.yaml file
Oleksandr-Zhabenko Aug 6, 2024
e27658c
Added commentary to test/AddressSpec.hs about the reason of random te…
Oleksandr-Zhabenko Aug 7, 2024
0ef1387
Added commentary to test/AddressSpec.hs about the reason of random te…
Oleksandr-Zhabenko Aug 7, 2024
a1f0fd8
Changed stack.yaml
Oleksandr-Zhabenko Aug 7, 2024
d63440e
Added missed data-files in fakedata.cabal
Oleksandr-Zhabenko Aug 7, 2024
476a549
Accepted changes proposed by psibi
Oleksandr-Zhabenko Aug 7, 2024
c6b304a
Accepted changes proposed by psibi for stack.yaml
Oleksandr-Zhabenko Aug 7, 2024
4ae99e6
Accepted changes proposed by psibi for stack.yaml
Oleksandr-Zhabenko Aug 7, 2024
08dd5f5
Fixed .github/workflows/tests.yml
Oleksandr-Zhabenko Aug 7, 2024
550cf66
Added dist/cabal-config-flags to .gitignore file
Oleksandr-Zhabenko Aug 8, 2024
7659e1c
Removed unneeded binary files
Oleksandr-Zhabenko Aug 12, 2024
ed1f1de
Removed formatting and the commentary
Oleksandr-Zhabenko Aug 12, 2024
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
36 changes: 22 additions & 14 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,33 @@ jobs:
include:
- os: ubuntu-latest
stack-yaml: stack.yaml
resolver: nightly
- os: ubuntu-latest
stack-yaml: stack.yaml
resolver: lts-18
- os: ubuntu-latest
stack-yaml: stack-lts-16.yaml
resolver: lts-16
resolver: lts-22.32
- os: macos-latest
stack-yaml: stack.yaml
resolver: nightly
- os: macos-latest
resolver: lts-22.32
- os: windows-latest
stack-yaml: stack.yaml
resolver: lts-18
resolver: lts-22.32
- os: ubuntu-latest
stack-yaml: stack-lts-21.yaml
resolver: lts-21.25
- os: ubuntu-latest
stack-yaml: stack-lts-20.yaml
resolver: lts-20.26
- os: macos-latest
stack-yaml: stack-lts-21.yaml
resolver: lts-21.25
- os: macos-latest
stack-yaml: stack-lts-16.yaml
resolver: lts-16
stack-yaml: stack-lts-20.yaml
resolver: lts-20.26
- os: windows-latest
stack-yaml: stack.yaml
resolver: lts-18
stack-yaml: stack-lts-21.yaml
resolver: lts-21.25
- os: windows-latest
stack-yaml: stack-lts-20.yaml
resolver: lts-20.26



steps:
- name: Clone project
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
.stack-work/
*~
stack.yaml.lock
dist-newstyle/cache/config
cabal.project.local

Binary file added dist-newstyle/cache/config
Binary file not shown.
Binary file added dist/cabal-config-flags
Binary file not shown.
2 changes: 1 addition & 1 deletion fakedata.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.34.7.
-- This file has been generated from package.yaml by hpack version 0.36.0.
--
-- see: https://github.com/sol/hpack

Expand Down
38 changes: 19 additions & 19 deletions package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,25 @@ category: Random, Fake, FakeData
description: Please see the README on GitHub at <https://github.com/psibi/fakedata#readme>

dependencies:
- base >= 4.7 && < 5
- aeson
- random
- text
- exceptions
- vector
- yaml
- directory
- filepath
- unordered-containers
- hashable
- containers
- template-haskell
- bytestring
- time
- string-random
- fakedata-parser
- attoparsec
- transformers
- base >= 4.7 && < 5
- aeson
- random
- text
- exceptions
- vector
- yaml
- directory
- filepath
- unordered-containers
- hashable
- containers
- template-haskell
- bytestring
- time
- string-random
- fakedata-parser
- attoparsec
- transformers

library:
source-dirs: src
Expand Down
8 changes: 0 additions & 8 deletions stack-lts-16.yaml

This file was deleted.

14 changes: 0 additions & 14 deletions stack-lts-18.yaml

This file was deleted.

5 changes: 5 additions & 0 deletions stack-lts-20.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
resolver: lts-20.26

packages:
- .

5 changes: 5 additions & 0 deletions stack-lts-21.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
resolver: lts-21.25

packages:
- .

4 changes: 1 addition & 3 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
resolver: lts-19.13
resolver: lts-22.32

packages:
- .

nix:
shell-file: shell.nix
2 changes: 1 addition & 1 deletion test/AddressSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ spec = do
c2 <- country
pure (c1, c2)
fakeCountry <- generateWithSettings (setNonDeterministic defaultFakerSettings) someCountry
(fst fakeCountry) `shouldNotBe` (snd fakeCountry)
(fst fakeCountry) `shouldNotBe` (snd fakeCountry) -- Provides random test failures here (i.e. the two values are actually equal). It uses `Config.localesEnDirectory` that is "faker/lib/locales/en" and `Config.fetchData` with data from file with "address" in its name in this directory. Such directory is not in the repository itself, probably it is created during compilation and installation of the package. The contents of the file are available at the link: https://hackage.haskell.org/package/fakedata-1.0.3/src/faker/lib/locales/en/address.yml There are rather many countries there, it is strange that they often coincide to fail the test here.
it "Equality of sequence" $ do
let someCountry :: Fake (Text, Text)
someCountry = do
Expand Down
Loading