Drop the tabulate dependecy

runtimeverification · Jul 22, 2022 · 0c34de0 · 0c34de0
1 parent ab97716
commit 0c34de0
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 57 deletions.
diff --git a/haskell-backend/src/main/native/haskell-backend b/haskell-backend/src/main/native/haskell-backend
diff --git a/pyk/nix/overlay.nix b/pyk/nix/overlay.nix
@@ -1,8 +1,4 @@
 self: super: {
-  types-tabulate = self.callPackage ./packages/types-tabulate { };
-
-  tabulate = self.callPackage ./packages/tabulate { };
-
   graphviz = self.callPackage ./packages/graphviz { };
 
   pyk = self.callPackage ./packages/pyk { };

diff --git a/pyk/nix/packages/pyk/default.nix b/pyk/nix/packages/pyk/default.nix
@@ -2,15 +2,15 @@
 # If you run pynixify again, the file will be either overwritten or
 # deleted, and you will lose the changes you made to it.
 
-{ buildPythonPackage, fetchPypi, graphviz, lib, tabulate, types-tabulate }:
+{ buildPythonPackage, fetchPypi, graphviz, lib }:
 
 buildPythonPackage rec {
   pname = "pyk";
   version = "0.1.dev0";
 
   src = lib.cleanSource ../../..;
 
-  propagatedBuildInputs = [ graphviz tabulate types-tabulate ];
+  propagatedBuildInputs = [ graphviz ];
 
   # TODO FIXME
   doCheck = false;

diff --git a/pyk/nix/packages/tabulate/default.nix b/pyk/nix/packages/tabulate/default.nix
diff --git a/pyk/nix/packages/types-tabulate/default.nix b/pyk/nix/packages/types-tabulate/default.nix
diff --git a/pyk/requirements/base.txt b/pyk/requirements/base.txt
@@ -1,3 +1 @@
 graphviz==0.19.1
-tabulate==0.8.6
-types-tabulate==0.8.6
diff --git a/pyk/setup.cfg b/pyk/setup.cfg
@@ -9,8 +9,6 @@ package_dir =
     =src
 install_requires =
     graphviz == 0.19.1
-    tabulate == 0.8.6
-    types-tabulate == 0.8.6
 
 [options.package_data]
 * = py.typed
+1 −0		.gitignore
+241 −0		docs/2022-07-18-JSON-RPC-Server-API.md
+72 −40		flake.nix
+4 −1		kore/app/parser/Main.hs
+165 −1		kore/app/rpc/Main.hs
+2 −16		kore/app/share/GlobalMain.hs
+8 −0		kore/kore.cabal
+10 −0		kore/src/Kore/Error.hs
+7 −59		kore/src/Kore/Exec.hs
+187 −81		kore/src/Kore/JsonRpc.hs
+43 −0		kore/src/Kore/Log/JsonRpc.hs
+8 −0		kore/src/Kore/Options.hs
+2 −0		kore/src/Kore/Rewrite/SMT/Lemma.hs
+22 −59		kore/src/Kore/Simplify/Data.hs
+4 −0		kore/src/Kore/Syntax/Json.hs
+1 −0		kore/src/Log.hs
+243 −266		kore/src/SMT.hs
+14 −44		kore/test/Test/Kore.hs
+3 −4		kore/test/Test/Kore/Builtin/Bool.hs
+11 −19		kore/test/Test/Kore/Builtin/Builtin.hs
+2 −2		kore/test/Test/Kore/Builtin/KEqual.hs
+3 −3		kore/test/Test/Kore/Builtin/Map.hs
+2 −2		kore/test/Test/Kore/Builtin/Set.hs
+15 −40		kore/test/Test/Kore/Exec.hs
+1 −10		kore/test/Test/Kore/Reachability/MockAllPath.hs
+5 −6		kore/test/Test/Kore/Repl/Interpreter.hs
+1 −6		kore/test/Test/Kore/Rewrite.hs
+1 −1		kore/test/Test/Kore/Rewrite/Axiom/Matcher.hs
+1 −1		kore/test/Test/Kore/Rewrite/Axiom/Registry.hs
+1 −1		kore/test/Test/Kore/Rewrite/Function/Evaluator.hs
+2 −2		kore/test/Test/Kore/Rewrite/Function/Integration.hs
+1 −1		kore/test/Test/Kore/Rewrite/MockSymbols.hs
+0 −3		kore/test/Test/Kore/Rewrite/SMT/Evaluator.hs
+2 −2		kore/test/Test/Kore/Rewrite/SMT/Translate.hs
+6 −8		kore/test/Test/Kore/Simplify.hs
+3 −3		kore/test/Test/Kore/Simplify/IntegrationProperty.hs
+1 −2		kore/test/Test/Kore/Simplify/Overloading.hs
+1 −1		kore/test/Test/Kore/Simplify/TermLike.hs
+0 −1		kore/test/Test/Kore/Syntax/Json/Roundtrips.hs
+1 −2		kore/test/Test/Kore/Unification/Unifier.hs
+3 −4		kore/test/Test/SMT.hs
+8 −0		nix/kore-ghc8107.nix.d/kore.nix
+9 −0		nix/kore-ghc923.nix.d/kore.nix
+564 −564		test/regression-evm/test-addu48u48-definition.kore
+564 −564		test/regression-evm/test-dsvalue-peek-pass-rough-definition.kore
+552 −552		test/regression-evm/test-lemmas-definition.kore
+207 −207		test/regression-evm/test-lemmas-spec.kore
+560 −560		test/regression-evm/test-storagevar03-definition.kore
+563 −563		test/regression-evm/test-sum-to-n-definition.kore
+10 −10		test/regression-evm/test-sum-to-n-spec.kore
+560 −560		test/regression-evm/test-totalSupply-definition.kore
+51 −0		test/rpc-server/README.md
+17 −0		test/rpc-server/default.nix
+5,609 −0		test/rpc-server/execute/invalid-params/definition.kore
+3 −0		test/rpc-server/execute/invalid-params/params.json
+1 −0		test/rpc-server/execute/invalid-params/response.golden
+1 −0		test/rpc-server/execute/invalid-params/state.json
+5,609 −0		test/rpc-server/execute/step/definition.kore
+5 −0		test/rpc-server/execute/step/params.json
+1 −0		test/rpc-server/execute/step/response.golden
+466 −0		test/rpc-server/execute/step/state.json
+107 −0		test/rpc-server/execute/step/state.kore
+126 −0		test/rpc-server/runTests.py