Skip to content

Commit c2c3bb9

Browse files
authored
Merge pull request #29 from tomvictor/release/data
major update to support Fastapi and django
2 parents 4a2020e + 26ca546 commit c2c3bb9

File tree

26 files changed

+127
-85
lines changed

26 files changed

+127
-85
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,5 @@ GitHub.sublime-settings
106106
.history
107107

108108

109-
.DS_Store
109+
.DS_Store
110+
goiotbackend-*

README.md

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# djangoiot - MQTT and IoT capabilities to Django Rest Framework.
1+
# iotcore - MQTT and IoT capabilities to Django Rest Framework and FastAPI.
22

33

44
Project under development. Apis can change often until stable.
@@ -23,8 +23,7 @@ Then add djangoiot to the django apps as below in the settings.py file of your p
2323
```python
2424
INSTALLED_APPS = [
2525
"Other Apps here",
26-
"django.contrib.staticfiles",
27-
"djangoiot"
26+
"iotcore.djangoiot"
2827
]
2928
```
3029

@@ -33,11 +32,37 @@ MQTT Port : 1883
3332
Websocket Port : 1882
3433
Stat Port: 8080
3534

35+
# Run Example project
36+
37+
```shell
38+
cd example
39+
pip install -r requirements.txt
40+
python manage.py runserver
41+
```
42+
Output
43+
44+
```shell
45+
System check identified no issues (0 silenced).
46+
August 25, 2023 - 07:14:33
47+
Django version 4.2.4, using settings 'develop.settings'
48+
Starting development server at http://127.0.0.1:8000/
49+
Quit the server with CONTROL-C.
50+
51+
Starting golang
52+
7:14AM INF added hook hook=allow-all-auth
53+
7:14AM INF attached listener address=:1883 id=t1 protocol=tcp
54+
7:14AM INF attached listener address=:1882 id=ws1 protocol=ws
55+
7:14AM INF attached listener address=:8080 id=stats protocol=http
56+
7:14AM INF mochi mqtt starting version=2.3.0
57+
7:14AM INF mochi mqtt server started
58+
59+
```
60+
3661
## Development
3762

3863
Use mage for development
3964

40-
```
65+
```shell
4166
mage
4267
Targets:
4368
bootstrap project

config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"pypackage": "djangoiot",
3-
"version": "0.0.7",
2+
"pypackage": "iotcore",
3+
"version": "0.0.10",
44
"gobinary": "goiotbackend"
55
}

djangoiot/apps.py

Lines changed: 0 additions & 45 deletions
This file was deleted.

example/run.py

Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"django.contrib.sessions",
3838
"django.contrib.messages",
3939
"django.contrib.staticfiles",
40-
"djangoiot"
40+
"iotcore.djangoiot"
4141
]
4242

4343
MIDDLEWARE = [

0 commit comments

Comments
 (0)