Recent changes to Merge

Merge modified by Ulf Lorenz

Ulf Lorenz — Mon, 05 Oct 2020 17:49:40 -0000

--- v12
+++ v13
@@ -4,12 +4,8 @@
 * ensure that all new classes/functions are mirrored in the Python interface
     * unless tested by a demo or acceptance test, add a Python unit test to check the interface
 * ensure that all modifications to acceptance tests and/or demos are also mirrored in the corresponding Python tests/demos
-* Start from a clean repository (to notice files that were not committed)
-* for each compiler (right now, g++ and clang++ are relevant):
-    * check that the program builds without warnings and errors (do not use the Cotire option, this may mask missing dependencies!)
-    * check that all unit tests and demos pass (use "ctest")
-    * compile, test and install the Python bindings (needs installation of library first)
-    * run all Python demos
+* Start from a clean repository (to notice files that were not committed) and run the script tools/test_all.sh
+    * checks for g++, clang++ that everything builds and all tests run without errors
 * merge; fix conflicts
 * check tests again (unit tests, demos) unless the master was just fast-forwarded
 * remove feature branch locally and on server

Merge modified by Ulf Lorenz

Ulf Lorenz — Mon, 10 Feb 2020 18:29:40 -0000

--- v11
+++ v12
@@ -6,7 +6,7 @@
 * ensure that all modifications to acceptance tests and/or demos are also mirrored in the corresponding Python tests/demos
 * Start from a clean repository (to notice files that were not committed)
 * for each compiler (right now, g++ and clang++ are relevant):
-    * check that the program builds (do not use the Cotire option, this may mask missing dependencies!)
+    * check that the program builds without warnings and errors (do not use the Cotire option, this may mask missing dependencies!)
     * check that all unit tests and demos pass (use "ctest")
     * compile, test and install the Python bindings (needs installation of library first)
     * run all Python demos

Merge modified by Ulf Lorenz

Ulf Lorenz — Thu, 15 Aug 2019 21:27:36 -0000

--- v10
+++ v11
@@ -1,6 +1,8 @@
 What to do when merging a feature branch back to the master

 * Update the release notes
+* ensure that all new classes/functions are mirrored in the Python interface
+    * unless tested by a demo or acceptance test, add a Python unit test to check the interface
 * ensure that all modifications to acceptance tests and/or demos are also mirrored in the corresponding Python tests/demos
 * Start from a clean repository (to notice files that were not committed)
 * for each compiler (right now, g++ and clang++ are relevant):

Merge modified by Ulf Lorenz

Ulf Lorenz — Thu, 15 Aug 2019 21:26:40 -0000

--- v9
+++ v10
@@ -1,11 +1,13 @@
 What to do when merging a feature branch back to the master

 * Update the release notes
+* ensure that all modifications to acceptance tests and/or demos are also mirrored in the corresponding Python tests/demos
 * Start from a clean repository (to notice files that were not committed)
 * for each compiler (right now, g++ and clang++ are relevant):
     * check that the program builds (do not use the Cotire option, this may mask missing dependencies!)
     * check that all unit tests and demos pass (use "ctest")
-* check that python bindings work (g++ should be sufficient) by running all python demos
+    * compile, test and install the Python bindings (needs installation of library first)
+    * run all Python demos
 * merge; fix conflicts
 * check tests again (unit tests, demos) unless the master was just fast-forwarded
 * remove feature branch locally and on server

Merge modified by Ulf Lorenz

Ulf Lorenz — Tue, 08 Jan 2019 20:26:32 -0000

--- v8
+++ v9
@@ -5,6 +5,7 @@
 * for each compiler (right now, g++ and clang++ are relevant):
     * check that the program builds (do not use the Cotire option, this may mask missing dependencies!)
     * check that all unit tests and demos pass (use "ctest")
+* check that python bindings work (g++ should be sufficient) by running all python demos
 * merge; fix conflicts
 * check tests again (unit tests, demos) unless the master was just fast-forwarded
 * remove feature branch locally and on server

Merge modified by Ulf Lorenz

Ulf Lorenz — Mon, 24 Dec 2018 14:42:15 -0000

--- v7
+++ v8
@@ -1,5 +1,6 @@
 What to do when merging a feature branch back to the master

+* Update the release notes
 * Start from a clean repository (to notice files that were not committed)
 * for each compiler (right now, g++ and clang++ are relevant):
     * check that the program builds (do not use the Cotire option, this may mask missing dependencies!)

Merge modified by Ulf Lorenz

Ulf Lorenz — Sun, 30 Sep 2018 11:36:46 -0000

--- v6
+++ v7
@@ -1,5 +1,6 @@
 What to do when merging a feature branch back to the master

+* Start from a clean repository (to notice files that were not committed)
 * for each compiler (right now, g++ and clang++ are relevant):
     * check that the program builds (do not use the Cotire option, this may mask missing dependencies!)
     * check that all unit tests and demos pass (use "ctest")

Merge modified by Ulf Lorenz

Ulf Lorenz — Thu, 31 May 2018 18:42:09 -0000

--- v5
+++ v6
@@ -1,7 +1,7 @@
 What to do when merging a feature branch back to the master

 * for each compiler (right now, g++ and clang++ are relevant):
-    * check that the program builds
+    * check that the program builds (do not use the Cotire option, this may mask missing dependencies!)
     * check that all unit tests and demos pass (use "ctest")
 * merge; fix conflicts
 * check tests again (unit tests, demos) unless the master was just fast-forwarded

Merge modified by Ulf Lorenz

Ulf Lorenz — Thu, 10 May 2018 20:03:36 -0000

--- v4
+++ v5
@@ -2,8 +2,7 @@

 * for each compiler (right now, g++ and clang++ are relevant):
     * check that the program builds
-    * check that all unit tests pass
-    * check that all demos pass (requires [#98])
+    * check that all unit tests and demos pass (use "ctest")
 * merge; fix conflicts
 * check tests again (unit tests, demos) unless the master was just fast-forwarded
 * remove feature branch locally and on server

Merge modified by Ulf Lorenz

Ulf Lorenz — Sat, 09 Dec 2017 22:09:16 -0000

--- v3
+++ v4
@@ -4,9 +4,6 @@
     * check that the program builds
     * check that all unit tests pass
     * check that all demos pass (requires [#98])
-* run checkers on the code
-    * cppcheck to find potential problems (see tools/wavepacket.cppcheck for the configuration file)
-    * clang static analyzer (see tools/checkers.txt)
 * merge; fix conflicts
 * check tests again (unit tests, demos) unless the master was just fast-forwarded
 * remove feature branch locally and on server