Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocaml-ounit for openSUSE:Factory
checked in at 2022-04-06 21:51:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml-ounit (Old)
and /work/SRC/openSUSE:Factory/.ocaml-ounit.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-ounit"
Wed Apr 6 21:51:20 2022 rev:6 rq:967063 version:2.2.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocaml-ounit/ocaml-ounit.changes 2021-04-29
01:37:17.782484547 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-ounit.new.1900/ocaml-ounit.changes
2022-04-06 21:51:38.791460961 +0200
@@ -1,0 +2,6 @@
+Mon Apr 4 04:04:04 UTC 2022 - oher...@suse.de
+
+- Update to version 2.2.6
+ support for OCaml 5.0
+
+-------------------------------------------------------------------
Old:
----
ocaml-ounit-2.2.4.tar.xz
New:
----
ocaml-ounit-2.2.6.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocaml-ounit.spec ++++++
--- /var/tmp/diff_new_pack.8nfX55/_old 2022-04-06 21:51:39.279455392 +0200
+++ /var/tmp/diff_new_pack.8nfX55/_new 2022-04-06 21:51:39.279455392 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-ounit
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,18 +19,19 @@
%bcond_with ocaml_lwt
Name: ocaml-ounit
-Version: 2.2.4
+Version: 2.2.6
Release: 0
%{?ocaml_preserve_bytecode}
Summary: Ocaml OUnit test framework
License: MIT
Group: Development/Languages/OCaml
URL: https://opam.ocaml.org/packages/ounit
-Source0: %{name}-%{version}.tar.xz
+Source0: %name-%version.tar.xz
BuildRequires: ocaml
BuildRequires: ocaml-dune
-BuildRequires: ocaml-rpm-macros >= 20210121
+BuildRequires: ocaml-rpm-macros >= 20220222
BuildRequires: ocamlfind(bytes)
+BuildRequires: ocamlfind(seq)
BuildRequires: ocamlfind(stdlib-shims)
BuildRequires: ocamlfind(str)
BuildRequires: ocamlfind(threads)
@@ -47,12 +48,12 @@
frameworks.
%package devel
-Summary: Development files for %{name}
+Summary: Development files for %name
Group: Development/Languages/OCaml
-Requires: %{name} = %{version}
+Requires: %name = %version
%description devel
-Development files needed for application based on %{name}.
+Development files needed for application based on %name.
%prep
%autosetup -p1
@@ -67,15 +68,15 @@
%install
%ocaml_dune_install
-mkdir %{buildroot}$(ocamlc -where)/oUnit
+mkdir %buildroot$(ocamlc -where)/oUnit
cp -avt "$_" src/lib/oUnit/META
%ocaml_create_file_list
%check
%ocaml_dune_test
-%files -f %{name}.files
+%files -f %name.files
-%files devel -f %{name}.files.devel
+%files devel -f %name.files.devel
%changelog
++++++ _service ++++++
--- /var/tmp/diff_new_pack.8nfX55/_old 2022-04-06 21:51:39.307455072 +0200
+++ /var/tmp/diff_new_pack.8nfX55/_new 2022-04-06 21:51:39.311455026 +0200
@@ -1,7 +1,7 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="filename">ocaml-ounit</param>
- <param name="revision">faf4936b17507406c7592186dcaa3f25c6fc138a</param>
+ <param name="revision">77f01c482bd618eabde7c5065beae2d68db88723</param>
<param name="scm">git</param>
<param name="submodules">disable</param>
<param name="url">https://github.com/gildor478/ounit.git</param>
++++++ ocaml-ounit-2.2.4.tar.xz -> ocaml-ounit-2.2.6.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.4/.gitignore
new/ocaml-ounit-2.2.6/.gitignore
--- old/ocaml-ounit-2.2.4/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/ocaml-ounit-2.2.6/.gitignore 2022-02-08 19:14:15.000000000 +0100
@@ -0,0 +1,5 @@
+_build/
+*.merlin
+*.install
+*.swp
+/dist/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.4/CHANGES.md
new/ocaml-ounit-2.2.6/CHANGES.md
--- old/ocaml-ounit-2.2.4/CHANGES.md 2020-12-20 00:59:04.000000000 +0100
+++ new/ocaml-ounit-2.2.6/CHANGES.md 2022-02-08 19:14:15.000000000 +0100
@@ -1,3 +1,14 @@
+## v2.2.6 - 2022-02-08
+
+### Fixed
+- Use package seq to prepare for OCaml 5.00. Thanks to kit-ty-kate.
+
+## v2.2.5 - 2022-01-22
+
+### Fixed
+- Remove Thread.kill call, it was anyway not implemented and now it is
+ officially deprecated. (Closes: #85)
+
## v2.2.4 - 2020-12-20
### Fixed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.4/ounit-lwt.opam
new/ocaml-ounit-2.2.6/ounit-lwt.opam
--- old/ocaml-ounit-2.2.4/ounit-lwt.opam 2020-12-20 00:59:04.000000000
+0100
+++ new/ocaml-ounit-2.2.6/ounit-lwt.opam 2022-02-08 19:14:15.000000000
+0100
@@ -5,6 +5,7 @@
dev-repo: "git+https://github.com/gildor478/ounit.git";
bug-reports: "https://github.com/gildor478/ounit/issues";
doc: "https://gildor478.github.io/ounit/";
+license: "MIT"
depends: [
"ocamlfind" {build}
"ounit2-lwt" {= version}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.4/ounit.opam
new/ocaml-ounit-2.2.6/ounit.opam
--- old/ocaml-ounit-2.2.4/ounit.opam 2020-12-20 00:59:04.000000000 +0100
+++ new/ocaml-ounit-2.2.6/ounit.opam 2022-02-08 19:14:15.000000000 +0100
@@ -5,6 +5,7 @@
dev-repo: "git+https://github.com/gildor478/ounit.git";
bug-reports: "https://github.com/gildor478/ounit/issues";
doc: "https://gildor478.github.io/ounit/";
+license: "MIT"
depends: [
"ocamlfind" {build}
"ounit2" {= version}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.4/ounit2-lwt.opam
new/ocaml-ounit-2.2.6/ounit2-lwt.opam
--- old/ocaml-ounit-2.2.4/ounit2-lwt.opam 2020-12-20 00:59:04.000000000
+0100
+++ new/ocaml-ounit-2.2.6/ounit2-lwt.opam 2022-02-08 19:14:15.000000000
+0100
@@ -5,10 +5,12 @@
dev-repo: "git+https://github.com/gildor478/ounit.git";
bug-reports: "https://github.com/gildor478/ounit/issues";
doc: "https://gildor478.github.io/ounit/";
+license: "MIT"
depends: [
"ocaml" {>= "4.04.0"}
"dune" {>= "1.11.0"}
"lwt"
+ "seq"
"ounit2" {= version}
]
build: [
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.4/ounit2.opam
new/ocaml-ounit-2.2.6/ounit2.opam
--- old/ocaml-ounit-2.2.4/ounit2.opam 2020-12-20 00:59:04.000000000 +0100
+++ new/ocaml-ounit-2.2.6/ounit2.opam 2022-02-08 19:14:15.000000000 +0100
@@ -5,11 +5,13 @@
dev-repo: "git+https://github.com/gildor478/ounit.git";
bug-reports: "https://github.com/gildor478/ounit/issues";
doc: "https://gildor478.github.io/ounit/";
+license: "MIT"
depends: [
"ocaml" {>= "4.04.0"}
"dune" {>= "1.11.0"}
"base-bytes"
"base-unix"
+ "seq"
"stdlib-shims"
]
build: [
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.4/src/lib/ounit2/advanced/dune
new/ocaml-ounit-2.2.6/src/lib/ounit2/advanced/dune
--- old/ocaml-ounit-2.2.4/src/lib/ounit2/advanced/dune 2020-12-20
00:59:04.000000000 +0100
+++ new/ocaml-ounit-2.2.6/src/lib/ounit2/advanced/dune 2022-02-08
19:14:15.000000000 +0100
@@ -7,4 +7,4 @@
(name oUnitAdvanced)
(public_name ounit2.advanced)
(wrapped false)
- (libraries unix bytes stdlib-shims))
+ (libraries unix bytes seq stdlib-shims))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ocaml-ounit-2.2.4/src/lib/ounit2/advanced/oUnitAssert.ml
new/ocaml-ounit-2.2.6/src/lib/ounit2/advanced/oUnitAssert.ml
--- old/ocaml-ounit-2.2.4/src/lib/ounit2/advanced/oUnitAssert.ml
2020-12-20 00:59:04.000000000 +0100
+++ new/ocaml-ounit-2.2.6/src/lib/ounit2/advanced/oUnitAssert.ml
2022-02-08 19:14:15.000000000 +0100
@@ -50,6 +50,10 @@
let assert_string str =
if not (str = "") then assert_failure str
+(* TODO: Use Seq.forever from OCaml >= 4.14 *)
+let rec seq_forever f () =
+ Seq.Cons (f(), seq_forever f)
+
let assert_equal ?ctxt ?(cmp = ( = )) ?printer ?pp_diff ?msg expected actual =
let get_error_string () =
let res =
@@ -127,7 +131,7 @@
let assert_command
?(exit_code=Unix.WEXITED 0)
- ?(sinput=Stream.of_list [])
+ ?(sinput=Seq.empty)
?(foutput=ignore)
?(use_stderr=true)
?(backtrace=true)
@@ -267,7 +271,7 @@
let () =
(* Dump sinput into the process stdin *)
let buff = Bytes.make 1 ' ' in
- Stream.iter
+ Seq.iter
(fun c ->
let _i : int =
Bytes.set buff 0 c;
@@ -312,7 +316,7 @@
begin
let chn = open_in fn_out in
try
- foutput (Stream.of_channel chn)
+ foutput (seq_forever (fun () -> input_char chn))
with e ->
close_in chn;
raise e
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.4/src/lib/ounit2/dune
new/ocaml-ounit-2.2.6/src/lib/ounit2/dune
--- old/ocaml-ounit-2.2.4/src/lib/ounit2/dune 2020-12-20 00:59:04.000000000
+0100
+++ new/ocaml-ounit-2.2.6/src/lib/ounit2/dune 2022-02-08 19:14:15.000000000
+0100
@@ -2,7 +2,7 @@
(name oUnit)
(public_name ounit2)
(wrapped false)
- (libraries unix ounit2.advanced))
+ (libraries unix seq ounit2.advanced))
(documentation
(package ounit2)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.4/src/lib/ounit2/oUnit.mli
new/ocaml-ounit-2.2.6/src/lib/ounit2/oUnit.mli
--- old/ocaml-ounit-2.2.4/src/lib/ounit2/oUnit.mli 2020-12-20
00:59:04.000000000 +0100
+++ new/ocaml-ounit-2.2.6/src/lib/ounit2/oUnit.mli 2022-02-08
19:14:15.000000000 +0100
@@ -66,7 +66,7 @@
(** [assert_command prg args] Run the command provided.
@param exit_code expected exit code
- @param sinput provide this [char Stream.t] as input of the process
+ @param sinput provide this [char Seq.t] as input of the process
@param foutput run this function on output, it can contains an
[assert_equal] to check it
@param use_stderr redirect [stderr] to [stdout]
@@ -77,8 +77,8 @@
*)
val assert_command :
?exit_code:Unix.process_status ->
- ?sinput:char Stream.t ->
- ?foutput:(char Stream.t -> unit) ->
+ ?sinput:char Seq.t ->
+ ?foutput:(char Seq.t -> unit) ->
?use_stderr:bool ->
?env:string array ->
?verbose:bool ->
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-ounit-2.2.4/src/lib/ounit2/oUnit2.mli
new/ocaml-ounit-2.2.6/src/lib/ounit2/oUnit2.mli
--- old/ocaml-ounit-2.2.4/src/lib/ounit2/oUnit2.mli 2020-12-20
00:59:04.000000000 +0100
+++ new/ocaml-ounit-2.2.6/src/lib/ounit2/oUnit2.mli 2022-02-08
19:14:15.000000000 +0100
@@ -74,7 +74,7 @@
(** [assert_command prg args] Run the command provided.
@param exit_code expected exit code
- @param sinput provide this [char Stream.t] as input of the process
+ @param sinput provide this [char Seq.t] as input of the process
@param foutput run this function on output, it can contains an
[assert_equal] to check it
@param use_stderr redirect [stderr] to [stdout]
@@ -85,8 +85,8 @@
*)
val assert_command :
?exit_code:Unix.process_status ->
- ?sinput:char Stream.t ->
- ?foutput:(char Stream.t -> unit) ->
+ ?sinput:char Seq.t ->
+ ?foutput:(char Seq.t -> unit) ->
?use_stderr:bool ->
?backtrace:bool ->
?chdir:string ->
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ocaml-ounit-2.2.4/src/lib/ounit2/threads/oUnitRunnerThreads.ml
new/ocaml-ounit-2.2.6/src/lib/ounit2/threads/oUnitRunnerThreads.ml
--- old/ocaml-ounit-2.2.4/src/lib/ounit2/threads/oUnitRunnerThreads.ml
2020-12-20 00:59:04.000000000 +0100
+++ new/ocaml-ounit-2.2.6/src/lib/ounit2/threads/oUnitRunnerThreads.ml
2022-02-08 19:14:15.000000000 +0100
@@ -143,10 +143,9 @@
Mutex.lock worker_finished_mutex
done;
if not !worker_finished then begin
- (* This will fail... because probably not implemented. *)
- Thread.kill thread;
- worker_finished := true;
- Condition.broadcast worker_finished_cond
+ (* We should kill [thread] here but there seems to be no way to kill a
+ thread so we will just fail. *)
+ raise (Invalid_argument "Thread.kill not implemented")
end;
Mutex.unlock worker_finished_mutex
in
