diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ For the latest version of this document, please see [https://github.com/DougBurke/hvega/blob/master/hvega/CHANGELOG.md](https://github.com/DougBurke/hvega/blob/master/hvega/CHANGELOG.md). +## 0.11.0.1 + +There is no change in the code, only the tests, which should now +pass when using hashable 0.3.1.0. + ## 0.11.0.0 The Vega-Lite tests are now validated against version 4.15 of the diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # hvega [![vega-lite version](https://img.shields.io/badge/Vega--Lite-v4.15-purple.svg)](https://vega.github.io/vega-lite/) +[![GitHub CI](https://github.com/DougBurke/hvega/workflows/hvega-CI/badge.svg)](https://github.com/DougBurke/hvega/actions) Create [Vega-Lite](https://vega.github.io/vega-lite/) visualizations in Haskell. It targets version 4.15 of the Vega-Lite specification. Note that diff --git a/default.nix b/default.nix --- a/default.nix +++ b/default.nix @@ -1,2 +1,48 @@ -{ nixpkgs ? import {}, compiler ? "ghc884" }: -nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./hvega.nix { } +# Looks like release-20.03 doesn't have haskell-language-server so stick +# with nixpkgs-unstable +{ nixpkgs ? import {}, compiler ? "ghc8104" }: + +let + # sources = import ../nix/sources.nix; + # pkgs = import sources.nixpkgs {}; + + inherit (nixpkgs) pkgs; + + # since we are in a sub-directory + # gitignore = pkgs.nix-gitignore.gitignoreSourcePure [ ./.gitignore ]; + gitignore = pkgs.nix-gitignore.gitignoreSourcePure [ ../.gitignore ]; + + myHaskellPackages = pkgs.haskell.packages.${compiler}.override { + overrides = hself: hsuper: { + "hvega" = + hself.callCabal2nix "hvega" (gitignore ./.) {}; + }; + }; + + shell = myHaskellPackages.shellFor { + packages = p: [ + p."hvega" + ]; + buildInputs = [ + pkgs.haskellPackages.cabal-install + pkgs.haskellPackages.haskell-language-server + pkgs.haskellPackages.hlint + pkgs.niv + ]; + withHoogle = true; + }; + + # exe = pkgs.haskell.lib.justStaticExecutables (myHaskellPackages."{{cookiecutter.project_name}}"); + + # docker = pkgs.dockerTools.buildImage { + # name = "{{cookiecutter.project_name}}"; + # config.Cmd = [ "${exe}/bin/{{cookiecutter.project_name}}" ]; + # }; +in +{ + inherit shell; + # inherit exe; + # inherit docker; + inherit myHaskellPackages; + "hvega" = myHaskellPackages."hvega"; +} diff --git a/hvega.cabal b/hvega.cabal --- a/hvega.cabal +++ b/hvega.cabal @@ -1,5 +1,5 @@ name: hvega -version: 0.11.0.0 +version: 0.11.0.1 synopsis: Create Vega-Lite visualizations (version 4) in Haskell. description: This is based on the elm-vegalite package () @@ -10,7 +10,7 @@ license-file: LICENSE author: Douglas Burke maintainer: dburke.gw@gmail.com -copyright: 2018-2020 Douglas Burke +copyright: 2018-2021 Douglas Burke category: Graphics build-type: Simple extra-source-files: README.md @@ -18,7 +18,6 @@ stack.yaml default.nix shell.nix - hvega.nix tests/specs/axis/*.vl tests/specs/color/*.vl tests/specs/composite/*.vl diff --git a/hvega.nix b/hvega.nix deleted file mode 100644 --- a/hvega.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ mkDerivation, aeson, aeson-pretty, base, bytestring, containers -, directory, filepath, http-conduit, stdenv, tagsoup, tasty -, tasty-golden, text, unordered-containers -}: -mkDerivation { - pname = "hvega"; - version = "0.11.0.0"; - src = ./.; - configureFlags = [ "-ftools" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ aeson base text unordered-containers ]; - executableHaskellDepends = [ - aeson aeson-pretty base bytestring directory filepath http-conduit - tagsoup text - ]; - testHaskellDepends = [ - aeson aeson-pretty base bytestring containers filepath tasty - tasty-golden text unordered-containers - ]; - homepage = "https://github.com/DougBurke/hvega"; - description = "Create Vega-Lite visualizations (version 4) in Haskell"; - license = stdenv.lib.licenses.bsd3; -} diff --git a/shell.nix b/shell.nix --- a/shell.nix +++ b/shell.nix @@ -1,2 +1,2 @@ -{ nixpkgs ? import {}, compiler ? "ghc884" }: -(import ./default.nix { inherit nixpkgs compiler; }).env +{ nixpkgs ? import {}, compiler ? "ghc8104" }: +(import ./default.nix { inherit nixpkgs compiler; }).shell diff --git a/src/Graphics/Vega/Tutorials/VegaLite.hs b/src/Graphics/Vega/Tutorials/VegaLite.hs --- a/src/Graphics/Vega/Tutorials/VegaLite.hs +++ b/src/Graphics/Vega/Tutorials/VegaLite.hs @@ -495,7 +495,7 @@ this case we use the function 'position' to provide an encoding of the @\"plx\"@ field as the x-position in our plot. The precise way in which the data value (parallax) is mapped to the x-position will depend on the type of -data we are encoding. We can provide a hint by delcaring the +data we are encoding. We can provide a hint by declaring the measurement type of the data field, here 'Quantitative' indicating a numeric measurement type. The final parameter of position is a list of any additional encodings in our specification. Here, with only one @@ -642,7 +642,7 @@ 'dataFromRows' - or directly from JSON (as a 'Data.Aeson.Value') using 'dataFromJson'. -Examples showing 'dataFromColumns' are the 'pieChart' and'skyPlotWithGraticules' plots, +Examples showing 'dataFromColumns' are the 'pieChart' and 'skyPlotWithGraticules' plots, but let's not peak ahead! -} @@ -790,7 +790,7 @@ -- $pie-chart -- Before adding a second axis, let's temporarily look at another --- \"one dimensiona" chart, namel the humble pie chart. +-- \"one dimensiona" chart, namely the humble pie chart. -- The 'Arc' mark type allows you to create pie charts, as well as more -- complex visualizations which we won't discuss further in this -- tutorial. diff --git a/src/Graphics/Vega/VegaLite.hs b/src/Graphics/Vega/VegaLite.hs --- a/src/Graphics/Vega/VegaLite.hs +++ b/src/Graphics/Vega/VegaLite.hs @@ -1,6 +1,6 @@ {-| Module : Graphics.Vega.VegaLite -Copyright : (c) Douglas Burke, 2018-2020 +Copyright : (c) Douglas Burke, 2018-2021 License : BSD3 Maintainer : dburke.gw@gmail.com @@ -859,6 +859,7 @@ -- ** Version 0.11 -- + -- $update01101 -- $update01100 -- ** Version 0.10 @@ -1266,6 +1267,11 @@ -- $update -- The following section describes how to update code that used -- an older version of @hvega@. + +-- $update01101 +-- The @0.11.0.1@ release is purely to support testing with @hashable@ 0.3.1.0. +-- There are no changes to the module. +-- -- $update01100 -- The @0.11.0.0@ release updates @hvega@ to support version 4.15 of diff --git a/stack.yaml b/stack.yaml --- a/stack.yaml +++ b/stack.yaml @@ -5,4 +5,4 @@ extra-deps: [] -resolver: lts-15.5 +resolver: lts-17.2 diff --git a/tests/Test.hs b/tests/Test.hs --- a/tests/Test.hs +++ b/tests/Test.hs @@ -25,7 +25,8 @@ import qualified Data.ByteString.Lazy.Char8 as BL8 -import Data.Aeson.Encode.Pretty (encodePretty) +import Data.Aeson (Value) +import Data.Aeson.Encode.Pretty (Config(confCompare), encodePretty', defConfig) import System.FilePath ((), (<.>)) @@ -84,6 +85,20 @@ import qualified Gallery.Repeat as GR import qualified Gallery.Scatter as GS import qualified Gallery.Table as GTBL + + +-- Ensure we have a repeatable ordering for the output. +-- Hopefully this is repeatable enough (brought on by +-- changes in hashable 0.3.1.0 but it makes sense to +-- do this here as I hadn't realised that the default +-- encodePretty didn't actually apply any sorting to +-- the keys). +-- +encodePretty :: Value -> BL8.ByteString +encodePretty = encodePretty' config + where + config = defConfig { confCompare = compare } + -- The "golden" output is "tests/specs/