Skip to content

Commit

Permalink
Merge pull request #141 from onaio/version-0.2.0-b
Browse files Browse the repository at this point in the history
Version 0.2.0
  • Loading branch information
moshthepitt authored Oct 29, 2018
2 parents 067539f + 2a96821 commit c3ee4a3
Show file tree
Hide file tree
Showing 5 changed files with 75 additions and 71 deletions.
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ model-mommy = "*"
tblib = "*"

[packages]
"e1839a8" = {editable = true, path = "."}
"e1839a8" = {path = ".", editable = true}
future = "*"
133 changes: 69 additions & 64 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
install_requires=[
'Django >= 1.11, < 2.1',
'python-dateutil',
'djangorestframework', # Adds Serializers and API support
'markdown', # adds markdown support for browsable REST API
'django-filter < 2', # for filtering in the API
'djangorestframework-gis', # for location model
Expand Down
2 changes: 1 addition & 1 deletion tasking/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"""
from __future__ import unicode_literals

VERSION = (0, 1, 9)
VERSION = (0, 2, 0)
__version__ = '.'.join(str(v) for v in VERSION)
8 changes: 4 additions & 4 deletions tasking/serializers/location.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@
from __future__ import unicode_literals

import zipfile

from builtins import bytes # pylint: disable=redefined-builtin
from io import BytesIO

from django.contrib.gis.gdal import DataSource
from django.contrib.gis.geos import MultiPolygon, Point
from django.utils import six

from backports.tempfile import TemporaryDirectory
from django_countries import Countries
from future.builtins import bytes # pylint: disable=redefined-builtin
from rest_framework import serializers
from rest_framework_gis.serializers import GeometryField

from tasking.common_tags import (GEODETAILS_ONLY, GEOPOINT_MISSING,
RADIUS_MISSING)
from tasking.exceptions import (UnnecessaryFiles, MissingFiles,
ShapeFileNotFound)
from tasking.exceptions import (MissingFiles, ShapeFileNotFound,
UnnecessaryFiles)
from tasking.models import Location
from tasking.utils import get_shapefile

Expand Down

0 comments on commit c3ee4a3

Please sign in to comment.