Skip to content

Commit

Permalink
update docs and changelog for 3.1.0 release (engine-3.1)
Browse files Browse the repository at this point in the history
  • Loading branch information
nastasi-oq committed Jun 1, 2018
1 parent 9d2f86f commit 5e925bc
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 7 deletions.
4 changes: 4 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
python3-oq-engine (3.1.0-1~xenial01) xenial; urgency=low

[Marco Pagani and Changlong Li]
* Added a version of the Yu et al. (2013) GMPE supporting Mw

Expand Down Expand Up @@ -96,6 +98,8 @@
* Slight change to the correlation module to fix a bug in the SMTK
* Added a distribution mechanism `threadpool`

-- Matteo Nastasi (GEM Foundation) <[email protected]> Fri, 01 Jun 2018 09:02:01 +0000

python3-oq-engine (3.0.0-1~precise01) precise; urgency=low

[Michele Simionato]
Expand Down
2 changes: 1 addition & 1 deletion doc/installing/linux-generic.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Requirements are:

## Install packages from the OpenQuake website

Download the installer from https://downloads.openquake.org/pkgs/linux/oq-engine/openquake-setup-linux64-3.0.1-1.run using any browser
Download the installer from https://downloads.openquake.org/pkgs/linux/oq-engine/openquake-setup-linux64-3.1.0-1.run using any browser

From a terminal run

Expand Down
2 changes: 1 addition & 1 deletion doc/installing/macos.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Before you can start you must have downloaded and installed [Python 3.5](https:/

## Install packages from the OpenQuake website

Download the installer from https://downloads.openquake.org/pkgs/macos/oq-engine/openquake-setup-macos-3.0.1-2.run using any browser
Download the installer from https://downloads.openquake.org/pkgs/macos/oq-engine/openquake-setup-macos-3.1.0-1.run using any browser

From the Terminal app (or using iTerm) run

Expand Down
2 changes: 1 addition & 1 deletion doc/installing/windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Requirements are:

## Install or upgrade packages from the OpenQuake website

Download the installer from https://downloads.openquake.org/pkgs/windows/oq-engine/OpenQuake_Engine_3.0.1-1.exe using any browser and run the installer, then follow the wizard on screen.
Download the installer from https://downloads.openquake.org/pkgs/windows/oq-engine/OpenQuake_Engine_3.1.0-1.exe using any browser and run the installer, then follow the wizard on screen.

![installer-screenshot-1](../img/win-installer-1.png)
![installer-screenshot-2](../img/win-installer-2.png)
Expand Down
2 changes: 1 addition & 1 deletion helpers/post-divergence.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
usage () {
cat <<EOF
$0 <new-engine-stable-branch_(engine-2.x))>
$0 <new-engine-stable-branch_(engine-3.x))>
update documentation files and README.md with links related to the new stable engine branch name
$0 <-h|--help>
Expand Down
6 changes: 3 additions & 3 deletions helpers/pre-divergence.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,18 @@ fi

version_new="$1"

files="$(grep -ril 'engine.*2\.[0-9]\+\.[0-9]\+' doc/)"
files="$(grep -ril 'engine.*[23]\.[0-9]\+\.[0-9]\+' doc/)"
IFS='
'
for f in $files; do
url_lines="$(grep -ri 'engine.*2\.[0-9]\+\.[0-9]\+' $f)"
url_lines="$(grep -ri 'engine.*[23]\.[0-9]\+\.[0-9]\+' $f)"
for url_line in $url_lines; do
echo "UL: $url_line"
url="$(echo "$url_line" | sed 's/.*\(http[^ ]\+\) .*/\1/g')"
echo "U: [$url]"
fex="$(echo "$url" | sed 's@.*/@@g')"
echo "FEX: [$fex]"
fex_new="$(echo "$fex" | sed "s/2\.[0-9]\+\.[0-9]\+/$version_new/g")"
fex_new="$(echo "$fex" | sed "s/[23]\.[0-9]\+\.[0-9]\+/$version_new/g")"
echo "FNW: [$fex_new]"
fex_esc="$(echo "$fex" | sed 's/\./\\./g')"
sed -i "s/$fex_esc/$fex_new/g" $f
Expand Down

0 comments on commit 5e925bc

Please sign in to comment.