Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package python-django-eremaea2 for 
openSUSE:Factory checked in at 2023-05-10 16:19:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-django-eremaea2 (Old)
 and      /work/SRC/openSUSE:Factory/.python-django-eremaea2.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-django-eremaea2"

Wed May 10 16:19:16 2023 rev:6 rq:1085863 version:2.0.18

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/python-django-eremaea2/python-django-eremaea2.changes
    2023-04-28 16:26:02.074943986 +0200
+++ 
/work/SRC/openSUSE:Factory/.python-django-eremaea2.new.1533/python-django-eremaea2.changes
  2023-05-10 16:19:17.499246993 +0200
@@ -1,0 +2,7 @@
+Sun May  7 09:18:42 UTC 2023 - Matwey Kornilov <[email protected]>
+
+- Version 2.0.18
+  - Drop Python 2.7 support
+- Drop python-django-eremaea2-no-six.patch: upstreamed
+
+-------------------------------------------------------------------

Old:
----
  django-eremaea2-2.0.17.tar.gz
  python-django-eremaea2-no-six.patch

New:
----
  django-eremaea2-2.0.18.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-django-eremaea2.spec ++++++
--- /var/tmp/diff_new_pack.HACjsE/_old  2023-05-10 16:19:18.059250305 +0200
+++ /var/tmp/diff_new_pack.HACjsE/_new  2023-05-10 16:19:18.067250353 +0200
@@ -18,14 +18,12 @@
 
 %define skip_python2 1
 Name:           python-django-eremaea2
-Version:        2.0.17
+Version:        2.0.18
 Release:        0
 Summary:        A simple Django application to store and show webcam snapshots
 License:        BSD-2-Clause
 URL:            https://github.com/matwey/django-eremaea2
 Source:         
https://files.pythonhosted.org/packages/source/d/django-eremaea2/django-eremaea2-%{version}.tar.gz
-# https://github.com/matwey/django-eremaea2/issues/14
-Patch0:         python-django-eremaea2-no-six.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 BuildRequires:  %{python_module Django >= 1.10}

++++++ django-eremaea2-2.0.17.tar.gz -> django-eremaea2-2.0.18.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/django-eremaea2-2.0.17/PKG-INFO 
new/django-eremaea2-2.0.18/PKG-INFO
--- old/django-eremaea2-2.0.17/PKG-INFO 2021-12-26 13:45:36.355461600 +0100
+++ new/django-eremaea2-2.0.18/PKG-INFO 2023-05-07 11:16:45.613148700 +0200
@@ -1,12 +1,11 @@
 Metadata-Version: 2.1
 Name: django-eremaea2
-Version: 2.0.17
+Version: 2.0.18
 Summary: A simple Django application to store and show webcam snapshots
 Home-page: https://github.com/matwey/django-eremaea2
 Author: Matwey V. Kornilov
 Author-email: [email protected]
 License: BSD-2-Clause
-Platform: UNKNOWN
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
 Classifier: Intended Audience :: Developers
@@ -93,5 +92,3 @@
 [Django]:https://www.djangoproject.com/
 [django-rest-framework]:http://www.django-rest-framework.org
 [dj-inmemorystorage]:https://pypi.python.org/pypi/dj-inmemorystorage
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/django-eremaea2-2.0.17/django_eremaea2.egg-info/PKG-INFO 
new/django-eremaea2-2.0.18/django_eremaea2.egg-info/PKG-INFO
--- old/django-eremaea2-2.0.17/django_eremaea2.egg-info/PKG-INFO        
2021-12-26 13:45:36.000000000 +0100
+++ new/django-eremaea2-2.0.18/django_eremaea2.egg-info/PKG-INFO        
2023-05-07 11:16:45.000000000 +0200
@@ -1,12 +1,11 @@
 Metadata-Version: 2.1
 Name: django-eremaea2
-Version: 2.0.17
+Version: 2.0.18
 Summary: A simple Django application to store and show webcam snapshots
 Home-page: https://github.com/matwey/django-eremaea2
 Author: Matwey V. Kornilov
 Author-email: [email protected]
 License: BSD-2-Clause
-Platform: UNKNOWN
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
 Classifier: Intended Audience :: Developers
@@ -93,5 +92,3 @@
 [Django]:https://www.djangoproject.com/
 [django-rest-framework]:http://www.django-rest-framework.org
 [dj-inmemorystorage]:https://pypi.python.org/pypi/dj-inmemorystorage
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/django-eremaea2-2.0.17/django_eremaea2.egg-info/SOURCES.txt 
new/django-eremaea2-2.0.18/django_eremaea2.egg-info/SOURCES.txt
--- old/django-eremaea2-2.0.17/django_eremaea2.egg-info/SOURCES.txt     
2021-12-26 13:45:36.000000000 +0100
+++ new/django-eremaea2-2.0.18/django_eremaea2.egg-info/SOURCES.txt     
2023-05-07 11:16:45.000000000 +0200
@@ -24,6 +24,7 @@
 eremaea/ctl/commandline.py
 eremaea/ctl/file.py
 eremaea/migrations/0001_initial.py
+eremaea/migrations/0002_drop_index_together.py
 eremaea/migrations/__init__.py
 tests/__init__.py
 tests/collection.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/django-eremaea2-2.0.17/django_eremaea2.egg-info/entry_points.txt 
new/django-eremaea2-2.0.18/django_eremaea2.egg-info/entry_points.txt
--- old/django-eremaea2-2.0.17/django_eremaea2.egg-info/entry_points.txt        
2021-12-26 13:45:36.000000000 +0100
+++ new/django-eremaea2-2.0.18/django_eremaea2.egg-info/entry_points.txt        
2023-05-07 11:16:45.000000000 +0200
@@ -1,3 +1,2 @@
 [console_scripts]
 eremaeactl = eremaea.ctl.commandline:execute_from_commandline
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/django-eremaea2-2.0.17/django_eremaea2.egg-info/requires.txt 
new/django-eremaea2-2.0.18/django_eremaea2.egg-info/requires.txt
--- old/django-eremaea2-2.0.17/django_eremaea2.egg-info/requires.txt    
2021-12-26 13:45:36.000000000 +0100
+++ new/django-eremaea2-2.0.18/django_eremaea2.egg-info/requires.txt    
2023-05-07 11:16:45.000000000 +0200
@@ -1,4 +1,6 @@
 Django
 djangorestframework
 requests
+requests_toolbelt
 cmdln
+python-magic
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/django-eremaea2-2.0.17/eremaea/ctl/file.py 
new/django-eremaea2-2.0.18/eremaea/ctl/file.py
--- old/django-eremaea2-2.0.17/eremaea/ctl/file.py      2021-12-26 
13:45:26.000000000 +0100
+++ new/django-eremaea2-2.0.18/eremaea/ctl/file.py      2023-05-07 
11:16:32.000000000 +0200
@@ -1,6 +1,5 @@
 from collections import namedtuple
-from six import Iterator
-from six.moves.urllib.parse import urlparse
+from urllib.parse import urlparse
 import os.path
 import mimetypes
 import requests
@@ -9,7 +8,7 @@
 
 File = namedtuple("File", ("name", "mimetype", "content"))
 
-class Stream(Iterator):
+class Stream:
        def __init__(self, url):
                self._url = url
 
@@ -21,7 +20,7 @@
 
 class LocalFileStream(Stream):
        def __init__(self, url):
-               super(LocalFileStream, self).__init__(url)
+               super().__init__(url)
 
        def __next__(self):
                with open(self._url, "rb") as f:
@@ -31,7 +30,7 @@
 
 class HTTPFileStream(Stream):
        def __init__(self, url):
-               super(HTTPFileStream, self).__init__(url)
+               super().__init__(url)
 
                parsed_url = urlparse(url)
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/django-eremaea2-2.0.17/eremaea/migrations/0002_drop_index_together.py 
new/django-eremaea2-2.0.18/eremaea/migrations/0002_drop_index_together.py
--- old/django-eremaea2-2.0.17/eremaea/migrations/0002_drop_index_together.py   
1970-01-01 01:00:00.000000000 +0100
+++ new/django-eremaea2-2.0.18/eremaea/migrations/0002_drop_index_together.py   
2023-05-07 11:16:32.000000000 +0200
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.1 on 2023-05-07 09:10
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('eremaea', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterIndexTogether(
+            name='snapshot',
+            index_together=set(),
+        ),
+    ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/django-eremaea2-2.0.17/eremaea/models.py 
new/django-eremaea2-2.0.18/eremaea/models.py
--- old/django-eremaea2-2.0.17/eremaea/models.py        2021-12-26 
13:45:26.000000000 +0100
+++ new/django-eremaea2-2.0.18/eremaea/models.py        2023-05-07 
11:16:32.000000000 +0200
@@ -81,7 +81,6 @@
                        pass
 
        class Meta:
-               index_together = ['collection', 'date', 'retention_policy']
                ordering = ['-date']
                get_latest_by = 'date'
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/django-eremaea2-2.0.17/eremaea/views.py 
new/django-eremaea2-2.0.18/eremaea/views.py
--- old/django-eremaea2-2.0.17/eremaea/views.py 2021-12-26 13:45:26.000000000 
+0100
+++ new/django-eremaea2-2.0.18/eremaea/views.py 2023-05-07 11:16:32.000000000 
+0200
@@ -23,7 +23,7 @@
                return Response(status=status.HTTP_201_CREATED)
 
 class CollectionViewSet(viewsets.ModelViewSet):
-       queryset = models.Collection.objects.all()
+       queryset = 
models.Collection.objects.select_related("default_retention_policy")
        serializer_class = serializers.CollectionSerializer
        lookup_field = 'name'
 
@@ -40,7 +40,7 @@
                return response
 
 class SnapshotViewSet(viewsets.ModelViewSet):
-       queryset = models.Snapshot.objects.all()
+       queryset = models.Snapshot.objects.select_related("collection", 
"retention_policy")
        serializer_class = serializers.SnapshotSerializer
        parser_classes = (FileUploadParser,)
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/django-eremaea2-2.0.17/setup.py 
new/django-eremaea2-2.0.18/setup.py
--- old/django-eremaea2-2.0.17/setup.py 2021-12-26 13:45:26.000000000 +0100
+++ new/django-eremaea2-2.0.18/setup.py 2023-05-07 11:16:32.000000000 +0200
@@ -9,7 +9,7 @@
 
 setup(
        name='django-eremaea2',
-       version='2.0.17',
+       version='2.0.18',
        packages=['eremaea','eremaea.ctl','eremaea.migrations'],
        entry_points={'console_scripts': [
                'eremaeactl = eremaea.ctl.commandline:execute_from_commandline',
@@ -38,6 +38,8 @@
                'Django',
                'djangorestframework',
                'requests',
+               'requests_toolbelt',
                'cmdln',
+               'python-magic',
        ]
 )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/django-eremaea2-2.0.17/tests/collection.py 
new/django-eremaea2-2.0.18/tests/collection.py
--- old/django-eremaea2-2.0.17/tests/collection.py      2021-12-26 
13:45:26.000000000 +0100
+++ new/django-eremaea2-2.0.18/tests/collection.py      2023-05-07 
11:16:32.000000000 +0200
@@ -7,7 +7,7 @@
 from rest_framework.test import APIClient
 from eremaea import models
 from datetime import timedelta
-from six.moves.urllib.parse import urlparse
+from urllib.parse import urlparse
 
 class CollectionTest(TestCase):
        def setUp(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/django-eremaea2-2.0.17/tests/snapshot.py 
new/django-eremaea2-2.0.18/tests/snapshot.py
--- old/django-eremaea2-2.0.17/tests/snapshot.py        2021-12-26 
13:45:26.000000000 +0100
+++ new/django-eremaea2-2.0.18/tests/snapshot.py        2023-05-07 
11:16:32.000000000 +0200
@@ -7,7 +7,7 @@
 from os.path import splitext
 from eremaea import models
 from datetime import timedelta
-from six.moves.urllib.parse import urlparse
+from urllib.parse import urlparse
 
 class SnapshotTest(TestCase):
        def setUp(self):
@@ -132,7 +132,7 @@
                url = reverse('snapshot-detail', args=[snapshot.id])
                response = self.client.get(url)
                link_hdr = response['Link']
-               self.assertEqual(link_hdr, '{0}; 
rel=alternate'.format(response.data['file']))
+               self.assertEqual(link_hdr, '{}; 
rel=alternate'.format(response.data['file']))
        def test_snapshot_head1(self):
                file = ContentFile(b"123")
                file.name = "file.jpg"

Reply via email to