Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions vbos/datasets/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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)
Expand Down
7 changes: 3 additions & 4 deletions vbos/datasets/test/test_vector_views.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
1 change: 1 addition & 0 deletions vbos/users/admin.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from django.contrib import admin
from django.contrib.auth.admin import UserAdmin

from .models import User


Expand Down
3 changes: 1 addition & 2 deletions vbos/users/serializers.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from rest_framework import serializers

from .models import User


class UserSerializer(serializers.ModelSerializer):

class Meta:
model = User
fields = (
Expand All @@ -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.
Expand Down
10 changes: 5 additions & 5 deletions vbos/users/test/test_serializers.py
Original file line number Diff line number Diff line change
@@ -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())

Expand Down
11 changes: 6 additions & 5 deletions vbos/users/test/test_views.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
3 changes: 2 additions & 1 deletion vbos/users/views.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down