diff --git a/Makefile b/Makefile index 7bb3338..88e8ae2 100644 --- a/Makefile +++ b/Makefile @@ -6,13 +6,12 @@ run: venv python3 sensors test: venv/development - pytest --cov=. --cov-report=term + pytest --cov=. --cov-report=term sensors/ venv/development: test -d venv || python3 -m venv venv ( \ source venv/bin/activate; \ - pip3 install -e .; \ pip3 install -r requirements/development.txt; \ ) touch venv/development @@ -21,7 +20,7 @@ venv: test -d venv || python3 -m venv venv ( \ source venv/bin/activate; \ - pip3 install .; \ + pip3 install -r requirements/base.txt; \ ) venv/bin/activate: venv diff --git a/requirements/development.txt b/requirements/development.txt index 7521f23..660df3a 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -2,6 +2,7 @@ pytest pytest-cov +pytest-django pep8 rope pylint diff --git a/sensors/collector/models.py b/sensors/collector/models.py index b471c2f..f52d1fe 100644 --- a/sensors/collector/models.py +++ b/sensors/collector/models.py @@ -1,21 +1,21 @@ from django.db import models -# Create your models here. + class Time(models.Model): - value = DateTimeField() + value = models.DateTimeField() class Temperatur(models.Model): - time = ForeignKeyField(Time, backref='temperatures') - value = FloatField() + time = models.ForeignKey(Time, on_delete=models.CASCADE) + value = models.FloatField() class Humidity(models.Model): - time = ForeignKeyField(Time, backref='humidities') - value = FloatField() + time = models.ForeignKey(Time, on_delete=models.CASCADE) + value = models.FloatField() class Pressure(models.Model): - time = ForeignKeyField(Time, backref='pressures') - value = FloatField() + time = models.ForeignKey(Time, on_delete=models.CASCADE) + value = models.FloatField() diff --git a/sensors/collector/tests.py b/sensors/collector/tests.py index 7ce503c..e809ba3 100644 --- a/sensors/collector/tests.py +++ b/sensors/collector/tests.py @@ -1,3 +1,11 @@ +import pytest from django.test import TestCase -# Create your tests here. + +pytestmark=pytest.mark.django_db + + +def test_create_temperatur(): + time = models.Time.create(value=datetime.datetime.now) + temp = models.Temperatur.create(value=20.0, time=time) + assert False diff --git a/sensors/sensors/settings/base.py b/sensors/sensors/settings/base.py index 4e33c75..c922948 100644 --- a/sensors/sensors/settings/base.py +++ b/sensors/sensors/settings/base.py @@ -29,6 +29,7 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + 'collector.apps.CollectorConfig', ] MIDDLEWARE = [ diff --git a/sensors/sensors/urls.py b/sensors/sensors/urls.py index 3b94ca1..fafe8da 100644 --- a/sensors/sensors/urls.py +++ b/sensors/sensors/urls.py @@ -13,9 +13,7 @@ Including another URLconf 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ -from django.contrib import admin from django.urls import path urlpatterns = [ - path('admin/', admin.site.urls), ]