Compare commits

..

15 Commits

Author SHA1 Message Date
608f0ab931 travis only building on master branch 2019-02-06 14:32:53 +01:00
c445531989 fixing type of timestamp 2019-02-06 14:27:22 +01:00
00a35a6080 Adding Contributions to readme 2019-02-06 14:27:22 +01:00
f8d8878561 Coverage badge 2019-02-06 14:27:22 +01:00
f19b0a5b9b Adding vulnerabilities (snyk) badge to README 2019-02-06 14:27:22 +01:00
3c4c34bf1f Better Workaround for Snyk to find requirements.txt 2019-02-06 14:27:22 +01:00
0beeff5ddd Workaround for Snyk to find requirements.txt 2019-02-06 14:27:22 +01:00
a7035a11b3 Revert "Hotfix for the wrong timestamp type"
This reverts commit 04a8929a
2019-02-05 18:51:59 +01:00
8776579926 Revert "Build new contextbroker"
This reverts commit 93ff704d
2019-02-05 18:51:40 +01:00
859f16c218 Revert "Build new contextbroker"
This reverts commit eb72374f
2019-02-05 18:51:28 +01:00
eb72374f89 Build new contextbroker 2019-01-31 14:56:39 +01:00
93ff704df4 Build new contextbroker 2019-01-31 14:40:21 +01:00
04a8929a97 Hotfix for the wrong timestamp type 2019-01-25 15:15:01 +01:00
7c35afbb0c Test debian stretch+python3 (#18)
* changes starting with python3 explicit

* removes python modules which are not available for python3

* exchanges fyzz query parsing with rdflib functionality

* fixes interop tests

* replaces reduce with for loop in nodb driver

* simple python2 -> python3 conversions

* adds changes for handling different string handling in python3

* test stretch building with travis

* installing python-setuptools in docker

* installing python-setuptools in docker

* changing python2 to python3 in docker makefiles

* changing python2 to python3 and some other test changes

* push docker only in master branche

* running version of openmtc

* fix some port problems

* porting path library completly now

* restoring travis.yml

* testing new travis.yml

* add sudo

* updating travis OS from trusty to xenial

* upgrade pip before

* show running docker logs

* show more logs

* for debugging

* showlogs of docker after failure

* testing new travis.yml

* finish travis.yml
2019-01-18 14:13:03 +01:00
36d4e84059 Merge pull request #17 from OpenMTC/master
Update development branche to master
2019-01-18 13:47:25 +01:00
15 changed files with 16 additions and 40 deletions

View File

@ -1,6 +0,0 @@
# Contributors ordered by number of commits
Ronald Steinke <rst-fokus>
Christian Klopp <ckl-fokus>
Alexander Ortlieb <aor-fokus>
Jason Fox <jason-fox>

View File

@ -24,8 +24,6 @@ This project is part of [FIWARE](https://www.fiware.org/). For more information
check the FIWARE Catalogue entry for the
[IoT Agents](https://github.com/Fiware/catalogue/tree/master/iot-agents).
| :books: [Documentation](https://fiware-openmtc.readthedocs.io) | :page_facing_up: [Site](http://www.openmtc.org) | :whale: [Docker Hub](https://hub.docker.com/u/openmtc) | :dart: [Roadmap](roadmap.md) |
# Content
- [Install](#install)
@ -36,7 +34,7 @@ check the FIWARE Catalogue entry for the
- [License](#license)
## Install
## Install
Information about how to install the JSON IoTAgent can be found at the
corresponding section of the
@ -96,12 +94,12 @@ follows:
## Contributing
Contribution guidelines are detailed in the [CONTRIBUTIONS](CONTRIBUTIONS.md) file.
Contribution guidelines are detailed in the [CONTRIBUTIONS](https://github.com/OpenMTC/OpenMTC/blob/master/CONTRIBUTIONS.md) file.
## License
The OpenMTC SDK is licensed under the Eclipse Public License (EPL)
version 1.
© 2018-2019 OpenMTC
© 2018 OpenMTC

View File

@ -2,7 +2,7 @@
Transfer OpenMTC Data to an InfluxDB
"""
__version__ = "1.3.0"
__version__ = "1.2.0"
__description__ = "InfluxdbApp"
__author_name__ = "Christian Klopp"
__author_mail__ = "christian.klopp@fokus.fraunhofer.de"

View File

@ -3,7 +3,7 @@ This App will forward all incoming sensor traffic to the Fiware Orion Context
Broker
"""
__version__ = "1.3.0"
__version__ = "1.2.0"
__description__ = "OrionContextBroker"
__author_name__ = "Christian Klopp"
__author_mail__ = "christian.klopp@fokus.fraunhofer.de"

View File

@ -2,7 +2,7 @@
App to inject data from a csv file to OpenMTC
"""
__version__ = "1.3.0"
__version__ = "1.2.0"
__description__ = "csvInjector"
__author_name__ = "Christian Klopp"
__author_mail__ = "christian.klopp@fokus.fraunhofer.de"

View File

@ -2,7 +2,7 @@
TODO: Add description here
"""
__version__ = "1.3.0"
__version__ = "1.2.0"
__description__ = "mqttConnector"
__author_name__ = "Ronald Steinke"
__author_mail__ = "ronald.steinke@fokus.fraunhofer.de"

View File

@ -43,6 +43,6 @@ if __name__ == "__main__":
from openmtc_app.flask_runner import SimpleFlaskRunner as Runner
ep = "http://localhost:8000"
Runner(DataVisualization(poas=['http://localhost:21345'])).run(ep)
Runner(DataVisualization(), port=6050, host='auto').run(ep)

View File

@ -91,4 +91,4 @@ if __name__ == "__main__":
from openmtc_app.flask_runner import SimpleFlaskRunner as Runner
ep = "http://localhost:8000"
Runner(DataAggregation(poas=['http://localhost:21346'])).run(ep)
Runner(DataAggregation(), port=6050, host='auto').run(ep)

View File

@ -19,4 +19,4 @@ if __name__ == "__main__":
from openmtc_app.flask_runner import SimpleFlaskRunner as Runner
ep = "http://localhost:8000"
Runner(SimpleDecision2(poas=['http://localhost:21387'])).run(ep)
Runner(SimpleDecision2(), port=6050, host='auto').run(ep)

View File

@ -47,4 +47,4 @@ if __name__ == "__main__":
from openmtc_app.flask_runner import SimpleFlaskRunner as Runner
ep = "http://localhost:8000"
Runner(SimpleDecision(poas=['http://localhost:22245'])).run(ep)
Runner(SimpleDecision(), port=6050, host='auto').run(ep)

View File

@ -31,6 +31,5 @@ app_file=${app_array[$[${choice}-1]]}
################################################################################
# run app_file
cd ${base_path}
cd ..
. ../common/prep-env.sh
python3 ${app_file}
. ../../common/prep-env.sh
python ${app_file}

View File

@ -2,7 +2,7 @@
Interworking Proxy for Cul868 devices.
"""
__version__ = "1.3.0"
__version__ = "1.2.0"
__description__ = "The OpenMTC Cul868IPE"
__author_name__ = "Ronny Kreuch"
__author_mail__ = "ronny.kreuch@fokus.fraunhofer.de"

View File

@ -1,15 +0,0 @@
## Short Term
onem2m Release 2a compatibility
Group Resource
Pub/Sub improvements (rateLimit and batchNotify)
Persistence Enhancement
## Medium Term
onem2m Release 3 compatibility
Announcements
FlexContainer Resource
Node Resource
## Long Term
CoAP(s) & MQTTS
XML

View File

@ -13,7 +13,7 @@ from utils import (get_packages, OpenMTCSdist, OpenMTCBuildPy,
# name and version
SETUP_NAME = "openmtc-all"
SETUP_VERSION = "1.3.0"
SETUP_VERSION = "1.2.0"
SETUP_DESCRIPTION = "The OpenMTC Backend and Gateway (GEvent version)"
# meta

View File

@ -7,7 +7,7 @@ from utils import get_packages, OpenMTCSdist
# name and version
NAME = "sdk"
SETUP_NAME = "openmtc-" + NAME
SETUP_VERSION = "1.3.0"
SETUP_VERSION = "1.2.0"
SETUP_DESCRIPTION = "The OpenMTC Python SDK"
# meta