Merge branch 'release/v1.0' into main

set version to "v1.0 (2021-10-27)"
prepared version placeholder
2021-10-27 10:30:48 +02:00 · 2021-10-27 10:30:22 +02:00 · 2021-10-27 10:27:32 +02:00 · 2021-10-27 10:02:12 +02:00 · 2021-10-26 23:28:42 +02:00 · 2021-10-17 15:47:16 +02:00
18 changed files with 38 additions and 17 deletions
--- a/1
+++ b/1
@@ -1,3 +1,4 @@
+# Version: v1.0 (2021-10-27)
 FROM nginx:alpine

 # set labels
--- a/nginx/default.conf
+++ b/nginx/default.conf
@@ -1,3 +1,4 @@
+# Version: v1.0 (2021-10-27)
 server {
    listen       80;
    listen  [::]:80;
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -1,4 +1,4 @@
-
+# Version: v1.0 (2021-10-27)
 user  nginx;
 worker_processes  1;

--- a/scripts/fetchEvents.sh
+++ b/scripts/fetchEvents.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# Version: v1.0 (2021-10-27)

 # get starting date
 # find gdate or date command ( OSX: brew install coreutils)
--- a/scripts/mkGeolocationTable.py
+++ b/scripts/mkGeolocationTable.py
@@ -12,6 +12,8 @@
    AJAX calls to the Nominatim service small, e. g. :
    curl -s "https://fdsnws.geophysik.ruhr-uni-bochum.de/fdsnws/event/1/query?minlat=50&maxlat=54&minlon=3&maxlon=10&minmag=1" | mkGeolocationTable.py > geolocationTable.js

+    Version: v1.0 (2021-10-27)
+
    License
    Copyright 2020-2021 Kasper D. Fischer <kasper.fischer@rub.de>

@@ -123,7 +125,7 @@ if __name__ == "__main__":

    # parse arguments
    import argparse
-    versionText = 'r20211017 (2021-10-17)'
+    versionText = 'v1.0 (2021-10-27)'
    parser = argparse.ArgumentParser(
        description='Reverse geocoding lookup of events in xml format (stdin).',
        epilog=versionText)
--- a/scripts/patchVersion.sh
+++ b/scripts/patchVersion.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+# version: v1.0 (2021-10-27)
+
+if [ $# -le 1 ] ; then
+    echo usage: ${0} version_string files ...
+    exit 0
+fi
+version="$1"
+shift
+files="$*"
+
+echo ${version} ${files}
+which sponge > /dev/null || ( echo "sponge util must be installed" ; exit 0 )
+
+for file in ${files}; do
+    sed "s/V\{5\}/${version}"/ ${file} | sponge ${file}
+done
--- a/wsgi/plotFDSN.py
+++ b/wsgi/plotFDSN.py
@@ -4,8 +4,7 @@
    Get waveform data from FDSN web service and create a fancy plot
    This programme runs as a script or as a WSGI application.

-    Subversion information:
-    $Id$
+    :version v1.0 (2021-10-27)

    :license
    Copyright 2020 Kasper Fischer <kasper.fischer@ruhr-uni-bochum.de>
@@ -379,8 +378,7 @@ if __name__ == "__main__":
        epilog=u'$Revision$ ($Date$, $Author$)'.replace(
            "$", ""))
    parser.add_argument(u'-v', u'-V', u'--version', action='version',
-                        version=u'$Revision$ ($Date$, \
-                                 $Author$)'.replace('$', ''))
+                        version=u'v1.0 (2021-10-27)')
    parser.add_argument(u'-u', u'--url', action='store', dest='server',
                        default=u'https://ariadne.geophysik.ruhr-uni-bochum.de',
                        help=u'Base URL of the FDSN web service (https://ariadne.geophysik.ruhr-uni-bochum.de).')
--- a/wsgi/showEnv.py
+++ b/wsgi/showEnv.py
@@ -7,6 +7,8 @@ def application(environ, start_response):
    :type start_response: function
    :return: response to be sent to the client by the wsgi server
    :rtype: list
+
+    :version: v1.0 (2021-10-27)
    """

    from cgi import FieldStorage
--- a/wsgi/traceDayplot.py
+++ b/wsgi/traceDayplot.py
@@ -3,8 +3,7 @@
 """
 Produce a dayplot from seismogram recordings

-Subversion information:
-$Id$
+version: v1.0 (2021-10-27)

 license: gpl3
 Copyright 2012-2020 Seismological Observatory, Ruhr-University Bochum
--- a/www/events.js
+++ b/www/events.js
@@ -19,7 +19,7 @@
 	You should have received a copy of the GNU General Public License along
 	with this program. If not, see http://www.gnu.org/licenses/.

-	Version r20211017.2 (2021-10-17)
+	Version v1.0 (2021-10-27)
 */

 /* adding row(s) to a table and format date strings afterwards */
--- a/www/events.js.en
+++ b/www/events.js.en
@@ -19,7 +19,7 @@
 	You should have received a copy of the GNU General Public License along
 	with this program. If not, see http://www.gnu.org/licenses/.

-	Version r20211017.2 (2021-10-17)
+	Version v1.0 (2021-10-27)
 */

 /* adding row(s) to a table and format date strings afterwards */
--- a/www/index.html.de
+++ b/www/index.html.de
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
-<!-- Version VVVVV -->
+<!-- Version v1.0 (2021-10-27) -->
 <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='de' lang='de'>
 <head>
 	<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
--- a/www/index.html.en
+++ b/www/index.html.en
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
-<!-- Version VVVVV -->
+<!-- Version v1.0 (2021-10-27) -->
 <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='de' lang='de'>
 <head>
 	<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
--- a/www/map.js
+++ b/www/map.js
@@ -19,7 +19,7 @@
 	You should have received a copy of the GNU General Public License along
 	with this program. If not, see https://www.gnu.org/licenses/.

-	Version VVVVV
+	Version v1.0 (2021-10-27)
 */

 /* add station marker */
--- a/www/map.js.en
+++ b/www/map.js.en
@@ -19,7 +19,7 @@
 	You should have received a copy of the GNU General Public License along
 	with this program. If not, see https://www.gnu.org/licenses/.

-	Version VVVVV
+	Version v1.0 (2021-10-27)
 */

 /* add station marker */
--- a/www/misc.js
+++ b/www/misc.js
@@ -19,7 +19,7 @@
 	You should have received a copy of the GNU General Public License along
 	with this program. If not, see http://www.gnu.org/licenses/.

-	Version VVVVV
+	Version v1.0 (2021-10-27)
 */

 /* calculate marker radius from magnitude
--- a/www/stations.js
+++ b/www/stations.js
@@ -19,7 +19,7 @@
 	You should have received a copy of the GNU General Public License along
 	with this program. If not, see http://www.gnu.org/licenses/.

-	Version r20211017.2 (2021-10-17)
+	Version v1.0 (2021-10-27)
 */

 /* Load the stations using ajax */
--- a/www/stations.js.en
+++ b/www/stations.js.en
@@ -19,7 +19,7 @@
 	You should have received a copy of the GNU General Public License along
 	with this program. If not, see http://www.gnu.org/licenses/.

-	Version r20211017.2 (2021-10-17)
+	Version v1.0 (2021-10-27)
 */

 /* Load the stations using ajax */
Author	SHA1	Message	Date
Kasper D. Fischer	86a65108cc	Merge branch 'release/v1.0' into main	2021-10-27 10:30:48 +02:00
Kasper D. Fischer	95fb75ef14	set version to "v1.0 (2021-10-27)"	2021-10-27 10:30:22 +02:00
Kasper D. Fischer	af7c6642ff	prepared version placeholder placeholder is "VVVVV" use patchVersion.sh to replace version for new release. Do not use this script in develop branch.	2021-10-27 10:27:32 +02:00
Kasper D. Fischer	8b2b58be05	removed -x option from shebang	2021-10-27 10:02:12 +02:00
Kasper D. Fischer	5455f182d7	adding script to patch version strings version strings are "VVVVV"	2021-10-26 23:28:42 +02:00
Kasper D. Fischer	a91616d003	Merge branch 'hotfix/r20211017.2' into main	2021-10-17 15:47:16 +02:00