diff options
| -rw-r--r-- | Docs/source/conf.py | 2 | ||||
| -rw-r--r-- | LICENSE.txt | 2 | ||||
| -rw-r--r-- | Python/setup.py | 2 | ||||
| -rwxr-xr-x | Tools/update_release.sh | 8 |
4 files changed, 10 insertions, 4 deletions
diff --git a/Docs/source/conf.py b/Docs/source/conf.py index b521093ec..65f29d543 100644 --- a/Docs/source/conf.py +++ b/Docs/source/conf.py @@ -66,7 +66,7 @@ author = 'WarpX collaboration' # built documents. # # The short X.Y version. -version = '20.03' +version = '20.04' # The full version, including alpha/beta/rc tags. release = '' diff --git a/LICENSE.txt b/LICENSE.txt index 8c3836eda..341907b4f 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -WarpX v20.03 Copyright (c) 2018, The Regents of the University of California, through Lawrence Berkeley National Laboratory, and Lawrence Livermore National Security, LLC, for the operation of Lawrence Livermore National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy). All rights reserved. +WarpX v20.04 Copyright (c) 2018, The Regents of the University of California, through Lawrence Berkeley National Laboratory, and Lawrence Livermore National Security, LLC, for the operation of Lawrence Livermore National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy). All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Python/setup.py b/Python/setup.py index 05d7e1c5b..b62f3f978 100644 --- a/Python/setup.py +++ b/Python/setup.py @@ -28,7 +28,7 @@ else: package_data = {} setup (name = 'pywarpx', - version = '20.03', + version = '20.04', packages = ['pywarpx'], package_dir = {'pywarpx':'pywarpx'}, description = """Wrapper of WarpX""", diff --git a/Tools/update_release.sh b/Tools/update_release.sh index 0b1dc60b9..23b3a2732 100755 --- a/Tools/update_release.sh +++ b/Tools/update_release.sh @@ -56,4 +56,10 @@ echo "" echo "WARNING: Remaining occurences of $old_release_number are listed below." echo " Is this expected? Or should these be updated too?" echo "" -git grep "$old_release_number" . +git grep "$old_release_number" . || echo "" +echo "In order to get a list of PRs merged since date <date>, you can run:" +echo "git log --since=<date> | grep -A 3 \"Author: \" | grep -B 1 \"\-\-\" | sed '/--/d' | sed -e 's/^ /- /'" +echo "where <date> is replaced by the date since last relate, say 2020-02-02" +# The actual command is below (commented), the one in echo above +# has escape characters for printing purpose. +# git log --since=<date> | grep -A 3 "Author: " | grep -B 1 "\-\-" | sed '/--/d' | sed -e 's/^ /- /' |