Skip to content

Commit

Permalink
Refresh (#12)
Browse files Browse the repository at this point in the history
* upgrade python-misfit

* refresh travis/tox matrix

* add docstrings and help_text to models

* add manage.py script

* migration for help_text additions

* change `ForeignKey with unique=True` to `OneToOneField`

* help_text clarifications
  • Loading branch information
brad authored and grokcode committed Nov 3, 2016
1 parent d41e590 commit 9704512
Show file tree
Hide file tree
Showing 7 changed files with 452 additions and 80 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ env:
# Avoid testing pypy on travis until the following issue is fixed:
# https://github.com/travis-ci/travis-ci/issues/4756
#- TOX_ENV=pypy-trunk
#- TOX_ENV=pypy-1.10.X
#- TOX_ENV=pypy-1.9.X
#- TOX_ENV=pypy-1.8.X
#- TOX_ENV=pypy-1.7.X
- TOX_ENV=py35-trunk
- TOX_ENV=py35-1.10.X
- TOX_ENV=py35-1.9.X
- TOX_ENV=py34-trunk
- TOX_ENV=py34-1.10.X
- TOX_ENV=py34-1.9.X
- TOX_ENV=py34-1.8.X
- TOX_ENV=py34-1.7.X
- TOX_ENV=py33-1.8.X
- TOX_ENV=py33-1.7.X
#- TOX_ENV=py27-trunk
- TOX_ENV=py27-trunk
- TOX_ENV=py27-1.10.X
- TOX_ENV=py27-1.9.X
- TOX_ENV=py27-1.8.X
- TOX_ENV=py27-1.7.X
install:
- pip install coveralls tox
script: tox -e $TOX_ENV
Expand Down
11 changes: 11 additions & 0 deletions manage.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/env python
import os
import sys


if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "test_settings")

from django.core.management import execute_from_command_line

execute_from_command_line(sys.argv)
252 changes: 252 additions & 0 deletions misfitapp/migrations/0005_help_text.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,252 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.3 on 2016-11-03 16:22
from __future__ import unicode_literals

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('misfitapp', '0004_increase_devicetype_maxlength'),
]

operations = [
migrations.AlterField(
model_name='device',
name='battery_level',
field=models.SmallIntegerField(help_text=b'Percentage battery remaining'),
),
migrations.AlterField(
model_name='device',
name='device_type',
field=models.CharField(help_text=b'The device type as a human readable string', max_length=64),
),
migrations.AlterField(
model_name='device',
name='firmware_version',
field=models.CharField(help_text=b"The version of the device's firmware", max_length=100),
),
migrations.AlterField(
model_name='device',
name='id',
field=models.CharField(help_text=b'The device ID assigned by Misfit', max_length=24, primary_key=True, serialize=False),
),
migrations.AlterField(
model_name='device',
name='last_sync_time',
field=models.DateTimeField(blank=True, help_text=b'Datetime the device was last synced', null=True),
),
migrations.AlterField(
model_name='device',
name='serial_number',
field=models.CharField(help_text=b"The device's serial number", max_length=100),
),
migrations.AlterField(
model_name='device',
name='user',
field=models.ForeignKey(help_text=b"The device's user", on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='goal',
name='date',
field=models.DateField(help_text=b'Date of the goal'),
),
migrations.AlterField(
model_name='goal',
name='id',
field=models.CharField(help_text=b'The goal ID assigned by Misfit', max_length=24, primary_key=True, serialize=False),
),
migrations.AlterField(
model_name='goal',
name='points',
field=models.FloatField(help_text=b'Progress points that the user achieved that day'),
),
migrations.AlterField(
model_name='goal',
name='target_points',
field=models.IntegerField(help_text=b'Target points for that day'),
),
migrations.AlterField(
model_name='goal',
name='time_zone_offset',
field=models.SmallIntegerField(default=0, help_text=b'Timezone offset from UTC'),
),
migrations.AlterField(
model_name='goal',
name='user',
field=models.ForeignKey(help_text=b"The goal's user", on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='misfituser',
name='access_token',
field=models.TextField(help_text=b'The OAuth access token'),
),
migrations.AlterField(
model_name='misfituser',
name='last_update',
field=models.DateTimeField(blank=True, help_text=b'The datetime when the misfit user was last updated (deprecated)', null=True),
),
migrations.AlterField(
model_name='misfituser',
name='misfit_user_id',
field=models.CharField(help_text=b'The Misfit user ID', max_length=24, primary_key=True, serialize=False),
),
migrations.AlterField(
model_name='misfituser',
name='user',
field=models.ForeignKey(help_text=b'The user', on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='profile',
name='avatar',
field=models.URLField(blank=True, help_text=b"URL to the profile's avatar", null=True),
),
migrations.AlterField(
model_name='profile',
name='birthday',
field=models.DateField(help_text=b"The user's birth date"),
),
migrations.AlterField(
model_name='profile',
name='email',
field=models.EmailField(blank=True, help_text=b'Email address', max_length=254, null=True),
),
migrations.AlterField(
model_name='profile',
name='gender',
field=models.CharField(choices=[(b'male', b'male'), (b'female', b'female')], help_text=b"The user's gender, one of: male, female", max_length=6),
),
migrations.AlterField(
model_name='profile',
name='name',
field=models.TextField(blank=True, help_text=b'The name on the profile', null=True),
),
migrations.AlterField(
model_name='profile',
name='user',
field=models.ForeignKey(help_text=b"The profile's user", on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, unique=True),
),
migrations.AlterField(
model_name='session',
name='activity_type',
field=models.CharField(choices=[(b'cycling', b'cycling'), (b'swimming', b'swimming'), (b'walking', b'walking'), (b'tennis', b'tennis'), (b'basketball', b'basketball'), (b'soccer', b'soccer')], help_text=b"The session's activity type, one of: cycling, swimming, walking, tennis, basketball, soccer", max_length=15),
),
migrations.AlterField(
model_name='session',
name='calories',
field=models.FloatField(help_text=b'Total calories user burned for the activity', null=True),
),
migrations.AlterField(
model_name='session',
name='distance',
field=models.FloatField(help_text=b'Total distance user covered for the activity, in miles', null=True),
),
migrations.AlterField(
model_name='session',
name='duration',
field=models.IntegerField(help_text=b'Length of the activity, in seconds'),
),
migrations.AlterField(
model_name='session',
name='id',
field=models.CharField(help_text=b'Session ID assigned by Misfit', max_length=24, primary_key=True, serialize=False),
),
migrations.AlterField(
model_name='session',
name='points',
field=models.FloatField(help_text=b'Total points user gained for the activity', null=True),
),
migrations.AlterField(
model_name='session',
name='start_time',
field=models.DateTimeField(help_text=b'Datetime the session started'),
),
migrations.AlterField(
model_name='session',
name='steps',
field=models.IntegerField(help_text=b'Total steps user took for the activity', null=True),
),
migrations.AlterField(
model_name='session',
name='user',
field=models.ForeignKey(help_text=b"The session's user", on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='sleep',
name='auto_detected',
field=models.BooleanField(default=True, help_text=b'Was the sleep session auto-detected?'),
),
migrations.AlterField(
model_name='sleep',
name='duration',
field=models.IntegerField(help_text=b'Duration of the sleep session, in seconds'),
),
migrations.AlterField(
model_name='sleep',
name='id',
field=models.CharField(help_text=b'The sleep ID assigned by Misfit', max_length=24, primary_key=True, serialize=False),
),
migrations.AlterField(
model_name='sleep',
name='start_time',
field=models.DateTimeField(help_text=b'Datetime the sleep session started'),
),
migrations.AlterField(
model_name='sleep',
name='user',
field=models.ForeignKey(help_text=b"The sleep session's user", on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='sleepsegment',
name='sleep',
field=models.ForeignKey(help_text=b"The segment's sleep session", on_delete=django.db.models.deletion.CASCADE, to='misfitapp.Sleep'),
),
migrations.AlterField(
model_name='sleepsegment',
name='sleep_type',
field=models.SmallIntegerField(choices=[(1, b'awake'), (2, b'sleep'), (3, b'deep sleep')], help_text=b"The sleep segment's type, one of: 1(awake), 2(sleep), 3(deep sleep)"),
),
migrations.AlterField(
model_name='sleepsegment',
name='time',
field=models.DateTimeField(help_text=b'The datetime of the segment'),
),
migrations.AlterField(
model_name='summary',
name='activity_calories',
field=models.FloatField(help_text=b'Activity calories for the day'),
),
migrations.AlterField(
model_name='summary',
name='calories',
field=models.FloatField(help_text=b'Calories for the day'),
),
migrations.AlterField(
model_name='summary',
name='date',
field=models.DateField(help_text=b'The date of the summary'),
),
migrations.AlterField(
model_name='summary',
name='distance',
field=models.FloatField(help_text=b'Distance traveled during the day, in miles'),
),
migrations.AlterField(
model_name='summary',
name='points',
field=models.FloatField(help_text=b'Points for the day'),
),
migrations.AlterField(
model_name='summary',
name='steps',
field=models.IntegerField(help_text=b'Steps for the day'),
),
migrations.AlterField(
model_name='summary',
name='user',
field=models.ForeignKey(help_text=b"The summary's user", on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
]
22 changes: 22 additions & 0 deletions misfitapp/migrations/0006_fkunique_to_onetoone
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.3 on 2016-11-03 16:26
from __future__ import unicode_literals

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('misfitapp', '0005_help_text'),
]

operations = [
migrations.AlterField(
model_name='profile',
name='user',
field=models.OneToOneField(help_text=b"The profile's user", on_delete=django.db.models.deletion.CASCADE, related_name='misfit_profile', to=settings.AUTH_USER_MODEL),
),
]
Loading

0 comments on commit 9704512

Please sign in to comment.