Skip to content

Commit

Permalink
v2.4.0-RC1 (#43)
Browse files Browse the repository at this point in the history
* getobservation optimization

* releasing 2.4.0RC1
  • Loading branch information
mantonovic authored Dec 12, 2019
1 parent b647da0 commit 58f053e
Show file tree
Hide file tree
Showing 874 changed files with 28 additions and 48,089 deletions.
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.2
2.4.0-RC1
20 changes: 11 additions & 9 deletions build.sh
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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/



18 changes: 12 additions & 6 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -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+
3 changes: 1 addition & 2 deletions debian/install
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -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/
3 changes: 2 additions & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
export PYBUILD_NAME=istsos

%:
dh $@ --with python2
dh $@ --with python3

Binary file removed docs/_build/doctrees/acquisition.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/dbschema.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/editobs.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/environment.pickle
Binary file not shown.
Binary file removed docs/_build/doctrees/examples.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/examples/describesensor.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed docs/_build/doctrees/examples/getobservation.doctree
Binary file not shown.
Binary file not shown.
Binary file removed docs/_build/doctrees/examples/istsos_wa.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/examples/registersensor.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/gcclass.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/getobs.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/index.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/insert.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/installation.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/intro.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/intro/sos.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/istsos.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/istsoslib/istsoslib.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed docs/_build/doctrees/istsoslib/modules.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/license.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/mapping.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/obclass.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/offering.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/quality.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/register.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/register_extra.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/security.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/services.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/status.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/tutorial.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/virtual.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/walib/modules.doctree
Binary file not shown.
Binary file not shown.
Binary file removed docs/_build/doctrees/walib/walib.admin.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/walib/walib.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/walib/walib.istsos.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed docs/_build/doctrees/wns.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/wnslib/modules.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/wnslib/wnslib.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed docs/_build/doctrees/workshop/dataaccess.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/workshop/database.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/workshop/datavalidation.doctree
Binary file not shown.
Binary file not shown.
Binary file removed docs/_build/doctrees/workshop/installation.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/workshop/instances.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/workshop/mapping.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/workshop/mqtt.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/workshop/offerings.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/workshop/registersensor.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed docs/_build/doctrees/ws_arduino.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/ws_dataaccess.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/ws_database.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/ws_datavalidation.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/ws_insertobservation.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/ws_installation.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/ws_instances.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/ws_mapping.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/ws_mqtt.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/ws_offerings.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/ws_registersensor.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/ws_troubleshooting.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/ws_virtualprocedures.doctree
Binary file not shown.
18 changes: 0 additions & 18 deletions lib__old/__init__.py

This file was deleted.

3 changes: 0 additions & 3 deletions lib__old/apscheduler/__init__.py

This file was deleted.

64 changes: 0 additions & 64 deletions lib__old/apscheduler/events.py

This file was deleted.

137 changes: 0 additions & 137 deletions lib__old/apscheduler/job.py

This file was deleted.

Empty file.
25 changes: 0 additions & 25 deletions lib__old/apscheduler/jobstores/base.py

This file was deleted.

Loading

0 comments on commit 58f053e

Please sign in to comment.