Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-django-silk for openSUSE:Factory checked in at 2021-12-26 13:30:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-django-silk (Old) and /work/SRC/openSUSE:Factory/.python-django-silk.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-django-silk" Sun Dec 26 13:30:35 2021 rev:9 rq:942584 version:4.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-django-silk/python-django-silk.changes 2021-12-02 22:31:43.922337257 +0100 +++ /work/SRC/openSUSE:Factory/.python-django-silk.new.2520/python-django-silk.changes 2021-12-26 13:30:55.274976723 +0100 @@ -1,0 +2,40 @@ +Sun Dec 26 09:52:54 UTC 2021 - John Vandenberg <[email protected]> + +- Replace no-longer necessary _service with PyPI tarball +- Add 2610f91.patch to fix a test incompatibility with Django 4. +- Tidy build dependencies and remove unnecessary Pygments dep. +- Upgrade to v4.2.0 + * Passed wsgi request to SILKY_PYTHON_PROFILER_FUNC + * Added Django 3.1 & 3.2 to test matrix + * Replace url with re_path for Django 4.0 + * Do not crash when silk app is not included in urls + * Add the SILKY_JSON_ENSURE_ASCII configuration item to support + Chinese + * Add row view for requests page + * RequestModelFactory: fallback if request body too large + * Add query execution plan to sql_detail + * Add Python 3.9 compatibility + * Replace re_path with path + * Fix transaction error for mysql + * parse query when count joins to match only Keyword + * fix: DB connection to ClearDB when multiple databases + * fix: DataCollector sql_queries model not found on + filter(request=self.request) + * Generate missing row.css from sass + * Filter null values from most time overall summary + * Ensure sorting between longest requests + * Filter null values from most db time summary + * Ensure sorting between most db time requests + * Temporary fix for testing Django 2.2 + * Fix egg metadata error + * Fixed a bug that the profile tab could not be opened + when the source code contains Japanese + * fix incorrectly made decorator + * Ensure sorting between most db queries requests + * Add tests that access the actual DB + * remove python 2 style codes from across the codebase + * Fix broken test on Windows 10 (SQLite) + * Remove Make Migrations + * Add Python 3.10 compatibility + +------------------------------------------------------------------- Old: ---- _service _servicedata django-silk-4.1.0.tar.gz New: ---- 2610f91.patch django-silk-4.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-django-silk.spec ++++++ --- /var/tmp/diff_new_pack.XveGTg/_old 2021-12-26 13:30:55.778977074 +0100 +++ /var/tmp/diff_new_pack.XveGTg/_new 2021-12-26 13:30:55.782977077 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-django-silk # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,27 +18,16 @@ %define skip_python2 1 %define skip_python36 1 -# Python 3.9 is supported by next release -%define skip_python39 1 Name: python-django-silk -Version: 4.1.0 +Version: 4.2.0 Release: 0 Summary: Profiling for the Django Framework License: MIT URL: https://github.com/jazzband/django-silk -Source: django-silk-%{version}.tar.gz -BuildRequires: %{python_module Django >= 2.2} -BuildRequires: %{python_module Jinja2 >= 2.8} -BuildRequires: %{python_module Pillow >= 3.2} -BuildRequires: %{python_module Pygments >= 2.0} -BuildRequires: %{python_module autopep8 >= 1.2.1} -BuildRequires: %{python_module gprof2dot >= 2017.09.19} -BuildRequires: %{python_module python-dateutil >= 2.4} -BuildRequires: %{python_module pytz > 2014.2} -BuildRequires: %{python_module requests >= 2.10} +Source: https://files.pythonhosted.org/packages/source/d/django-silk/django-silk-%{version}.tar.gz +Patch0: https://github.com/jazzband/django-silk/commit/2610f91.patch BuildRequires: %{python_module setuptools_scm} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module sqlparse >= 0.1.19} BuildRequires: fdupes BuildRequires: git-core BuildRequires: python-rpm-macros @@ -54,15 +43,24 @@ Requires: python-sqlparse >= 0.1.19 BuildArch: noarch # SECTION test requirements +BuildRequires: %{python_module Django >= 2.2} +BuildRequires: %{python_module Jinja2 >= 2.8} +BuildRequires: %{python_module Pillow >= 3.2} +BuildRequires: %{python_module autopep8 >= 1.2.1} BuildRequires: %{python_module contextlib2 >= 0.5.5} BuildRequires: %{python_module factory_boy >= 2.8.1} BuildRequires: %{python_module freezegun} +BuildRequires: %{python_module gprof2dot >= 2017.09.19} BuildRequires: %{python_module mock} BuildRequires: %{python_module networkx >= 1.11} BuildRequires: %{python_module pydotplus >= 2.0.2} BuildRequires: %{python_module pydot} +BuildRequires: %{python_module python-dateutil >= 2.4} +BuildRequires: %{python_module pytz > 2014.2} +BuildRequires: %{python_module requests >= 2.10} BuildRequires: %{python_module simplejson >= 3.13.2} BuildRequires: %{python_module six >= 1.11.0} +BuildRequires: %{python_module sqlparse >= 0.1.19} # /SECTION %python_subpackages @@ -71,6 +69,9 @@ %prep %setup -q -n django-silk-%{version} +%patch0 -p1 +# see https://github.com/jazzband/django-silk/pull/532 +sed -i '/Pygments/d' setup.py chmod a-x silk/static/silk/lib/* %build @@ -82,16 +83,15 @@ %check cd project -export DB=sqlite3 DB_NAME=db.sqlite3 -%{python_expand rm -f db.sqlite3 +export DB_ENGINE=sqlite3 DB_NAME=":memory:DB=sqlite3" +%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib} $python manage.py migrate --noinput -$python manage.py test --noinput +$python manage.py test --noinput -v2 } -# DB=mysql DB_NAME=mysql_db %files %{python_files} %doc README.md %license LICENSE -%{python_sitelib}/* +%{python_sitelib}/*silk*/ %changelog ++++++ 2610f91.patch ++++++ >From 2610f9162e5e6a05bd4b2cb8136e72d23110399b Mon Sep 17 00:00:00 2001 From: Hasan Ramezani <[email protected]> Date: Thu, 25 Nov 2021 00:28:03 +0100 Subject: [PATCH] Django main (#528) * Fix failing test in Django main * Remove extra setting that causes RemovedInDjango50Warning * Repace logger.warn with logger.warning --- project/project/settings.py | 2 -- project/tests/urlconf_without_silk.py | 4 ++-- silk/profiling/profiler.py | 8 ++++---- silk/request_filters.py | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/project/project/settings.py b/project/project/settings.py index 6ba95b88..e3586db7 100644 --- a/project/project/settings.py +++ b/project/project/settings.py @@ -57,8 +57,6 @@ USE_I18N = True -USE_L10N = True - USE_TZ = True LOGGING = { diff --git a/project/tests/urlconf_without_silk.py b/project/tests/urlconf_without_silk.py index 0b730053..88e073c2 100644 --- a/project/tests/urlconf_without_silk.py +++ b/project/tests/urlconf_without_silk.py @@ -1,7 +1,7 @@ -from django.conf.urls import include, url +from django.urls import include, re_path urlpatterns = [ - url( + re_path( r'^example_app/', include('example_app.urls', namespace='example_app') ), diff --git a/silk/profiling/profiler.py b/silk/profiling/profiler.py index bd492aee..66610abf 100644 --- a/silk/profiling/profiler.py +++ b/silk/profiling/profiler.py @@ -11,7 +11,7 @@ from silk.config import SilkyConfig from silk.models import _time_taken -Logger = logging.getLogger('silk.profiling.profiler') +logger = logging.getLogger('silk.profiling.profiler') # noinspection PyPep8Naming @@ -35,7 +35,7 @@ def __exit__(self, exc_type, exc_val, exc_tb): end_time = timezone.now() exception_raised = exc_type is not None if exception_raised: - Logger.error('Exception when performing meta profiling, dumping trace below') + logger.error('Exception when performing meta profiling, dumping trace below') traceback.print_exception(exc_type, exc_val, exc_tb) request = getattr(DataCollector().local, 'request', None) if request: @@ -102,7 +102,7 @@ def __enter__(self): 'start_time': timezone.now(), } else: - Logger.warn('Cannot execute silk_profile as silk is not installed correctly.') + logger.warning('Cannot execute silk_profile as silk is not installed correctly.') def _finalise_queries(self): collector = DataCollector() @@ -172,7 +172,7 @@ def wrapped_target(*args, **kwargs): return decorator(target) else: - Logger.warning('Cannot execute silk_profile as silk is not installed correctly.') + logger.warning('Cannot execute silk_profile as silk is not installed correctly.') return target def distinct_queries(self): diff --git a/silk/request_filters.py b/silk/request_filters.py index db0ecc6e..4ecaa5d4 100644 --- a/silk/request_filters.py +++ b/silk/request_filters.py @@ -228,5 +228,5 @@ def filters_from_request(request): f = filter_class(value) filters[ident] = f except FilterValidationError: - logger.warn(f'Validation error when processing filter {typ}({value})') + logger.warning(f'Validation error when processing filter {typ}({value})') return filters ++++++ django-silk-4.1.0.tar.gz -> django-silk-4.2.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/python-django-silk/django-silk-4.1.0.tar.gz /work/SRC/openSUSE:Factory/.python-django-silk.new.2520/django-silk-4.2.0.tar.gz differ: char 4, line 1
