Merge pull request #1820 from boutproject/v4.2.3-rc

ZedThree · web-flow · commit 9ca15c37062c · 2019-10-23T20:53:39.000+01:00
V4.2.3 Release Candidate
diff --git a/.travis.yml b/.travis.yml
@@ -66,7 +66,6 @@ matrix:
       - *default_env
       - CONFIGURE_OPTIONS='--enable-shared --with-petsc --with-slepc'
       - SCRIPT_FLAGS="-uim -t python -t shared"
-      - PIP_PACKAGES='netcdf4 cython'
   - env:
       - *default_env
       - CONFIGURE_OPTIONS='--enable-openmp --with-petsc --with-slepc'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Change Log
 
+## [v4.2.3](https://github.com/boutproject/BOUT-dev/tree/v4.2.3) (2019-10-23)
+[Full Changelog](https://github.com/boutproject/BOUT-dev/compare/v4.2.2...v4.2.3)
+
+**Merged pull requests:**
+
+- Add counters to Timers to avoid double-counting sections [\#1817](https://github.com/boutproject/BOUT-dev/pull/1817) ([ZedThree](https://github.com/ZedThree))
+- Bugfix: cyclic parallel derivative inversion done in wrong space [\#1807](https://github.com/boutproject/BOUT-dev/pull/1807) ([ZedThree](https://github.com/ZedThree))
+- Add instructions for Ubuntu 16.04 [\#1690](https://github.com/boutproject/BOUT-dev/pull/1690) ([dschwoerer](https://github.com/dschwoerer))
+- Allow relative paths to be followed when making [\#1670](https://github.com/boutproject/BOUT-dev/pull/1670) ([johnomotani](https://github.com/johnomotani))
+- Update examples/staggered\_grid for v4.2 [\#1645](https://github.com/boutproject/BOUT-dev/pull/1645) ([johnomotani](https://github.com/johnomotani))
+- Add EXTRA\_LIBS to LIBS when searching for libraries [\#1632](https://github.com/boutproject/BOUT-dev/pull/1632) ([ZedThree](https://github.com/ZedThree))
+- Recent fixes/improvements for Travis into master [\#1627](https://github.com/boutproject/BOUT-dev/pull/1627) ([ZedThree](https://github.com/ZedThree))
+- Bug in calculation of ShiftAngle \(qloop\) [\#1626](https://github.com/boutproject/BOUT-dev/pull/1626) ([bendudson](https://github.com/bendudson))
+
 ## [v4.2.2](https://github.com/boutproject/BOUT-dev/tree/v4.2.2) (2019-02-27)
 
 [Full Changelog](https://github.com/boutproject/BOUT-dev/compare/v4.2.1...v4.2.2)
diff --git a/CITATION.cff b/CITATION.cff
@@ -142,11 +142,11 @@ authors:
 
   - family-names: Wang
     given-names: Zhanhui
-version: 4.2.2
-date-released: 2019-03-01
+version: 4.2.3
+date-released: 2019-10-23
 repository-code: https://github.com/boutproject/BOUT-dev
 url: http://boutproject.github.io/
-doi: 10.5281/zenodo.2579077
+doi: 10.5281/zenodo.3242507
 license: 'LGPL-3.0-or-later'
 references:
   - type: article
diff --git a/configure b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for BOUT++ 4.2.2.
+# Generated by GNU Autoconf 2.69 for BOUT++ 4.2.3.
 #
 # Report bugs to <bd512@york.ac.uk>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='BOUT++'
 PACKAGE_TARNAME='bout--'
-PACKAGE_VERSION='4.2.2'
-PACKAGE_STRING='BOUT++ 4.2.2'
+PACKAGE_VERSION='4.2.3'
+PACKAGE_STRING='BOUT++ 4.2.3'
 PACKAGE_BUGREPORT='bd512@york.ac.uk'
 PACKAGE_URL=''
 
@@ -1359,7 +1359,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures BOUT++ 4.2.2 to adapt to many kinds of systems.
+\`configure' configures BOUT++ 4.2.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1421,7 +1421,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of BOUT++ 4.2.2:";;
+     short | recursive ) echo "Configuration of BOUT++ 4.2.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1550,7 +1550,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-BOUT++ configure 4.2.2
+BOUT++ configure 4.2.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2131,7 +2131,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by BOUT++ $as_me 4.2.2, which was
+It was created by BOUT++ $as_me 4.2.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -12860,7 +12860,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by BOUT++ $as_me 4.2.2, which was
+This file was extended by BOUT++ $as_me 4.2.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12913,7 +12913,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-BOUT++ config.status 4.2.2
+BOUT++ config.status 4.2.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -14088,7 +14088,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by BOUT++ $as_me 4.2.2, which was
+This file was extended by BOUT++ $as_me 4.2.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14141,7 +14141,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-BOUT++ config.status 4.2.2
+BOUT++ config.status 4.2.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
@@ -32,7 +32,7 @@
 #
 
 AC_PREREQ([2.69])
-AC_INIT([BOUT++],[4.2.2],[bd512@york.ac.uk])
+AC_INIT([BOUT++],[4.2.3],[bd512@york.ac.uk])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/manual/doxygen/Doxyfile b/manual/doxygen/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = BOUT++
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 4.2.2
+PROJECT_NUMBER         = 4.2.3
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/manual/doxygen/Doxyfile_readthedocs b/manual/doxygen/Doxyfile_readthedocs
@@ -38,7 +38,7 @@ PROJECT_NAME           = BOUT++
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 4.2.2
+PROJECT_NUMBER         = 4.2.3
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/manual/sphinx/conf.py b/manual/sphinx/conf.py
@@ -133,7 +133,7 @@ def __getattr__(cls, name):
 # The short X.Y version.
 version = '4.2'
 # The full version, including alpha/beta/rc tags.
-release = '4.2.2'
+release = '4.2.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`#`
`33`	`33`
`34`	`34`	`AC_PREREQ([2.69])`
`35`		`-AC_INIT([BOUT++],[4.2.2],[bd512@york.ac.uk])`
	`35`	`+AC_INIT([BOUT++],[4.2.3],[bd512@york.ac.uk])`
`36`	`36`	`AC_CONFIG_AUX_DIR([build-aux])`
`37`	`37`	`AC_CONFIG_MACRO_DIR([m4])`
`38`	`38`