Merge pull request mirage#147 from mseri/fix-tests

Add support for python3 and fix tests

Author: mseri

.travis.yml

@@ -7,14 +7,17 @@ script: bash -ex .travis-docker.sh
 env:
     global:
         - DISTRO=debian-unstable
-        - PINS="rpclib.master:. rpclib-js.master:. rpclib-html.master:. rpclib-lwt.master:. rpclib-async.master:. ppx_deriving_rpc.master:."
+        - PINS="rpclib.dev:. rpclib-js.dev:. rpclib-html.dev:. rpclib-lwt.dev:. rpclib-async.dev:. ppx_deriving_rpc.dev:. rpc.dev:."
         - PACKAGE=rpc
     matrix:
-        - OCAML_VERSION=4.06.0 PRE_INSTALL_HOOK="sudo apt-get update -y; sudo apt-get install -y pylint pycodestyle"
+        - OCAML_VERSION=4.08.1 PRE_INSTALL_HOOK="sudo apt-get update -y; sudo apt-get install -y python pylint pycodestyle"
         # We install the packages required by the unit test for linting the generated Python code in PRE_INSTALL_HOOK:
-        - PACKAGE=rpclib OCAML_VERSION=4.06.0
-        - PACKAGE=ppx_deriving_rpc OCAML_VERSION=4.06.0
-        - OCAML_VERSION=4.05.0 PRE_INSTALL_HOOK="sudo apt-get update -y; sudo apt-get install -y pylint pycodestyle"
-        - OCAML_VERSION=4.04.2 PRE_INSTALL_HOOK="sudo apt-get update -y; sudo apt-get install -y pylint pycodestyle"
+        - PACKAGE=rpclib OCAML_VERSION=4.08.1
+        - PACKAGE=ppx_deriving_rpc OCAML_VERSION=4.08.1
+        - OCAML_VERSION=4.09.0 PRE_INSTALL_HOOK="sudo apt-get update -y; sudo apt-get install -y python pylint pycodestyle"
+        - OCAML_VERSION=4.07.1 PRE_INSTALL_HOOK="sudo apt-get update -y; sudo apt-get install -y python pylint pycodestyle"
+        - OCAML_VERSION=4.06.0 PRE_INSTALL_HOOK="sudo apt-get update -y; sudo apt-get install -y python pylint pycodestyle"
+        - OCAML_VERSION=4.05.0 PRE_INSTALL_HOOK="sudo apt-get update -y; sudo apt-get install -y python pylint pycodestyle"
+        - OCAML_VERSION=4.04.2 PRE_INSTALL_HOOK="sudo apt-get update -y; sudo apt-get install -y python pylint pycodestyle"
 matrix:
     fast_finish: true

CHANGES.md

@@ -1,3 +1,25 @@
+## dev
+* opam: updated bounds on a more conservative basis
+* travis: tests more compilers
+* tests: disable useless-object-inheritance on pylint checks
+* pythongen: generate python2-3 compatible bindings
+* Add ISC license
+* Incremented the upper bound for async's version.
+* Added lower bound for js_of_ocaml in related .opam file.
+* Fixed compilation issue with js_of_ocaml 3.5.0 and 3.5.1.
+* opam: remove the 'build' directive on dune dependency
+* opam: remove unnecessary flag
+* port to dune
+
+## 6.0.0 (November 2018)
+* Fix ppx_deriving_rpc for newer ppxlib
+* test_pythongen: ignore W504, it's breaking the internet and is pointless
+* Add more tests and documentation
+* ppx_deriving_rpc: Switch to ppxlib from ppx_deriving
+* Fix marshalling of optional named parameters
+* Add failing test of optional/unnamed args for rpcs
+* CA-291118: Register an exception printer for IDL errors
+
 ## 5.8.0 (June 2018)
 * rpclib:
   - New `Rpc.Types` variants for 3- and 4-tuples

ppx_deriving_rpc.opam

@@ -7,19 +7,19 @@ homepage: "https://github.com/mirage/ocaml-rpc"
 doc: "https://mirage.github.io/ocaml-rpc/ppx_deriving_rpc"
 bug-reports: "https://github.com/mirage/ocaml-rpc/issues"
 depends: [
-  "ocaml" {>= "4.03.0"}
-  "jbuilder" {build}
+  "ocaml" {>= "4.04.0"}
+  "dune" {>= "1.5.0"}
   "rpclib" {>= "5.0.0"}
   "rresult"
-  "ppxlib"
+  "ppxlib" {< "0.9.0"}
   "rpclib-lwt" {with-test & >= "5.0.0"}
   "rpclib-async" {with-test & >= "5.0.0"}
   "lwt" {with-test & >= "3.0.0"}
   "async" {with-test}
   "alcotest" {with-test}
 ]
 build: [
-  ["jbuilder" "build" "-p" name "-j" jobs]
-  ["jbuilder" "runtest" "-p" name "-j" jobs] {with-test}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 dev-repo: "git://github.com/mirage/ocaml-rpc"

rpc.opam

@@ -8,12 +8,12 @@ doc: "https://mirage.github.io/ocaml-rpc/rpc"
 bug-reports: "https://github.com/mirage/ocaml-rpc/issues"
 depends: [
   "ocaml" {>= "4.04.0"}
-  "dune" {>= "1.1.0"}
-  "rpclib" {>= "5.0.0"}
-  "rpclib-async" {>= "5.0.0"}
-  "rpclib-lwt" {>= "5.0.0"}
-  "ppx_deriving_rpc" {>= "5.0.0"}
-  "async" {>= "v0.9.0" & <= "v0.12.0"}
+  "dune" {>= "1.5.0"}
+  "rpclib" {=version}
+  "rpclib-async" {=version}
+  "rpclib-lwt" {=version}
+  "ppx_deriving_rpc" {=version}
+  "async" {>= "v0.9.0"}
   "lwt"
   "alcotest" {with-test}
   "alcotest-lwt" {with-test}

rpclib-async.opam

@@ -9,8 +9,8 @@ bug-reports: "https://github.com/mirage/ocaml-rpc/issues"
 depends: [
   "ocaml"
   "alcotest" {with-test}
-  "dune" {>= "1.1.0"}
-  "rpclib" {>= "5.0.0"}
+  "dune" {>= "1.5.0"}
+  "rpclib" {=version}
   "async"
 ]
 conflicts: [

rpclib-html.opam

@@ -9,8 +9,8 @@ doc: "https://mirage.github.io/ocaml-rpc/rpclib-html"
 bug-reports: "https://github.com/mirage/ocaml-rpc/issues"
 depends: [
   "ocaml"
-  "dune" {>= "1.1.0"}
-  "rpclib" {>= "5.0.0"}
+  "dune" {>= "1.5.0"}
+  "rpclib" {=version}
   "cow"
 ]
 build: ["dune" "build" "-p" name "-j" jobs]

rpclib-js.opam

@@ -8,8 +8,8 @@ doc: "https://mirage.github.io/ocaml-rpc/rpclib-js"
 bug-reports: "https://github.com/mirage/ocaml-rpc/issues"
 depends: [
   "ocaml"
-  "dune" {>= "1.1.0"}
-  "rpclib" {>= "5.0.0"}
+  "dune" {>= "1.5.0"}
+  "rpclib" {=version}
   "js_of_ocaml" {>= "3.5.0"}
   "js_of_ocaml-ppx" {>= "3.5.0"}
   "lwt"

rpclib-lwt.opam

@@ -9,8 +9,8 @@ bug-reports: "https://github.com/mirage/ocaml-rpc/issues"
 depends: [
   "ocaml"
   "alcotest" {with-test}
-  "dune" {>= "1.1.0"}
-  "rpclib" {>= "5.0.0"}
+  "dune" {>= "1.5.0"}
+  "rpclib" {=version}
   "lwt" {>= "3.0.0"}
   "alcotest-lwt" {with-test}
 ]

rpclib.opam

@@ -9,7 +9,7 @@ bug-reports: "https://github.com/mirage/ocaml-rpc/issues"
 depends: [
   "ocaml" {>= "4.04.0"}
   "alcotest" {with-test}
-  "dune" {>= "1.1.0"}
+  "dune" {>= "1.5.0"}
   "cmdliner"
   "rresult"
   "xmlm"

src/lib/pythongen.ml

@@ -93,6 +93,14 @@ class ListAction(argparse.Action):
         else:
             setattr(namespace, self.dest, {key: value})|}
 
+let compat_block = [
+  Line "if sys.version_info[0] > 2:"
+  ; Block [
+      Line "long = int"
+    ; Line "unicode = str"
+    ; Line "str = bytes"]
+  ; Line "" ]
+
 let reserved_exns =
   [ "Rpc_light_failure"
   ; "Unimplemented"
@@ -250,8 +258,8 @@ let rec typecheck : type a. a typ -> string -> t list =
 let rec value_of : type a. a typ -> string =
   let open Printf in
   function
-    | Basic Int64 -> "0L"
-    | Basic Int -> "0L"
+    | Basic Int64 -> "long(0)"
+    | Basic Int -> "long(0)"
     | Basic Int32 -> "0"
     | Basic Char -> "'c'"
     | Basic String -> {|"string"|}
@@ -386,7 +394,7 @@ let example_stub_user i (BoxedFunction m) =
                                 m.Method.name) )
                        (value_of a.Idl.Param.typedef.ty) )
                    Method.(find_inputs m.ty))))
-      ; Line "print (repr(results))" ] ]
+      ; Line "print(repr(results))" ] ]
 
 let example_skeleton_user i m =
   let open Printf in
@@ -619,7 +627,7 @@ let commandline_run _ (BoxedFunction m) =
             ; Line "use_json = 'json' in request and request['json']"
             ; Line
                 (sprintf "results = self.dispatcher.%s(request)" m.Method.name)
-            ; Line "print json.dumps(results)" ]
+            ; Line "print(json.dumps(results))" ]
         ; Line "except Exception as exn:"
         ; Block
             [ Line "if use_json:"
@@ -664,16 +672,19 @@ let of_interfaces ?(helpers= inline_defaults) i =
     in
     [Line "self._dispatcher_dict = {"] @ intersperse_commas methods @ [Line "}"]
   in
-  [ Line
-      (sprintf {|"""Bindings generated for interface %s by rpclib"""|}
+  [ Line (sprintf {|"""Bindings generated for interface %s by rpclib"""|}
          i.Interfaces.name)
   ; Line ""
+  ; Line "from __future__ import print_function, division"
+  ; Line ""
   ; Line "import argparse"
   ; Line "import json"
   ; Line "import logging"
   ; Line "import sys"
   ; Line "import traceback"
-  ; Line "" ]
+  ; Line ""
+  ]
+  @ compat_block
   @ (helpers |> String.split_on_char '\n' |> List.map (fun line -> Line line))
   @ ( try List.map exn_var i.Interfaces.error_decls |> List.flatten with e ->
         Printf.fprintf stderr "Error while generating exceptions of %s"