Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

PYTHON_FLAKE8 corrected

Tony8ea2bcd186dc
diff --git a/wger/manager/migrations/0010_auto_20201111_2157.py b/wger/manager/migrations/0010_auto_20201111_2157.py
index 39cbc2fb6..91cfb0105 100644
--- a/wger/manager/migrations/0010_auto_20201111_2157.py
+++ b/wger/manager/migrations/0010_auto_20201111_2157.py
@@ -13,6 +13,9 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='setting',
name='rpe',
- field=models.DecimalField(blank=True, choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6), (7, 7), (8, 8), (9, 9), (10, 10)], decimal_places=1, default=5, max_digits=3, null=True, verbose_name='rpe'),
+ field=models.DecimalField(blank=True, choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5),
+ (6, 6), (7, 7), (8, 8), (9, 9),
+ (10, 10)], decimal_places=1, default=5,
+ max_digits=3, null=True, verbose_name='rpe'),
),
]
diff --git a/wger/manager/migrations/0011_auto_20201111_2201.py b/wger/manager/migrations/0011_auto_20201111_2201.py
index 3670a2bee..3126e4509 100644
--- a/wger/manager/migrations/0011_auto_20201111_2201.py
+++ b/wger/manager/migrations/0011_auto_20201111_2201.py
@@ -13,6 +13,10 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='setting',
name='rpe',
- field=models.DecimalField(blank=True, choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6), (7, 7), (7.5, 7.5), (8, 8), (8.5, 8.5), (9, 9), (9.5, 9.5), (10, 10)], decimal_places=1, default=5, max_digits=3, null=True, verbose_name='rpe'),
+ field=models.DecimalField(blank=True, choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5),
+ (6, 6), (7, 7), (7.5, 7.5), (8, 8),
+ (8.5, 8.5), (9, 9), (9.5, 9.5),
+ (10, 10)], decimal_places=1, default=5,
+ max_digits=3, null=True, verbose_name='rpe'),
),
]
diff --git a/wger/manager/tests/test_workout_canonical.py b/wger/manager/tests/test_workout_canonical.py
index 1eb6945ca..08b336522 100644
--- a/wger/manager/tests/test_workout_canonical.py
+++ b/wger/manager/tests/test_workout_canonical.py
@@ -131,7 +131,8 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):
'10 (15 kg, 5 RPE)'],
'weight_list': [Decimal(15)] * 4,
'setting_obj_list': [setting_2],
- 'setting_text': '4 \xd7 10 (15 kg, 5 RPE)',
+ 'setting_text': '4 \xd7 10 (15 kg, 5 RPE'
+ ')',
'repetition_units': [repetition_unit,
repetition_unit,
repetition_unit,