diff --git a/vbos/datasets/admin.py b/vbos/datasets/admin.py index 673bc95..801eadb 100644 --- a/vbos/datasets/admin.py +++ b/vbos/datasets/admin.py @@ -8,8 +8,6 @@ from django.shortcuts import redirect, render, reverse from django.urls import path -from vbos.datasets.utils import GeoJSONProperties, clean_redundant_tabular_items - from .forms import CSVUploadForm, GeoJSONUploadForm from .models import ( AreaCouncil, @@ -23,7 +21,12 @@ VectorDataset, VectorItem, ) -from .utils import CSVRow, create_tabular_item +from .utils import ( + CSVRow, + GeoJSONProperties, + clean_redundant_tabular_items, + create_tabular_item, +) @admin.register(Cluster) diff --git a/vbos/datasets/test/test_vector_views.py b/vbos/datasets/test/test_vector_views.py index a7de891..b4eaf46 100644 --- a/vbos/datasets/test/test_vector_views.py +++ b/vbos/datasets/test/test_vector_views.py @@ -1,10 +1,9 @@ -from pickle import OBJ +from django.contrib.gis.geos import LineString, Point, Polygon +from django.urls import reverse from rest_framework import status from rest_framework.test import APITestCase -from django.urls import reverse -from django.contrib.gis.geos import Polygon, LineString, Point -from ..models import AreaCouncil, Province, VectorDataset, VectorItem, Cluster +from ..models import AreaCouncil, Cluster, Province, VectorDataset, VectorItem class TestVectorDatasetListDetailViews(APITestCase): diff --git a/vbos/users/admin.py b/vbos/users/admin.py index 1238fc7..ea654ad 100644 --- a/vbos/users/admin.py +++ b/vbos/users/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin from django.contrib.auth.admin import UserAdmin + from .models import User diff --git a/vbos/users/serializers.py b/vbos/users/serializers.py index 5e8ee69..b032ab5 100644 --- a/vbos/users/serializers.py +++ b/vbos/users/serializers.py @@ -1,9 +1,9 @@ from rest_framework import serializers + from .models import User class UserSerializer(serializers.ModelSerializer): - class Meta: model = User fields = ( @@ -16,7 +16,6 @@ class Meta: class CreateUserSerializer(serializers.ModelSerializer): - def create(self, validated_data): # call create_user on user object. Without this # the password will be stored in plain text. diff --git a/vbos/users/test/test_serializers.py b/vbos/users/test/test_serializers.py index 63b4155..b5efe59 100644 --- a/vbos/users/test/test_serializers.py +++ b/vbos/users/test/test_serializers.py @@ -1,14 +1,14 @@ -from django.test import TestCase -from django.forms.models import model_to_dict -from django.contrib.auth.hashers import check_password import pytest -from .factories import UserFactory +from django.contrib.auth.hashers import check_password +from django.forms.models import model_to_dict +from django.test import TestCase + from ..serializers import CreateUserSerializer +from .factories import UserFactory @pytest.mark.django_db class TestCreateUserSerializer(TestCase): - def setUp(self): self.user_data = model_to_dict(UserFactory.build()) diff --git a/vbos/users/test/test_views.py b/vbos/users/test/test_views.py index 0b9aef1..7cc8542 100644 --- a/vbos/users/test/test_views.py +++ b/vbos/users/test/test_views.py @@ -1,10 +1,11 @@ -from django.urls import reverse -from django.contrib.auth.hashers import check_password -from rest_framework.test import APITestCase -from rest_framework import status -from faker import Faker import factory import pytest +from django.contrib.auth.hashers import check_password +from django.urls import reverse +from faker import Faker +from rest_framework import status +from rest_framework.test import APITestCase + from ..models import User from .factories import UserFactory diff --git a/vbos/users/views.py b/vbos/users/views.py index ade65d8..19f9c1c 100644 --- a/vbos/users/views.py +++ b/vbos/users/views.py @@ -1,4 +1,5 @@ -from rest_framework import viewsets, mixins +from rest_framework import mixins, viewsets + from .models import User from .permissions import IsUserOrCreatingAccountOrReadOnly from .serializers import CreateUserSerializer, UserSerializer