diff -Nru django-measurement-3.2.3/debian/changelog django-measurement-3.2.4/debian/changelog --- django-measurement-3.2.3/debian/changelog 2022-05-26 18:52:20.000000000 +0000 +++ django-measurement-3.2.4/debian/changelog 2022-11-26 08:50:34.000000000 +0000 @@ -1,3 +1,15 @@ +django-measurement (3.2.4-1) unstable; urgency=medium + + * Team Upload. + + [ Lena Voytek ] + * New upstream version 3.2.4 (Closes: #1013498) + + [ Debian Janitor ] + * Update standards version to 4.6.1, no changes needed. + + -- Nilesh Patra Sat, 26 Nov 2022 14:20:34 +0530 + django-measurement (3.2.3-2) unstable; urgency=medium * Bump debhelper from old 12 to 13. diff -Nru django-measurement-3.2.3/debian/control django-measurement-3.2.4/debian/control --- django-measurement-3.2.3/debian/control 2022-05-26 18:52:20.000000000 +0000 +++ django-measurement-3.2.4/debian/control 2022-11-26 08:49:48.000000000 +0000 @@ -16,7 +16,7 @@ python3-setuptools (>= 0.6b3), python3-setuptools-scm, python3-sphinx, -Standards-Version: 4.5.1 +Standards-Version: 4.6.1 Homepage: https://github.com/coddingtonbear/django-measurement Vcs-Git: https://salsa.debian.org/python-team/packages/python-django-measurement.git Vcs-Browser: https://salsa.debian.org/python-team/packages/python-django-measurement diff -Nru django-measurement-3.2.3/django_measurement/forms.py django-measurement-3.2.4/django_measurement/forms.py --- django-measurement-3.2.3/django_measurement/forms.py 2020-04-22 10:37:43.000000000 +0000 +++ django-measurement-3.2.4/django_measurement/forms.py 2022-02-28 08:21:13.000000000 +0000 @@ -63,10 +63,11 @@ self.measurement_class = measurement if not unit_choices: if issubclass(measurement, BidimensionalMeasure): - assert isinstance(bidimensional_separator, str), ( - "Supplied bidimensional_separator for %s must be of string/unicode type;" - " Instead got type %s" - % (measurement, str(type(bidimensional_separator)),) + assert isinstance( + bidimensional_separator, str + ), "Supplied bidimensional_separator for %s must be of string/unicode type;" " Instead got type %s" % ( + measurement, + str(type(bidimensional_separator)), ) unit_choices = tuple( ( diff -Nru django-measurement-3.2.3/django_measurement/models.py django-measurement-3.2.4/django_measurement/models.py --- django-measurement-3.2.3/django_measurement/models.py 2020-04-22 10:37:43.000000000 +0000 +++ django-measurement-3.2.4/django_measurement/models.py 2022-02-28 08:21:13.000000000 +0000 @@ -2,7 +2,7 @@ import warnings from django.db.models import FloatField -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from measurement import measures from measurement.base import BidimensionalMeasure, MeasureBase @@ -137,7 +137,11 @@ ) ) logger.warning(msg) - return get_measurement(measure=self.measurement, value=value, unit=return_unit,) + return get_measurement( + measure=self.measurement, + value=value, + unit=return_unit, + ) def formfield(self, **kwargs): defaults = {"form_class": forms.MeasurementField} diff -Nru django-measurement-3.2.3/.github/workflows/ci.yml django-measurement-3.2.4/.github/workflows/ci.yml --- django-measurement-3.2.3/.github/workflows/ci.yml 2020-04-22 10:37:43.000000000 +0000 +++ django-measurement-3.2.4/.github/workflows/ci.yml 2022-02-28 08:21:13.000000000 +0000 @@ -65,11 +65,14 @@ os: - ubuntu-latest python-version: + - 3.6 - 3.7 - 3.8 + - 3.9 django-version: - "2.2" - - "3.0" + - "3.1" + - "3.2" runs-on: ${{ matrix.os }} steps: - name: Set up Python ${{ matrix.python-version }} diff -Nru django-measurement-3.2.3/tests/models.py django-measurement-3.2.4/tests/models.py --- django-measurement-3.2.3/tests/models.py 2020-04-22 10:37:43.000000000 +0000 +++ django-measurement-3.2.4/tests/models.py 2022-02-28 08:21:13.000000000 +0000 @@ -79,14 +79,22 @@ ) measurement_custom_degree_per_time = MeasurementField( - measurement=DegreePerTime, blank=True, null=True, + measurement=DegreePerTime, + blank=True, + null=True, ) measurement_custom_temperature = MeasurementField( - measurement=Temperature, blank=True, null=True, + measurement=Temperature, + blank=True, + null=True, ) - measurement_custom_time = MeasurementField(measurement=Time, blank=True, null=True,) + measurement_custom_time = MeasurementField( + measurement=Time, + blank=True, + null=True, + ) def __str__(self): return self.measurement diff -Nru django-measurement-3.2.3/tests/test_fields.py django-measurement-3.2.4/tests/test_fields.py --- django-measurement-3.2.3/tests/test_fields.py 2020-04-22 10:37:43.000000000 +0000 +++ django-measurement-3.2.4/tests/test_fields.py 2022-02-28 08:21:13.000000000 +0000 @@ -75,7 +75,9 @@ def test_storage_and_retrieval_of_bidimensional_measurement(self): original_value = measures.Speed(mph=65) - MeasurementTestModel.objects.create(measurement_speed=original_value,) + MeasurementTestModel.objects.create( + measurement_speed=original_value, + ) retrieved = MeasurementTestModel.objects.get() @@ -88,7 +90,9 @@ def test_storage_and_retrieval_of_bidimensional_measurement_choice(self): original_value = measures.Speed(mph=65) - MeasurementTestModel.objects.create(measurement_speed_mph=original_value,) + MeasurementTestModel.objects.create( + measurement_speed_mph=original_value, + ) retrieved = MeasurementTestModel.objects.get() @@ -101,7 +105,9 @@ def test_storage_and_retrieval_of_measurement(self): original_value = measures.Weight(lb=124) - MeasurementTestModel.objects.create(measurement_weight=original_value,) + MeasurementTestModel.objects.create( + measurement_weight=original_value, + ) retrieved = MeasurementTestModel.objects.get() new_value = retrieved.measurement_weight @@ -113,7 +119,9 @@ def test_storage_and_retrieval_of_measurement_choice(self): original_value = measures.Distance(km=100) - MeasurementTestModel.objects.create(measurement_distance_km=original_value,) + MeasurementTestModel.objects.create( + measurement_distance_km=original_value, + ) retrieved = MeasurementTestModel.objects.get() new_value = retrieved.measurement_distance_km @@ -232,7 +240,8 @@ def test_float_casting(self, caplog): m = MeasurementTestModel( - measurement_distance=float(2000), measurement_distance_km=2, + measurement_distance=float(2000), + measurement_distance_km=2, ) m.full_clean()