Hello community, here is the log from the commit of package python-Django1 for openSUSE:Factory checked in at 2019-03-29 20:37:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Django1 (Old) and /work/SRC/openSUSE:Factory/.python-Django1.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Django1" Fri Mar 29 20:37:23 2019 rev:10 rq:687915 version:1.11.20 Changes: -------- --- /work/SRC/openSUSE:Factory/python-Django1/python-Django1.changes 2019-03-01 16:46:50.409812396 +0100 +++ /work/SRC/openSUSE:Factory/.python-Django1.new.25356/python-Django1.changes 2019-03-29 20:37:25.194638483 +0100 @@ -1,0 +2,13 @@ +Sat Mar 23 16:31:46 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Add patch to build with PyYAML >5: + * pyyaml5.patch + +------------------------------------------------------------------- +Mon Mar 18 15:50:32 UTC 2019 - Thomas Bechtold <[email protected]> + +- Enable python3 build for python versions <= 3.7 + That's what in the support matrix from + https://docs.djangoproject.com/en/2.1/faq/install/#what-python-version-can-i-use-with-django + +------------------------------------------------------------------- New: ---- pyyaml5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Django1.spec ++++++ --- /var/tmp/diff_new_pack.qoZexE/_old 2019-03-29 20:37:26.298639098 +0100 +++ /var/tmp/diff_new_pack.qoZexE/_new 2019-03-29 20:37:26.302639100 +0100 @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define oldpython python -%if %{python3_version_nodots} > 34 +%if %{python3_version_nodots} > 37 %define skip_python3 1 %endif Name: python-Django1 @@ -33,6 +33,7 @@ Source2: %{name}.keyring Source99: python-Django1-rpmlintrc Patch0: django-sqlite-326.patch +Patch1: pyyaml5.patch BuildRequires: %{python_module Jinja2 >= 2.9.2} BuildRequires: %{python_module Pillow} BuildRequires: %{python_module PyYAML} @@ -90,6 +91,7 @@ %setup -q -n Django-%{version} %patch0 -p1 +%patch1 -p1 %build %python_build ++++++ pyyaml5.patch ++++++ >From a57c783dd4e6dc73847081221827a1902eede88b Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak <[email protected]> Date: Wed, 13 Mar 2019 20:06:47 +0100 Subject: [PATCH] Fixed serializers tests for PyYAML 5.1+. --- tests/serializers/test_yaml.py | 4 +++- tests/timezones/tests.py | 12 ++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/serializers/test_yaml.py b/tests/serializers/test_yaml.py index e876597e9d04..dbcbd57003f4 100644 --- a/tests/serializers/test_yaml.py +++ b/tests/serializers/test_yaml.py @@ -115,7 +115,9 @@ class YamlSerializerTestCase(SerializersTestBase, TestCase): author: %(author_pk)s headline: Poker has no place on ESPN pub_date: 2006-06-16 11:00:00 - categories: [%(first_category_pk)s, %(second_category_pk)s] + categories:""" + ( + ' [%(first_category_pk)s, %(second_category_pk)s]' if yaml.__version__ < '5.1' + else '\n - %(first_category_pk)s\n - %(second_category_pk)s') + """ meta_data: [] """ diff --git a/tests/timezones/tests.py b/tests/timezones/tests.py index e54b011c0426..7a63bac67000 100644 --- a/tests/timezones/tests.py +++ b/tests/timezones/tests.py @@ -643,7 +643,7 @@ def test_naive_datetime(self): self.assertEqual(obj.dt, dt) if not isinstance(serializers.get_serializer('yaml'), serializers.BadSerializer): - data = serializers.serialize('yaml', [Event(dt=dt)]) + data = serializers.serialize('yaml', [Event(dt=dt)], default_flow_style=None) self.assert_yaml_contains_datetime(data, "2011-09-01 13:20:30") obj = next(serializers.deserialize('yaml', data)).object self.assertEqual(obj.dt, dt) @@ -667,7 +667,7 @@ def test_naive_datetime_with_microsecond(self): self.assertEqual(obj.dt, dt) if not isinstance(serializers.get_serializer('yaml'), serializers.BadSerializer): - data = serializers.serialize('yaml', [Event(dt=dt)]) + data = serializers.serialize('yaml', [Event(dt=dt)], default_flow_style=None) self.assert_yaml_contains_datetime(data, "2011-09-01 13:20:30.405060") obj = next(serializers.deserialize('yaml', data)).object self.assertEqual(obj.dt, dt) @@ -691,7 +691,7 @@ def test_aware_datetime_with_microsecond(self): self.assertEqual(obj.dt, dt) if not isinstance(serializers.get_serializer('yaml'), serializers.BadSerializer): - data = serializers.serialize('yaml', [Event(dt=dt)]) + data = serializers.serialize('yaml', [Event(dt=dt)], default_flow_style=None) self.assert_yaml_contains_datetime(data, "2011-09-01 17:20:30.405060+07:00") obj = next(serializers.deserialize('yaml', data)).object self.assertEqual(obj.dt.replace(tzinfo=UTC), dt) @@ -715,7 +715,7 @@ def test_aware_datetime_in_utc(self): self.assertEqual(obj.dt, dt) if not isinstance(serializers.get_serializer('yaml'), serializers.BadSerializer): - data = serializers.serialize('yaml', [Event(dt=dt)]) + data = serializers.serialize('yaml', [Event(dt=dt)], default_flow_style=None) self.assert_yaml_contains_datetime(data, "2011-09-01 10:20:30+00:00") obj = next(serializers.deserialize('yaml', data)).object self.assertEqual(obj.dt.replace(tzinfo=UTC), dt) @@ -739,7 +739,7 @@ def test_aware_datetime_in_local_timezone(self): self.assertEqual(obj.dt, dt) if not isinstance(serializers.get_serializer('yaml'), serializers.BadSerializer): - data = serializers.serialize('yaml', [Event(dt=dt)]) + data = serializers.serialize('yaml', [Event(dt=dt)], default_flow_style=None) self.assert_yaml_contains_datetime(data, "2011-09-01 13:20:30+03:00") obj = next(serializers.deserialize('yaml', data)).object self.assertEqual(obj.dt.replace(tzinfo=UTC), dt) @@ -763,7 +763,7 @@ def test_aware_datetime_in_other_timezone(self): self.assertEqual(obj.dt, dt) if not isinstance(serializers.get_serializer('yaml'), serializers.BadSerializer): - data = serializers.serialize('yaml', [Event(dt=dt)]) + data = serializers.serialize('yaml', [Event(dt=dt)], default_flow_style=None) self.assert_yaml_contains_datetime(data, "2011-09-01 17:20:30+07:00") obj = next(serializers.deserialize('yaml', data)).object self.assertEqual(obj.dt.replace(tzinfo=UTC), dt)
