v2.4.0-RC1 (#43)

* getobservation optimization

* releasing 2.4.0RC1

Author: mantonovic

VERSION.txt

@@ -1 +1 @@
-2.3.2
+2.4.0-RC1

build.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
 
-# required 
+# required
+
+# Remove the x flag on install
+chmod -x debian/install
 
 # sudo apt-get install devscripts
 # sudo apt-get install debhelper
@@ -24,7 +27,6 @@ rsync -a interface/modules/requests/build/requests/* _build/istsos/interface/mod
 cp -r interface/modules/requests/src/xml _build/istsos/interface/modules/requests
 # rsync -a interface/modules/status/www/istsosStatus/* _build/istsos/interface/modules/status
 rsync -a --exclude=*.pyc istsoslib/* _build/istsos/istsoslib
-rsync -a --exclude=*.pyc lib/* _build/istsos/lib
 rsync -a --exclude=*.pyc scripts/* _build/istsos/scripts
 cp services/default.cfg.example  _build/istsos/services/default.cfg
 rsync -a --exclude=*.pyc walib/* _build/istsos/walib
@@ -51,16 +53,16 @@ cd ..
 mv python-istsos_$version-1_all.deb python-istsos_$version.deb
 
 mv istsos_$version.orig.tar.gz istsos-$version.tar.gz
-rm -rf istsos
+# rm -rf istsos
 
-cd ../docs
+# cd ../docs
 
-make html
-cd _build
-mv html v$version
-tar -zcvf istsos-$version.doc.tar.gz v$version
+# make html
+# cd _build
+# mv html v$version
+# tar -zcvf istsos-$version.doc.tar.gz v$version
 
-mv istsos-$version.doc.tar.gz ../../_build/
+# mv istsos-$version.doc.tar.gz ../../_build/
 
 
 

debian/control

@@ -3,9 +3,9 @@ Maintainer: Institute of Earth Science - SUPSI <[email protected]>
 Section: python
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               python-all-dev,
-               python,
-               python-setuptools,
+               python3-all-dev,
+               python3,
+               python3-setuptools,
                apache2,
                dh-python
 Standards-Version: 3.9.6
@@ -16,9 +16,15 @@ Homepage: http://istsos.org
 Package: python-istsos
 Architecture: all 
 Depends: ${misc:Depends},
-         apache2,
-         python-psycopg2,
-         libapache2-mod-wsgi
+         python3-dateutil,
+         python3-isodate,
+         python3-lxml,
+         python3-psycopg2,
+         python3-tz,
+         python3-requests,
+         python3-urllib3,
+         libapache2-mod-wsgi-py3,
+         apache2
 Recommends: postgis
 Description: Sensor Observation Service Data Management system
  IstSOS is an OGC Sensor Observation Service (SOS) server implementation

debian/copyright

@@ -4,5 +4,5 @@ Upstream-Contact: Institute of Earth Science - SUPSI <[email protected]>
 Source: http://istsos.org
 
 Files: *
-Copyright: 2015 istSOS contributors
+Copyright: 2019 istSOS contributors
 License: GPL-2+

debian/install

@@ -6,6 +6,5 @@ scripts /usr/share/istsos
 services /usr/share/istsos
 walib /usr/share/istsos
 wnslib /usr/share/istsos
-lib /usr/share/istsos
 logs /usr/share/istsos
-debian/istsos.conf /etc/apache2/sites-available/
+debian/istsos.conf /etc/apache2/sites-available/

debian/rules

@@ -3,4 +3,5 @@
 export PYBUILD_NAME=istsos
 
 %:
-	dh $@ --with python2
+	dh $@ --with python3
+