mirror of
https://github.com/IHaskell/IHaskell.git
synced 2025-04-15 19:06:06 +00:00
Update acceptance tests for new HLint
This commit is contained in:
Vaibhav Sagar
parent
c0a1160fe6
commit
90e2e1539a
3
.github/workflows/ci.yml
vendored
3
.github/workflows/ci.yml
vendored
@ -54,6 +54,9 @@ jobs:
|
||||
with:
|
||||
path: ~/.stack
|
||||
key: ${{ runner.os }}-${{ matrix.versions.stack-yaml }}-stack-global
|
||||
- name: Update system dependencies
|
||||
run: |
|
||||
sudo apt update
|
||||
- name: Install system dependencies
|
||||
run: |
|
||||
sudo apt install libmagic-dev libgmp-dev libblas-dev liblapack-dev libcairo2-dev libpango1.0-dev libzmq3-dev
|
||||
|
||||
119
release-8.10.nix
119
release-8.10.nix
@ -1,122 +1,9 @@
|
||||
let
|
||||
nixpkgs-src = builtins.fetchTarball {
|
||||
url = "https://github.com/NixOS/nixpkgs/tarball/ce283f055bd625d6ba80a8f5b7315721252ce5a9";
|
||||
sha256 = "000gpazdj5ih3p9niw2kvrd2lnd2r9ik6xklvmhcgn8lcbngaiv3";
|
||||
};
|
||||
in
|
||||
{ compiler ? "ghc8101"
|
||||
{ compiler ? "ghc8102"
|
||||
, jupyterlabAppDir ? null
|
||||
, nixpkgs ? import nixpkgs-src {}
|
||||
, nixpkgs ? import <nixpkgs> {}
|
||||
, packages ? (_: [])
|
||||
, pythonPackages ? (_: [])
|
||||
, rtsopts ? "-M3g -N2"
|
||||
, systemPackages ? (_: [])
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (builtins) any elem filterSource listToAttrs;
|
||||
lib = nixpkgs.lib;
|
||||
cleanSource = name: type: let
|
||||
baseName = baseNameOf (toString name);
|
||||
in lib.cleanSourceFilter name type && !(
|
||||
(type == "directory" && (elem baseName [ ".stack-work" "dist"])) ||
|
||||
any (lib.flip lib.hasSuffix baseName) [ ".hi" ".ipynb" ".nix" ".sock" ".yaml" ".yml" ]
|
||||
);
|
||||
ihaskellSourceFilter = src: name: type: let
|
||||
relPath = lib.removePrefix (toString src + "/") (toString name);
|
||||
in cleanSource name type && ( any (lib.flip lib.hasPrefix relPath) [
|
||||
"src" "main" "html" "Setup.hs" "ihaskell.cabal" "LICENSE"
|
||||
]);
|
||||
ihaskell-src = filterSource (ihaskellSourceFilter ./.) ./.;
|
||||
ipython-kernel-src = filterSource cleanSource ./ipython-kernel;
|
||||
ghc-parser-src = filterSource cleanSource ./ghc-parser;
|
||||
ihaskell-display-src = filterSource cleanSource ./ihaskell-display;
|
||||
displays = self: listToAttrs (
|
||||
map
|
||||
(display: { name = "ihaskell-${display}"; value = self.callCabal2nix display "${ihaskell-display-src}/ihaskell-${display}" {}; })
|
||||
[ "aeson" "blaze" "charts" "diagrams" "gnuplot" "graphviz" "hatex" "juicypixels" "magic" "plot" "rlangqq" "static-canvas" "widgets" ]);
|
||||
haskellPackages = nixpkgs.haskell.packages."${compiler}".override (old: {
|
||||
overrides = nixpkgs.lib.composeExtensions (old.overrides or (_: _: {})) (self: super: {
|
||||
ihaskell = nixpkgs.haskell.lib.overrideCabal (
|
||||
self.callCabal2nix "ihaskell" ihaskell-src {}) (_drv: {
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR/home
|
||||
export PATH=$PWD/dist/build/ihaskell:$PATH
|
||||
export GHC_PACKAGE_PATH=$PWD/dist/package.conf.inplace/:$GHC_PACKAGE_PATH
|
||||
'';
|
||||
configureFlags = (_drv.configureFlags or []) ++ [
|
||||
# otherwise the tests are agonisingly slow and the kernel times out
|
||||
"--enable-executable-dynamic"
|
||||
];
|
||||
doHaddock = false;
|
||||
});
|
||||
ghc-parser = self.callCabal2nix "ghc-parser" ghc-parser-src {};
|
||||
ipython-kernel = self.callCabal2nix "ipython-kernel" ipython-kernel-src {};
|
||||
|
||||
inline-r = nixpkgs.haskell.lib.dontCheck super.inline-r;
|
||||
static-canvas = nixpkgs.haskell.lib.doJailbreak super.static-canvas;
|
||||
|
||||
criterion = nixpkgs.haskell.lib.dontCheck super.criterion;
|
||||
polyparse = nixpkgs.haskell.lib.doJailbreak super.polyparse;
|
||||
lifted-async = nixpkgs.haskell.lib.doJailbreak super.lifted-async;
|
||||
th-expand-syns = nixpkgs.haskell.lib.doJailbreak super.th-expand-syns;
|
||||
ghc-lib-parser = super.ghc-lib-parser_8_10_1_20200412;
|
||||
ghc-lib-parser-ex = self.callCabal2nix "ghc-lib-parser-ex" (builtins.fetchTarball {
|
||||
url = "https://github.com/shayne-fletcher/ghc-lib-parser-ex/tarball/ede4490fa7fd446df1ae2d68f24c4cf6831fa14b";
|
||||
sha256 = "1yzw5bhj20as698g774mbjvfmw7kx92gs6fda7xnkrfkbv5sc754";
|
||||
}) {};
|
||||
hlint = nixpkgs.haskell.lib.doJailbreak (self.callCabal2nix "hlint" (builtins.fetchTarball {
|
||||
url = "https://github.com/ndmitchell/hlint/tarball/5f75e621a77ae3eb28883250a959084396467a59";
|
||||
sha256 = "0r7laz1xa634v544iwdmq8hf04ni85yb8s00ga1k2bwr46111wqv";
|
||||
}) {});
|
||||
} // displays self);
|
||||
});
|
||||
ihaskellEnv = haskellPackages.ghcWithPackages (self: [ self.ihaskell ] ++ packages self);
|
||||
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ] ++ pythonPackages ps);
|
||||
|
||||
ihaskellWrapperSh = nixpkgs.writeScriptBin "ihaskell-wrapper" ''
|
||||
#! ${nixpkgs.stdenv.shell}
|
||||
export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| ${nixpkgs.coreutils}/bin/tr ' ' ':'):$GHC_PACKAGE_PATH"
|
||||
export PATH="${nixpkgs.stdenv.lib.makeBinPath ([ ihaskellEnv jupyterlab ] ++ systemPackages nixpkgs)}''${PATH:+:}$PATH"
|
||||
exec ${ihaskellEnv}/bin/ihaskell "$@"
|
||||
'';
|
||||
|
||||
ihaskellJupyterCmdSh = cmd: extraArgs: nixpkgs.writeScriptBin "ihaskell-${cmd}" ''
|
||||
#! ${nixpkgs.stdenv.shell}
|
||||
export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| ${nixpkgs.coreutils}/bin/tr ' ' ':'):$GHC_PACKAGE_PATH"
|
||||
export PATH="${nixpkgs.stdenv.lib.makeBinPath ([ ihaskellEnv jupyterlab ] ++ systemPackages nixpkgs)}''${PATH:+:}$PATH"
|
||||
${ihaskellEnv}/bin/ihaskell install \
|
||||
-l $(${ihaskellEnv}/bin/ghc --print-libdir) \
|
||||
--use-rtsopts="${rtsopts}" \
|
||||
&& ${jupyterlab}/bin/jupyter ${cmd} ${extraArgs} "$@"
|
||||
'';
|
||||
appDir = if jupyterlabAppDir != null
|
||||
then "--app-dir=${jupyterlabAppDir}"
|
||||
else "";
|
||||
in
|
||||
nixpkgs.buildEnv {
|
||||
name = "ihaskell-with-packages";
|
||||
buildInputs = [ nixpkgs.makeWrapper ];
|
||||
paths = [ ihaskellEnv jupyterlab ];
|
||||
postBuild = ''
|
||||
ln -s ${ihaskellJupyterCmdSh "lab" appDir}/bin/ihaskell-lab $out/bin/
|
||||
ln -s ${ihaskellJupyterCmdSh "notebook" ""}/bin/ihaskell-notebook $out/bin/
|
||||
ln -s ${ihaskellJupyterCmdSh "nbconvert" ""}/bin/ihaskell-nbconvert $out/bin/
|
||||
ln -s ${ihaskellJupyterCmdSh "console" "--kernel=haskell"}/bin/ihaskell-console $out/bin/
|
||||
for prg in $out/bin"/"*;do
|
||||
if [[ -f $prg && -x $prg ]]; then
|
||||
wrapProgram $prg --set PYTHONPATH "$(echo ${jupyterlab}/lib/*/site-packages)"
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit haskellPackages;
|
||||
inherit ihaskellEnv;
|
||||
inherit jupyterlab;
|
||||
inherit ihaskellJupyterCmdSh;
|
||||
inherit ihaskellWrapperSh;
|
||||
ihaskellJsFile = ./. + "/html/kernel.js";
|
||||
ihaskellLogo64 = ./. + "/html/logo-64x64.svg";
|
||||
};
|
||||
}
|
||||
import (./release.nix) { inherit compiler jupyterlabAppDir nixpkgs packages pythonPackages rtsopts systemPackages; }
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
{ compiler ? "ghc865"
|
||||
, jupyterlabAppDir ? null
|
||||
, nixpkgs ? import <nixpkgs> {}
|
||||
, packages ? (_: [])
|
||||
, pythonPackages ? (_: [])
|
||||
, rtsopts ? "-M3g -N2"
|
||||
, systemPackages ? (_: [])
|
||||
}:
|
||||
import (./release.nix) { inherit compiler jupyterlabAppDir nixpkgs packages pythonPackages rtsopts systemPackages; }
|
||||
@ -1,4 +1,4 @@
|
||||
{ compiler ? "ghc881"
|
||||
{ compiler ? "ghc884"
|
||||
, jupyterlabAppDir ? null
|
||||
, nixpkgs ? import <nixpkgs> {}
|
||||
, packages ? (_: [])
|
||||
|
||||
@ -232,13 +232,12 @@ htmlSuggestions = concatMap toHtml
|
||||
[ named $ suggestion suggest
|
||||
, floating "left" $ styl severityClass "Found:" ++
|
||||
-- Things that look like this get highlighted.
|
||||
styleId "highlight-code" "haskell" (escapeDollar $ found suggest)
|
||||
styleId "highlight-code" "haskell" (found suggest)
|
||||
, floating "left" $ styl severityClass "Why Not:" ++
|
||||
-- Things that look like this get highlighted.
|
||||
styleId "highlight-code" "haskell" (escapeDollar $ whyNot suggest)
|
||||
styleId "highlight-code" "haskell" (whyNot suggest)
|
||||
]
|
||||
where
|
||||
escapeDollar = replace "$" "\\$"
|
||||
severityClass =
|
||||
case severity suggest of
|
||||
Error -> "error"
|
||||
|
||||
@ -455,7 +455,8 @@
|
||||
".suggestion-name {\n",
|
||||
"font-weight: bold;\n",
|
||||
"}\n",
|
||||
"</style><div style='background: rgb(247, 247, 247);'><form><textarea id='code'>class (Real a, Enum a) => Integral a where\n",
|
||||
"</style><div style='background: rgb(247, 247, 247);'><form><textarea id='code'>type Integral :: * -> Constraint\n",
|
||||
"class (Real a, Enum a) => Integral a where\n",
|
||||
" quot :: a -> a -> a\n",
|
||||
" rem :: a -> a -> a\n",
|
||||
" div :: a -> a -> a\n",
|
||||
@ -471,6 +472,7 @@
|
||||
"</textarea></form></div><script>CodeMirror.fromTextArea(document.getElementById('code'), {mode: 'haskell', readOnly: 'nocursor'});</script>"
|
||||
],
|
||||
"text/plain": [
|
||||
"type Integral :: * -> Constraint\n",
|
||||
"class (Real a, Enum a) => Integral a where\n",
|
||||
" quot :: a -> a -> a\n",
|
||||
" rem :: a -> a -> a\n",
|
||||
@ -894,18 +896,14 @@
|
||||
".suggestion-name {\n",
|
||||
"font-weight: bold;\n",
|
||||
"}\n",
|
||||
"</style><div class=\"suggestion-name\" style=\"clear:both;\">Redundant $</div><div class=\"suggestion-row\" style=\"float: left;\"><div class=\"suggestion-warning\">Found:</div><div class=\"highlight-code\" id=\"haskell\">f \\$ 3</div></div><div class=\"suggestion-row\" style=\"float: left;\"><div class=\"suggestion-warning\">Why Not:</div><div class=\"highlight-code\" id=\"haskell\">f 3</div></div><div class=\"suggestion-name\" style=\"clear:both;\">Redundant do</div><div class=\"suggestion-row\" style=\"float: left;\"><div class=\"suggestion-warning\">Found:</div><div class=\"highlight-code\" id=\"haskell\">do return 3</div></div><div class=\"suggestion-row\" style=\"float: left;\"><div class=\"suggestion-warning\">Why Not:</div><div class=\"highlight-code\" id=\"haskell\">return 3</div></div>"
|
||||
"</style><div class=\"suggestion-name\" style=\"clear:both;\">Redundant $</div><div class=\"suggestion-row\" style=\"float: left;\"><div class=\"suggestion-warning\">Found:</div><div class=\"highlight-code\" id=\"haskell\">f $ 3</div></div><div class=\"suggestion-row\" style=\"float: left;\"><div class=\"suggestion-warning\">Why Not:</div><div class=\"highlight-code\" id=\"haskell\">f 3</div></div>"
|
||||
],
|
||||
"text/plain": [
|
||||
"Line 7: Redundant $\n",
|
||||
"Found:\n",
|
||||
"f $ 3\n",
|
||||
"Why not:\n",
|
||||
"f 3Line 9: Redundant do\n",
|
||||
"Found:\n",
|
||||
"do return 3\n",
|
||||
"Why not:\n",
|
||||
"return 3"
|
||||
"f 3"
|
||||
]
|
||||
},
|
||||
"metadata": {},
|
||||
@ -919,15 +917,6 @@
|
||||
},
|
||||
"metadata": {},
|
||||
"output_type": "display_data"
|
||||
},
|
||||
{
|
||||
"data": {
|
||||
"text/plain": [
|
||||
"3"
|
||||
]
|
||||
},
|
||||
"metadata": {},
|
||||
"output_type": "display_data"
|
||||
}
|
||||
],
|
||||
"source": [
|
||||
@ -937,10 +926,7 @@
|
||||
"f x = x + 1\n",
|
||||
"\n",
|
||||
"-- Most warnings are orange...\n",
|
||||
"f $ 3\n",
|
||||
"\n",
|
||||
"do\n",
|
||||
" return 3"
|
||||
"f $ 3"
|
||||
]
|
||||
},
|
||||
{
|
||||
@ -1192,12 +1178,12 @@
|
||||
"evalue": "",
|
||||
"output_type": "error",
|
||||
"traceback": [
|
||||
"<interactive>:1:1: error: Variable not in scope: f :: Integer -> t"
|
||||
"<interactive>:1:1: error: Variable not in scope: f :: String -> t"
|
||||
]
|
||||
}
|
||||
],
|
||||
"source": [
|
||||
"f 3"
|
||||
"f \"hello\""
|
||||
]
|
||||
},
|
||||
{
|
||||
@ -1254,7 +1240,7 @@
|
||||
"mimetype": "text/x-haskell",
|
||||
"name": "haskell",
|
||||
"pygments_lexer": "Haskell",
|
||||
"version": "8.6.5"
|
||||
"version": "8.10.2"
|
||||
},
|
||||
"latex_envs": {
|
||||
"bibliofile": "biblio.bib",
|
||||
|
||||
@ -29,5 +29,5 @@ set -euo pipefail
|
||||
|
||||
$* --to=notebook --execute --allow-errors --stdout test/acceptance.nbconvert.in.ipynb > test/acceptance.nbconvert.out.ipynb
|
||||
|
||||
diff <(grep -v -e 'version' -e 'Line ' test/acceptance.nbconvert.in.ipynb) <(grep -v -e 'version' -e 'Line ' test/acceptance.nbconvert.out.ipynb)
|
||||
diff <(grep -v -e 'version' -e 'Line ' -e 'Integral' test/acceptance.nbconvert.in.ipynb) <(grep -v -e 'version' -e 'Line ' -e 'Integral' test/acceptance.nbconvert.out.ipynb)
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user