From ba004aa5b1bb201938b5caacd6df66703dd46332 Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Mon, 26 May 2014 13:47:17 +0200 Subject: [PATCH 01/58] update to 1.4 (rhbz#1100733) --- .gitignore | 1 + python-django-compressor.spec | 19 +++++++++++-------- sources | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 3f87d67..de0294c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /django_compressor-1.2.tar.gz /django_compressor-1.3.tar.gz +/django_compressor-1.4.tar.gz diff --git a/python-django-compressor.spec b/python-django-compressor.spec index cea0bc6..d0cfa09 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,12 +1,12 @@ %global pypi_name django_compressor Name: python-django-compressor -Version: 1.3 -Release: 2%{?dist} +Version: 1.4 +Release: 1%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT -URL: http://pypi.python.org/pypi/django_compressor/1.2 +URL: http://pypi.python.org/pypi/django_compressor/%{version} Source0: http://pypi.python.org/packages/source/d/%{pypi_name}/%{pypi_name}-%{version}.tar.gz BuildArch: noarch @@ -37,11 +37,11 @@ processed with optional, configurable compilers and filters. rm -rf %{pypi_name}.egg-info # remove /usr/bin/env from scripts -for i in compressor/tests/precompiler.py \ - compressor/filters/cssmin/cssmin.py \ - compressor/filters/jsmin/rjsmin.py; - do sed -i -e "1d" $i; -done +#for i in compressor/tests/precompiler.py \ + #compressor/filters/cssmin/cssmin.py \ + #compressor/filters/jsmin/rjsmin.py; + #do sed -i -e "1d" $i; +#done @@ -59,6 +59,9 @@ done %{python_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info %changelog +* Mon May 26 2014 Matthias Runge - 1.4-1 +- update to 1.4 (rhbz#1100732) + * Sun Aug 04 2013 Fedora Release Engineering - 1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 5d6d820..dbef1f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -da8ee3c5908d648ded03dfe996499b15 django_compressor-1.3.tar.gz +dc050f1a85f83f927f94bcb09e8bdd0f django_compressor-1.4.tar.gz From a1d8a1ff00a0a9c54b2f34cc290a50b191d10f17 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 14:31:35 -0500 Subject: [PATCH 02/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- python-django-compressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index d0cfa09..e9b059c 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -2,7 +2,7 @@ Name: python-django-compressor Version: 1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -59,6 +59,9 @@ rm -rf %{pypi_name}.egg-info %{python_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon May 26 2014 Matthias Runge - 1.4-1 - update to 1.4 (rhbz#1100732) From cf9cb06670652f03bfeb9a9dd624e66aa8a250a8 Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Wed, 15 Apr 2015 09:23:40 +0200 Subject: [PATCH 03/58] Make compressor work with django-1.8 --- ...ressor-fix-attributeerror-in-offline.patch | 37 ++++ ...compressor-make-compress-run-through.patch | 162 ++++++++++++++++++ django-compressor-use-get_template.patch | 48 ++++++ python-django-compressor.spec | 26 ++- 4 files changed, 270 insertions(+), 3 deletions(-) create mode 100644 django-compressor-fix-attributeerror-in-offline.patch create mode 100644 django-compressor-make-compress-run-through.patch create mode 100644 django-compressor-use-get_template.patch diff --git a/django-compressor-fix-attributeerror-in-offline.patch b/django-compressor-fix-attributeerror-in-offline.patch new file mode 100644 index 0000000..75a1dc7 --- /dev/null +++ b/django-compressor-fix-attributeerror-in-offline.patch @@ -0,0 +1,37 @@ +From ac70fbfb7f8349e5c1150f40bf1d21ba635d0cb8 Mon Sep 17 00:00:00 2001 +From: Chirag Jadwani +Date: Fri, 29 Aug 2014 13:15:35 +0530 +Subject: [PATCH] Fix AttributeError in offline compression + +--- + compressor/offline/django.py | 2 ++ + .../test_block_super_base_compressed/test_compressor_offline.html | 5 +++++ + 2 files changed, 7 insertions(+) + +diff --git a/compressor/offline/django.py b/compressor/offline/django.py +index 3986562..b326093 100644 +--- a/compressor/offline/django.py ++++ b/compressor/offline/django.py +@@ -54,6 +54,8 @@ def remove_block_nodes(nodelist, block_stack, block_context): + if not block_stack: + continue + node = block_context.get_block(block_stack[-1].name) ++ if not node: ++ continue + if isinstance(node, BlockNode): + expanded_block = expand_blocknode(node, block_stack, block_context) + new_nodelist.extend(expanded_block) +diff --git a/compressor/tests/test_templates/test_block_super_base_compressed/test_compressor_offline.html b/compressor/tests/test_templates/test_block_super_base_compressed/test_compressor_offline.html +index 01382ec..10097c1 100644 +--- a/compressor/tests/test_templates/test_block_super_base_compressed/test_compressor_offline.html ++++ b/compressor/tests/test_templates/test_block_super_base_compressed/test_compressor_offline.html +@@ -5,4 +5,9 @@ + ++ {% block orphan %} ++ {{ block.super }} ++ An 'orphan' block that refers to a non-existent super block. ++ Contents of this block are ignored. ++ {% endblock %} + {% endspaceless %}{% endblock %} diff --git a/django-compressor-make-compress-run-through.patch b/django-compressor-make-compress-run-through.patch new file mode 100644 index 0000000..4252405 --- /dev/null +++ b/django-compressor-make-compress-run-through.patch @@ -0,0 +1,162 @@ +From 72b33ddbcdc41eb5af42b86329d81d96894a9d10 Mon Sep 17 00:00:00 2001 +From: Carlton Gibson +Date: Tue, 10 Mar 2015 20:04:07 +0100 +Subject: [PATCH] Make `compress` command (at least) run through on 1.8 + +FAILED (failures=15, errors=15, skipped=1) + +AssertionError: 2 != 12 +OfflineGenerationError: ... key "XYZ" missing ... +--- + compressor/management/commands/compress.py | 41 +++++++++++++++++------------- + compressor/offline/django.py | 27 ++++++++++++++------ + 2 files changed, 43 insertions(+), 25 deletions(-) + +diff --git a/compressor/management/commands/compress.py b/compressor/management/commands/compress.py +index 6be215e..0bc436a 100644 +--- a/compressor/management/commands/compress.py ++++ b/compressor/management/commands/compress.py +@@ -5,6 +5,7 @@ + from fnmatch import fnmatch + from optparse import make_option + ++import django + from django.core.management.base import NoArgsCommand, CommandError + import django.template + from django.template import Context +@@ -53,24 +54,30 @@ class Command(NoArgsCommand): + requires_model_validation = False + + def get_loaders(self): +- from django.template.loader import template_source_loaders +- if template_source_loaders is None: +- try: +- from django.template.loader import ( +- find_template as finder_func) +- except ImportError: +- from django.template.loader import ( +- find_template_source as finder_func) # noqa +- try: +- # Force django to calculate template_source_loaders from +- # TEMPLATE_LOADERS settings, by asking to find a dummy template +- source, name = finder_func('test') +- except django.template.TemplateDoesNotExist: +- pass +- # Reload template_source_loaders now that it has been calculated ; +- # it should contain the list of valid, instanciated template loaders +- # to use. ++ if django.VERSION < (1, 8): + from django.template.loader import template_source_loaders ++ if template_source_loaders is None: ++ try: ++ from django.template.loader import ( ++ find_template as finder_func) ++ except ImportError: ++ from django.template.loader import ( ++ find_template_source as finder_func) # noqa ++ try: ++ # Force django to calculate template_source_loaders from ++ # TEMPLATE_LOADERS settings, by asking to find a dummy template ++ source, name = finder_func('test') ++ except django.template.TemplateDoesNotExist: ++ pass ++ # Reload template_source_loaders now that it has been calculated ; ++ # it should contain the list of valid, instanciated template loaders ++ # to use. ++ from django.template.loader import template_source_loaders ++ else: ++ from django.template import engines ++ template_source_loaders = [] ++ for e in engines.all(): ++ template_source_loaders.extend(e.engine.get_template_loaders(e.engine.loaders)) + loaders = [] + # If template loader is CachedTemplateLoader, return the loaders + # that it wraps around. So if we have +diff --git a/compressor/offline/django.py b/compressor/offline/django.py +index b326093..107c6e4 100644 +--- a/compressor/offline/django.py ++++ b/compressor/offline/django.py +@@ -1,6 +1,7 @@ + from __future__ import absolute_import + from copy import copy + ++import django + from django import template + from django.conf import settings + from django.template import Context +@@ -14,7 +15,7 @@ + from compressor.templatetags.compress import CompressorNode + + +-def handle_extendsnode(extendsnode, block_context=None): ++def handle_extendsnode(extendsnode, block_context=None, original=None): + """Create a copy of Node tree of a derived template replacing + all blocks tags with the nodes of appropriate blocks. + Also handles {{ block.super }} tags. +@@ -26,6 +27,9 @@ def handle_extendsnode(extendsnode, block_context=None): + block_context.add_blocks(blocks) + + context = Context(settings.COMPRESS_OFFLINE_CONTEXT) ++ if original is not None: ++ context.template = original ++ + compiled_parent = extendsnode.get_parent(context) + parent_nodelist = compiled_parent.nodelist + # If the parent template has an ExtendsNode it is not the root. +@@ -33,7 +37,7 @@ def handle_extendsnode(extendsnode, block_context=None): + # The ExtendsNode has to be the first non-text node. + if not isinstance(node, TextNode): + if isinstance(node, ExtendsNode): +- return handle_extendsnode(node, block_context) ++ return handle_extendsnode(node, block_context, original) + break + # Add blocks of the root template to block context. + blocks = dict((n.name, n) for n in +@@ -95,7 +99,10 @@ def __init__(self, charset): + + def parse(self, template_name): + try: +- return get_template(template_name) ++ if django.VERSION < (1, 8): ++ return get_template(template_name) ++ else: ++ return get_template(template_name).template + except template.TemplateSyntaxError as e: + raise TemplateSyntaxError(str(e)) + except template.TemplateDoesNotExist as e: +@@ -111,15 +118,17 @@ def process_node(self, template, context, node): + pass + + def render_nodelist(self, template, context, node): ++ if django.VERSION >= (1, 8): ++ context.template = template + return node.nodelist.render(context) + + def render_node(self, template, context, node): + return node.render(context, forced=True) + +- def get_nodelist(self, node): ++ def get_nodelist(self, node, original=None): + if isinstance(node, ExtendsNode): + try: +- return handle_extendsnode(node) ++ return handle_extendsnode(node, block_context=None, original=original) + except template.TemplateSyntaxError as e: + raise TemplateSyntaxError(str(e)) + except template.TemplateDoesNotExist as e: +@@ -134,10 +143,12 @@ def get_nodelist(self, node): + nodelist = getattr(node, 'nodelist', []) + return nodelist + +- def walk_nodes(self, node): +- for node in self.get_nodelist(node): ++ def walk_nodes(self, node, original=None): ++ if django.VERSION >= (1, 8) and original is None: ++ original = node ++ for node in self.get_nodelist(node, original): + if isinstance(node, CompressorNode) and node.is_offline_compression_enabled(forced=True): + yield node + else: +- for node in self.walk_nodes(node): ++ for node in self.walk_nodes(node, original): + yield node diff --git a/django-compressor-use-get_template.patch b/django-compressor-use-get_template.patch new file mode 100644 index 0000000..b890d49 --- /dev/null +++ b/django-compressor-use-get_template.patch @@ -0,0 +1,48 @@ +From c8495264b503a595fbc89e6c8a83a402eff445c6 Mon Sep 17 00:00:00 2001 +From: Mathieu Pillard +Date: Sun, 25 May 2014 14:09:33 +0200 +Subject: [PATCH] Use get_template() when dealing with django templates + +--- + compressor/offline/django.py | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +diff --git a/compressor/offline/django.py b/compressor/offline/django.py +index 6541471..3986562 100644 +--- a/compressor/offline/django.py ++++ b/compressor/offline/django.py +@@ -1,13 +1,12 @@ + from __future__ import absolute_import +-import io + from copy import copy + + from django import template + from django.conf import settings +-from django.template import Template + from django.template import Context + from django.template.base import Node, VariableNode, TextNode, NodeList + from django.template.defaulttags import IfNode ++from django.template.loader import get_template + from django.template.loader_tags import ExtendsNode, BlockNode, BlockContext + + +@@ -93,13 +92,12 @@ def __init__(self, charset): + self.charset = charset + + def parse(self, template_name): +- with io.open(template_name, mode='rb') as file: +- try: +- return Template(file.read().decode(self.charset)) +- except template.TemplateSyntaxError as e: +- raise TemplateSyntaxError(str(e)) +- except template.TemplateDoesNotExist as e: +- raise TemplateDoesNotExist(str(e)) ++ try: ++ return get_template(template_name) ++ except template.TemplateSyntaxError as e: ++ raise TemplateSyntaxError(str(e)) ++ except template.TemplateDoesNotExist as e: ++ raise TemplateDoesNotExist(str(e)) + + def process_template(self, template, context): + return True diff --git a/python-django-compressor.spec b/python-django-compressor.spec index d0cfa09..62d9406 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -2,17 +2,30 @@ Name: python-django-compressor Version: 1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT URL: http://pypi.python.org/pypi/django_compressor/%{version} Source0: http://pypi.python.org/packages/source/d/%{pypi_name}/%{pypi_name}-%{version}.tar.gz + +# All patches are directly connected to Django-1.8 +# +# cherry-pick from upstream +# https://github.com/django-compressor/django-compressor/commit/c8495264b503a595fbc89e6c8a83a402eff445c6.patch +Patch0001: django-compressor-use-get_template.patch +# cherry-pick from upstream +# https://github.com/django-compressor/django-compressor/commit/ac70fbfb7f8349e5c1150f40bf1d21ba635d0cb8.patch +Patch0002: django-compressor-fix-attributeerror-in-offline.patch +# cherry-pick from upstream +# https://github.com/django-compressor/django-compressor/commit/72b33ddbcdc41eb5af42b86329d81d96894a9d10.patch +Patch0003: django-compressor-make-compress-run-through.patch + BuildArch: noarch - + BuildRequires: python2-devel BuildRequires: python-setuptools - + Requires: python-django-appconf >= 0.4 Requires: python-versiontools @@ -33,6 +46,10 @@ processed with optional, configurable compilers and filters. %prep %setup -q -n %{pypi_name}-%{version} +%patch0001 -p1 +%patch0002 -p1 +%patch0003 -p1 + # Remove bundled egg-info rm -rf %{pypi_name}.egg-info @@ -59,6 +76,9 @@ rm -rf %{pypi_name}.egg-info %{python_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info %changelog +* Wed Apr 15 2015 Matthias Runge - 1.4-2 +- make compress command work on django-1.8 + * Mon May 26 2014 Matthias Runge - 1.4-1 - update to 1.4 (rhbz#1100732) From 4a3751007f464fc8c45e6b4957e95442540e6df1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 18:58:48 +0000 Subject: [PATCH 04/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- python-django-compressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 5c9057a..d975aca 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -2,7 +2,7 @@ Name: python-django-compressor Version: 1.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -76,6 +76,9 @@ rm -rf %{pypi_name}.egg-info %{python_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 1.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Apr 15 2015 Matthias Runge - 1.4-3 - make compress command work on django-1.8 From 013ddf2a3358557856d5d14efbe56bdf23917c1c Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Wed, 26 Aug 2015 09:29:41 +0200 Subject: [PATCH 05/58] update to 1.5 --- .gitignore | 1 + python-django-compressor.spec | 36 ++++++----------------------------- sources | 2 +- 3 files changed, 8 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index de0294c..a45a086 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /django_compressor-1.2.tar.gz /django_compressor-1.3.tar.gz /django_compressor-1.4.tar.gz +/django_compressor-1.5.tar.gz diff --git a/python-django-compressor.spec b/python-django-compressor.spec index d975aca..7ca8579 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,26 +1,14 @@ %global pypi_name django_compressor Name: python-django-compressor -Version: 1.4 -Release: 4%{?dist} +Version: 1.5 +Release: 1%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT URL: http://pypi.python.org/pypi/django_compressor/%{version} Source0: http://pypi.python.org/packages/source/d/%{pypi_name}/%{pypi_name}-%{version}.tar.gz -# All patches are directly connected to Django-1.8 -# -# cherry-pick from upstream -# https://github.com/django-compressor/django-compressor/commit/c8495264b503a595fbc89e6c8a83a402eff445c6.patch -Patch0001: django-compressor-use-get_template.patch -# cherry-pick from upstream -# https://github.com/django-compressor/django-compressor/commit/ac70fbfb7f8349e5c1150f40bf1d21ba635d0cb8.patch -Patch0002: django-compressor-fix-attributeerror-in-offline.patch -# cherry-pick from upstream -# https://github.com/django-compressor/django-compressor/commit/72b33ddbcdc41eb5af42b86329d81d96894a9d10.patch -Patch0003: django-compressor-make-compress-run-through.patch - BuildArch: noarch BuildRequires: python2-devel @@ -38,7 +26,7 @@ Requires: python-django %description Django Compressor combines and compresses linked and inline Javascript or CSS in a Django templates into cacheable static files by using the -``compress`` template tag. HTML in between +``compress`` template tag. HTML in between ``{% compress js/css %}`` and ``{% endcompress %}`` is parsed and searched for CSS or JS. These styles and scripts are subsequently processed with optional, configurable compilers and filters. @@ -46,21 +34,6 @@ processed with optional, configurable compilers and filters. %prep %setup -q -n %{pypi_name}-%{version} -%patch0001 -p1 -%patch0002 -p1 -%patch0003 -p1 - -# Remove bundled egg-info -rm -rf %{pypi_name}.egg-info - -# remove /usr/bin/env from scripts -#for i in compressor/tests/precompiler.py \ - #compressor/filters/cssmin/cssmin.py \ - #compressor/filters/jsmin/rjsmin.py; - #do sed -i -e "1d" $i; -#done - - %build %{__python} setup.py build @@ -76,6 +49,9 @@ rm -rf %{pypi_name}.egg-info %{python_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info %changelog +* Wed Aug 26 2015 Matthias Runge - 1.5-1 +- update to 1.5 + * Thu Jun 18 2015 Fedora Release Engineering - 1.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index dbef1f5..f00ce15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dc050f1a85f83f927f94bcb09e8bdd0f django_compressor-1.4.tar.gz +274dd82a45ddd13e111852dd101a5924 django_compressor-1.5.tar.gz From 4d873703a47ceaa2f221818eed2ca5c157cdcd9b Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Thu, 27 Aug 2015 13:14:28 +0200 Subject: [PATCH 06/58] add python3 subpackge --- python-django-compressor.spec | 88 ++++++++++++++++++++++++++++++----- 1 file changed, 76 insertions(+), 12 deletions(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 7ca8579..a35d39c 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,8 +1,18 @@ +%{!?__python2:%global __python2 %{__python}} +%{!?python2_sitelib: %global python2_sitelib %{python_sitelib}} +%{!?python2_sitearch: %global python2_sitearch %{python_sitearch}} +%{!?python2_version: %global python2_version %{python_version}} + %global pypi_name django_compressor +%if 0%{?fedora} > 12 +%global with_python3 1 +%else +%global with_python3 0 +%endif Name: python-django-compressor Version: 1.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -16,12 +26,7 @@ BuildRequires: python-setuptools Requires: python-django-appconf >= 0.4 Requires: python-versiontools - -%if 0%{?rhel}<7 || 0%{?fedora} < 18 -Requires: Django -%else Requires: python-django -%endif %description Django Compressor combines and compresses linked and inline Javascript @@ -31,24 +36,83 @@ or CSS in a Django templates into cacheable static files by using the parsed and searched for CSS or JS. These styles and scripts are subsequently processed with optional, configurable compilers and filters. +%if 0%{?with_python3} +%package -n python3-django-compressor +Summary: Compresses linked and inline JavaScript or CSS into single cached files +Requires: python3-versiontools +Requires: python3-django-appconf +Requires: python3-django + +BuildRequires: python3-devel +BuildRequires: python3-setuptools + +%description -n python3-django-compressor +Django Compressor combines and compresses linked and inline Javascript +or CSS in a Django templates into cacheable static files by using the +``compress`` template tag. HTML in between +``{% compress js/css %}`` and ``{% endcompress %}`` is +parsed and searched for CSS or JS. These styles and scripts are subsequently +processed with optional, configurable compilers and filters. + +%endif + %prep -%setup -q -n %{pypi_name}-%{version} +%setup -qc +mv %{pypi_name}-%{version} python2 +pushd python2 + +# copy license etc to top level dir +cp -a LICENSE .. +cp -a README.rst .. +popd + +%if 0%{?with_python3} +cp -a python2 python3 +%endif %build -%{__python} setup.py build +pushd python2 +%{__python2} setup.py build +popd +%if 0%{?with_python3} +pushd python3 +%{__python3} setup.py build +popd +%endif %install -%{__python} setup.py install --skip-build --root %{buildroot} +pushd python2 +%{__python2} setup.py install --skip-build --root %{buildroot} +popd + +%if 0%{?with_python3} +pushd python3 +%{__python3} setup.py install --skip-build --root %{buildroot} +popd +%endif + %files -%doc README.rst LICENSE -%{python_sitelib}/compressor -%{python_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info +%doc README.rst +%license LICENSE +%{python2_sitelib}/compressor +%{python2_sitelib}/%{pypi_name}-%{version}-py%{python2_version}.egg-info + +%if 0%{?with_python3} +%files -n python3-django-compressor +%doc README.rst +%license LICENSE +%{python3_sitelib}/compressor +%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info +%endif %changelog +* Thu Aug 27 2015 Matthias Runge - 1.5-2 +- add python3 subpackage + * Wed Aug 26 2015 Matthias Runge - 1.5-1 - update to 1.5 From ef306c9a551d787dc3c9bd7755274a28bd7d3370 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 10 Nov 2015 15:36:38 +0000 Subject: [PATCH 07/58] - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 --- python-django-compressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index a35d39c..876a217 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -12,7 +12,7 @@ Name: python-django-compressor Version: 1.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -110,6 +110,9 @@ popd %endif %changelog +* Tue Nov 10 2015 Fedora Release Engineering - 1.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + * Thu Aug 27 2015 Matthias Runge - 1.5-2 - add python3 subpackage From 56f2aa957396ac50e867d216420c9cb698839720 Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Fri, 20 Nov 2015 11:12:11 +0100 Subject: [PATCH 08/58] update to 1.6 (rhbz#1283807) --- .gitignore | 1 + python-django-compressor.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a45a086..8ca26ee 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /django_compressor-1.3.tar.gz /django_compressor-1.4.tar.gz /django_compressor-1.5.tar.gz +/django_compressor-1.6.tar.gz diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 876a217..0923068 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -11,8 +11,8 @@ %endif Name: python-django-compressor -Version: 1.5 -Release: 3%{?dist} +Version: 1.6 +Release: 1%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -110,6 +110,9 @@ popd %endif %changelog +* Fri Nov 20 2015 Matthias Runge - 1.6-1 +- update to 1.6 (rhbz#1283807) + * Tue Nov 10 2015 Fedora Release Engineering - 1.5-3 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 diff --git a/sources b/sources index f00ce15..46fd624 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -274dd82a45ddd13e111852dd101a5924 django_compressor-1.5.tar.gz +21aff524cc1b3fc50b44d4ef4846036e django_compressor-1.6.tar.gz From d7be77fdb40e31a84b0616f94f624e7981408ca6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 19:23:30 +0000 Subject: [PATCH 09/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- python-django-compressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 0923068..a599b97 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -12,7 +12,7 @@ Name: python-django-compressor Version: 1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -110,6 +110,9 @@ popd %endif %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 1.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Nov 20 2015 Matthias Runge - 1.6-1 - update to 1.6 (rhbz#1283807) From 82ec62a11268abd250324fa56dc39c4fbbbce734 Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Mon, 2 May 2016 19:33:46 +0200 Subject: [PATCH 10/58] update to 2.0 --- .gitignore | 1 + python-django-compressor.spec | 13 ++++++++++--- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8ca26ee..b07500e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /django_compressor-1.4.tar.gz /django_compressor-1.5.tar.gz /django_compressor-1.6.tar.gz +/django_compressor-2.0.tar.gz diff --git a/python-django-compressor.spec b/python-django-compressor.spec index a599b97..3ffc800 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -11,8 +11,8 @@ %endif Name: python-django-compressor -Version: 1.6 -Release: 2%{?dist} +Version: 2.0 +Release: 1%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -26,7 +26,9 @@ BuildRequires: python-setuptools Requires: python-django-appconf >= 0.4 Requires: python-versiontools -Requires: python-django +Requires: python-django +Requires: python2-rjsmin +Requires: python2-rcssmin %description Django Compressor combines and compresses linked and inline Javascript @@ -42,6 +44,8 @@ Summary: Compresses linked and inline JavaScript or CSS into single cached f Requires: python3-versiontools Requires: python3-django-appconf Requires: python3-django +Requires: python3-rjsmin +Requires: python3-rcssmin BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -110,6 +114,9 @@ popd %endif %changelog +* Fri Feb 26 2016 Matthias Runge - 2.0-1 +- update to 2.0 (rhbz#1296716) + * Thu Feb 04 2016 Fedora Release Engineering - 1.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 46fd624..8b1e69b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -21aff524cc1b3fc50b44d4ef4846036e django_compressor-1.6.tar.gz +98254da44f1676d7b871ffeb14115175 django_compressor-2.0.tar.gz From cf4def1decf5d8b87021f7927d339490cd63d114 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 09:24:51 +0000 Subject: [PATCH 11/58] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- python-django-compressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 3ffc800..e907918 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -12,7 +12,7 @@ Name: python-django-compressor Version: 2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -114,6 +114,9 @@ popd %endif %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 2.0-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Fri Feb 26 2016 Matthias Runge - 2.0-1 - update to 2.0 (rhbz#1296716) From 998525c7f5dac50af03537e0abc44ec713269536 Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Thu, 11 Aug 2016 14:55:16 +0200 Subject: [PATCH 12/58] update to 2.1 Resolves: rhbz#1365700 --- .gitignore | 1 + python-django-compressor.spec | 41 +++++++++++------------------------ sources | 2 +- 3 files changed, 15 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index b07500e..2483b37 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /django_compressor-1.5.tar.gz /django_compressor-1.6.tar.gz /django_compressor-2.0.tar.gz +/python-django-compressor-2.1.tar.gz diff --git a/python-django-compressor.spec b/python-django-compressor.spec index e907918..cc2818e 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -11,20 +11,20 @@ %endif Name: python-django-compressor -Version: 2.0 -Release: 2%{?dist} +Version: 2.1 +Release: 1%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT URL: http://pypi.python.org/pypi/django_compressor/%{version} -Source0: http://pypi.python.org/packages/source/d/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +Source0: https://github.com/django-compressor/django-compressor/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-setuptools -Requires: python-django-appconf >= 0.4 +Requires: python-django-appconf >= 1.0 Requires: python-versiontools Requires: python-django Requires: python2-rjsmin @@ -62,39 +62,20 @@ processed with optional, configurable compilers and filters. %prep -%setup -qc -mv %{pypi_name}-%{version} python2 -pushd python2 - -# copy license etc to top level dir -cp -a LICENSE .. -cp -a README.rst .. -popd - -%if 0%{?with_python3} -cp -a python2 python3 -%endif +%autosetup -n django-compressor-%{version} %build -pushd python2 -%{__python2} setup.py build -popd +%py2_build %if 0%{?with_python3} -pushd python3 -%{__python3} setup.py build -popd +%py3_build %endif %install -pushd python2 -%{__python2} setup.py install --skip-build --root %{buildroot} -popd +%py2_install %if 0%{?with_python3} -pushd python3 -%{__python3} setup.py install --skip-build --root %{buildroot} -popd +%py3_install %endif @@ -114,6 +95,10 @@ popd %endif %changelog +* Thu Aug 11 2016 Matthias Runge - 2.1-1 +- update to 2.1 (rhbz#1365700) +- modernize spec + * Tue Jul 19 2016 Fedora Release Engineering - 2.0-2 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages diff --git a/sources b/sources index 8b1e69b..7608729 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -98254da44f1676d7b871ffeb14115175 django_compressor-2.0.tar.gz +e16eda3d7bd7176acbf7c1225ecccad4 python-django-compressor-2.1.tar.gz From 50da6b458ba5448293e22d2f0ac563cb84f4f5ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Dec 2016 18:20:37 +0100 Subject: [PATCH 13/58] Rebuild for Python 3.6 --- python-django-compressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index cc2818e..3910f1d 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -12,7 +12,7 @@ Name: python-django-compressor Version: 2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -95,6 +95,9 @@ processed with optional, configurable compilers and filters. %endif %changelog +* Mon Dec 19 2016 Miro Hrončok - 2.1-2 +- Rebuild for Python 3.6 + * Thu Aug 11 2016 Matthias Runge - 2.1-1 - update to 2.1 (rhbz#1365700) - modernize spec From a30fe15f366e38cb836b18198801302e9d0fd0d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 08:46:37 +0000 Subject: [PATCH 14/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- python-django-compressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 3910f1d..06c6eff 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -12,7 +12,7 @@ Name: python-django-compressor Version: 2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -95,6 +95,9 @@ processed with optional, configurable compilers and filters. %endif %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Dec 19 2016 Miro Hrončok - 2.1-2 - Rebuild for Python 3.6 From 369ca20c422c6e8194f6589be4d09b699459c3f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 10:04:51 +0000 Subject: [PATCH 15/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- python-django-compressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 06c6eff..a5d46dc 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -12,7 +12,7 @@ Name: python-django-compressor Version: 2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -95,6 +95,9 @@ processed with optional, configurable compilers and filters. %endif %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From e72f52978c56f2828b4a012b1f5682203701b8f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 19 Aug 2017 09:40:10 -0400 Subject: [PATCH 16/58] Python 2 binary package renamed to python2-django-compressor --- python-django-compressor.spec | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index a5d46dc..a2da1fd 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -12,7 +12,7 @@ Name: python-django-compressor Version: 2.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -24,19 +24,26 @@ BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-setuptools +%global _description\ +Django Compressor combines and compresses linked and inline Javascript\ +or CSS in a Django templates into cacheable static files by using the\ +``compress`` template tag. HTML in between\ +``{% compress js/css %}`` and ``{% endcompress %}`` is\ +parsed and searched for CSS or JS. These styles and scripts are subsequently\ +processed with optional, configurable compilers and filters. + +%description %_description + +%package -n python2-django-compressor +Summary: %summary Requires: python-django-appconf >= 1.0 Requires: python-versiontools Requires: python-django Requires: python2-rjsmin Requires: python2-rcssmin +%{?python_provide:%python_provide python2-django-compressor} -%description -Django Compressor combines and compresses linked and inline Javascript -or CSS in a Django templates into cacheable static files by using the -``compress`` template tag. HTML in between -``{% compress js/css %}`` and ``{% endcompress %}`` is -parsed and searched for CSS or JS. These styles and scripts are subsequently -processed with optional, configurable compilers and filters. +%description -n python2-django-compressor %_description %if 0%{?with_python3} %package -n python3-django-compressor @@ -80,7 +87,7 @@ processed with optional, configurable compilers and filters. -%files +%files -n python2-django-compressor %doc README.rst %license LICENSE %{python2_sitelib}/compressor @@ -95,6 +102,10 @@ processed with optional, configurable compilers and filters. %endif %changelog +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 2.1-5 +- Python 2 binary package renamed to python2-django-compressor + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + * Thu Jul 27 2017 Fedora Release Engineering - 2.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From bf6c080e42d863ca736b5860359476226393330c Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Fri, 26 Jan 2018 10:31:40 +0100 Subject: [PATCH 17/58] drop python2 package see https://fedoraproject.org/wiki/Changes/Django20 --- python-django-compressor.spec | 52 ++++++----------------------------- 1 file changed, 8 insertions(+), 44 deletions(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index a2da1fd..284726e 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,18 +1,7 @@ -%{!?__python2:%global __python2 %{__python}} -%{!?python2_sitelib: %global python2_sitelib %{python_sitelib}} -%{!?python2_sitearch: %global python2_sitearch %{python_sitearch}} -%{!?python2_version: %global python2_version %{python_version}} - %global pypi_name django_compressor -%if 0%{?fedora} > 12 -%global with_python3 1 -%else -%global with_python3 0 -%endif - Name: python-django-compressor Version: 2.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -21,9 +10,6 @@ Source0: https://github.com/django-compressor/django-compressor/archive/% BuildArch: noarch -BuildRequires: python2-devel -BuildRequires: python-setuptools - %global _description\ Django Compressor combines and compresses linked and inline Javascript\ or CSS in a Django templates into cacheable static files by using the\ @@ -34,18 +20,6 @@ processed with optional, configurable compilers and filters. %description %_description -%package -n python2-django-compressor -Summary: %summary -Requires: python-django-appconf >= 1.0 -Requires: python-versiontools -Requires: python-django -Requires: python2-rjsmin -Requires: python2-rcssmin -%{?python_provide:%python_provide python2-django-compressor} - -%description -n python2-django-compressor %_description - -%if 0%{?with_python3} %package -n python3-django-compressor Summary: Compresses linked and inline JavaScript or CSS into single cached files Requires: python3-versiontools @@ -57,6 +31,10 @@ Requires: python3-rcssmin BuildRequires: python3-devel BuildRequires: python3-setuptools +# Added in f28 cycle. +Obsoletes: python2-django-compressor < 2.1-6 +Obsoletes: python-django-compressor < 2.1-6 + %description -n python3-django-compressor Django Compressor combines and compresses linked and inline Javascript or CSS in a Django templates into cacheable static files by using the @@ -65,43 +43,29 @@ or CSS in a Django templates into cacheable static files by using the parsed and searched for CSS or JS. These styles and scripts are subsequently processed with optional, configurable compilers and filters. -%endif %prep %autosetup -n django-compressor-%{version} %build -%py2_build - -%if 0%{?with_python3} %py3_build -%endif %install -%py2_install - -%if 0%{?with_python3} %py3_install -%endif -%files -n python2-django-compressor -%doc README.rst -%license LICENSE -%{python2_sitelib}/compressor -%{python2_sitelib}/%{pypi_name}-%{version}-py%{python2_version}.egg-info - -%if 0%{?with_python3} %files -n python3-django-compressor %doc README.rst %license LICENSE %{python3_sitelib}/compressor %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info -%endif %changelog +* Fri Jan 26 2018 Matthias Runge - 2.1-6 +- Drop python2 package for https://fedoraproject.org/wiki/Changes/Django20 + * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 2.1-5 - Python 2 binary package renamed to python2-django-compressor See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 From cb19742d3e5fff12355ce392d67b3aaf976e26f0 Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Wed, 31 Jan 2018 10:51:08 +0100 Subject: [PATCH 18/58] update to 2.2 --- .gitignore | 1 + python-django-compressor.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2483b37..8cdb64c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /django_compressor-1.6.tar.gz /django_compressor-2.0.tar.gz /python-django-compressor-2.1.tar.gz +/python-django-compressor-2.2.tar.gz diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 284726e..5a6d343 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,7 +1,7 @@ %global pypi_name django_compressor Name: python-django-compressor -Version: 2.1 -Release: 6%{?dist} +Version: 2.2 +Release: 1%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -63,6 +63,9 @@ processed with optional, configurable compilers and filters. %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Wed Jan 31 2018 Matthias Runge - 2.2-1 +- update to 2.2 + * Fri Jan 26 2018 Matthias Runge - 2.1-6 - Drop python2 package for https://fedoraproject.org/wiki/Changes/Django20 diff --git a/sources b/sources index 7608729..1985845 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e16eda3d7bd7176acbf7c1225ecccad4 python-django-compressor-2.1.tar.gz +SHA512 (python-django-compressor-2.2.tar.gz) = 323e74a56be95f7999595d625e5dac53977590e668113a5376f2e3ad86e7a1bc0827400551d3576233177d25302381e2e075651de0cfaebf94d29255a07b8a03 From 848e2dd2da9fb9693e187512bdd2767fc65c4d70 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 07:25:27 +0000 Subject: [PATCH 19/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-django-compressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 5a6d343..bb7b244 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,7 +1,7 @@ %global pypi_name django_compressor Name: python-django-compressor Version: 2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -63,6 +63,9 @@ processed with optional, configurable compilers and filters. %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 31 2018 Matthias Runge - 2.2-1 - update to 2.2 From f65be086092c995fe6e485fe8d821c53e240091f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 19 Jun 2018 10:59:24 +0200 Subject: [PATCH 20/58] Rebuilt for Python 3.7 --- python-django-compressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index bb7b244..23d8d43 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,7 +1,7 @@ %global pypi_name django_compressor Name: python-django-compressor Version: 2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -63,6 +63,9 @@ processed with optional, configurable compilers and filters. %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Tue Jun 19 2018 Miro Hrončok - 2.2-3 +- Rebuilt for Python 3.7 + * Fri Feb 09 2018 Fedora Release Engineering - 2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From f51078b7fc94db760c9265490ec9a64cc1d7450c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 00:01:23 +0000 Subject: [PATCH 21/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-django-compressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 23d8d43..10e214e 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,7 +1,7 @@ %global pypi_name django_compressor Name: python-django-compressor Version: 2.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -63,6 +63,9 @@ processed with optional, configurable compilers and filters. %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jun 19 2018 Miro Hrončok - 2.2-3 - Rebuilt for Python 3.7 From af20c7e5c67b7d619c9271e30c17a731914a2a88 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 06:25:22 +0000 Subject: [PATCH 22/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-django-compressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 10e214e..2dc788c 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,7 +1,7 @@ %global pypi_name django_compressor Name: python-django-compressor Version: 2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -63,6 +63,9 @@ processed with optional, configurable compilers and filters. %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 2.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 2d6cf25895b3830718f69266d917a0d07950013e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 13:06:32 +0000 Subject: [PATCH 23/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-django-compressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 2dc788c..9fe7b64 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,7 +1,7 @@ %global pypi_name django_compressor Name: python-django-compressor Version: 2.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -63,6 +63,9 @@ processed with optional, configurable compilers and filters. %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 2.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 02 2019 Fedora Release Engineering - 2.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 226b4906aa64389128d14872f7d39feed9abc848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 10:34:44 +0200 Subject: [PATCH 24/58] Rebuilt for Python 3.8 --- python-django-compressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 9fe7b64..170f144 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,7 +1,7 @@ %global pypi_name django_compressor Name: python-django-compressor Version: 2.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -63,6 +63,9 @@ processed with optional, configurable compilers and filters. %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Mon Aug 19 2019 Miro Hrončok - 2.2-7 +- Rebuilt for Python 3.8 + * Fri Jul 26 2019 Fedora Release Engineering - 2.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From d1d1fd17788e98ab641f3cfcfe6c78171e348b05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 14:09:29 +0200 Subject: [PATCH 25/58] Rebuilt for Python 3.8.0rc1 (#1748018) --- python-django-compressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 170f144..c4b26e0 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,7 +1,7 @@ %global pypi_name django_compressor Name: python-django-compressor Version: 2.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -63,6 +63,9 @@ processed with optional, configurable compilers and filters. %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Thu Oct 03 2019 Miro Hrončok - 2.2-8 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Mon Aug 19 2019 Miro Hrončok - 2.2-7 - Rebuilt for Python 3.8 From 488b36c1f72d0fb5b6cd63c911ffc4519b7647de Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 11:43:14 +0000 Subject: [PATCH 26/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-django-compressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index c4b26e0..af480dd 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,7 +1,7 @@ %global pypi_name django_compressor Name: python-django-compressor Version: 2.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -63,6 +63,9 @@ processed with optional, configurable compilers and filters. %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 2.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Oct 03 2019 Miro Hrončok - 2.2-8 - Rebuilt for Python 3.8.0rc1 (#1748018) From a07793f889d8dabedf8c9518a7637e7affdf6f4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:11:21 +0200 Subject: [PATCH 27/58] Rebuilt for Python 3.9 --- python-django-compressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index af480dd..b769dd8 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,7 +1,7 @@ %global pypi_name django_compressor Name: python-django-compressor Version: 2.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -63,6 +63,9 @@ processed with optional, configurable compilers and filters. %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Tue May 26 2020 Miro Hrončok - 2.2-10 +- Rebuilt for Python 3.9 + * Thu Jan 30 2020 Fedora Release Engineering - 2.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From c46668f22357818b28cf14c523a9d3123b4033b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 00:39:34 +0000 Subject: [PATCH 28/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-django-compressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index b769dd8..779a37c 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,7 +1,7 @@ %global pypi_name django_compressor Name: python-django-compressor Version: 2.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -63,6 +63,9 @@ processed with optional, configurable compilers and filters. %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 26 2020 Miro Hrončok - 2.2-10 - Rebuilt for Python 3.9 From 581d7131d8b36f284af47df6742b37b73407ee3f Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Wed, 9 Sep 2020 10:14:31 +0530 Subject: [PATCH 29/58] Update to 2.4 --- .gitignore | 1 + python-django-compressor.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8cdb64c..b3b2fe9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /django_compressor-2.0.tar.gz /python-django-compressor-2.1.tar.gz /python-django-compressor-2.2.tar.gz +/python-django-compressor-2.4.tar.gz diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 779a37c..547d307 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,7 +1,7 @@ %global pypi_name django_compressor Name: python-django-compressor -Version: 2.2 -Release: 11%{?dist} +Version: 2.4 +Release: 1%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -63,6 +63,9 @@ processed with optional, configurable compilers and filters. %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Wed Sep 09 2020 Yatin Karel - 2.4-1 +- Update to 2.4 + * Wed Jul 29 2020 Fedora Release Engineering - 2.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 1985845..7b173ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-django-compressor-2.2.tar.gz) = 323e74a56be95f7999595d625e5dac53977590e668113a5376f2e3ad86e7a1bc0827400551d3576233177d25302381e2e075651de0cfaebf94d29255a07b8a03 +SHA512 (python-django-compressor-2.4.tar.gz) = 27deebe5d4a8be8842da48d0a11ac34e2e58689159d0542476c486bd5f3a2f13ee8a6e1d9ec04d64c05f968e80b87a2673bcd4bfffe748c553be61db8b67034c From ae12c34f571c33baf2b30be4334e285be182d605 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 10:17:44 +0000 Subject: [PATCH 30/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-django-compressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 547d307..a185be7 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,7 +1,7 @@ %global pypi_name django_compressor Name: python-django-compressor Version: 2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -63,6 +63,9 @@ processed with optional, configurable compilers and filters. %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 2.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Sep 09 2020 Yatin Karel - 2.4-1 - Update to 2.4 From 9e25dc5ee970c910527836842506310e8f196126 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:29:19 +0200 Subject: [PATCH 31/58] Rebuilt for Python 3.10 --- python-django-compressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index a185be7..8103db3 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,7 +1,7 @@ %global pypi_name django_compressor Name: python-django-compressor Version: 2.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -63,6 +63,9 @@ processed with optional, configurable compilers and filters. %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Fri Jun 04 2021 Python Maint - 2.4-3 +- Rebuilt for Python 3.10 + * Wed Jan 27 2021 Fedora Release Engineering - 2.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 52d41b6dc8417f32d1c005873d4583e4ee93e3fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 06:05:28 +0000 Subject: [PATCH 32/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-django-compressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 8103db3..8e9b43e 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,7 +1,7 @@ %global pypi_name django_compressor Name: python-django-compressor Version: 2.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -63,6 +63,9 @@ processed with optional, configurable compilers and filters. %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 2.4-3 - Rebuilt for Python 3.10 From e5164c8438293186bf947dc50c83821f24054500 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 11:41:19 +0000 Subject: [PATCH 33/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-django-compressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 8e9b43e..d464ef5 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,7 +1,7 @@ %global pypi_name django_compressor Name: python-django-compressor Version: 2.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -63,6 +63,9 @@ processed with optional, configurable compilers and filters. %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 2.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 2.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 1b4183de0ad1fb995ced08f84f57fefc78b3154c Mon Sep 17 00:00:00 2001 From: karolinku Date: Mon, 14 Mar 2022 13:30:31 +0100 Subject: [PATCH 34/58] Update to 2.4.1 --- .gitignore | 1 + python-django-compressor.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b3b2fe9..03e60e6 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /python-django-compressor-2.1.tar.gz /python-django-compressor-2.2.tar.gz /python-django-compressor-2.4.tar.gz +/python-django-compressor-2.4.1.tar.gz diff --git a/python-django-compressor.spec b/python-django-compressor.spec index d464ef5..607f992 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,7 +1,7 @@ %global pypi_name django_compressor Name: python-django-compressor -Version: 2.4 -Release: 5%{?dist} +Version: 2.4.1 +Release: 1%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -63,6 +63,9 @@ processed with optional, configurable compilers and filters. %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Mon Mar 14 2022 Karolina Kula - 2.4.1-1 +- Update to 2.4.1 + * Fri Jan 21 2022 Fedora Release Engineering - 2.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 7b173ae..3adcfa9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-django-compressor-2.4.tar.gz) = 27deebe5d4a8be8842da48d0a11ac34e2e58689159d0542476c486bd5f3a2f13ee8a6e1d9ec04d64c05f968e80b87a2673bcd4bfffe748c553be61db8b67034c +SHA512 (python-django-compressor-2.4.1.tar.gz) = aedaaf749508e62c08e0bb1334b31d015a21c17290b2c441cb16fd393e81d3ce0f587d4f4b18ebd8bb156f6ac75ac2d7a1cfc2e9e7f1c4b4d557462fceafc454 From ac5e247623c72b5d2db86cc86d6c0c79ef977166 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 15:01:35 +0200 Subject: [PATCH 35/58] Rebuilt for Python 3.11 --- python-django-compressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 607f992..2afa237 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,7 +1,7 @@ %global pypi_name django_compressor Name: python-django-compressor Version: 2.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -63,6 +63,9 @@ processed with optional, configurable compilers and filters. %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Mon Jun 13 2022 Python Maint - 2.4.1-2 +- Rebuilt for Python 3.11 + * Mon Mar 14 2022 Karolina Kula - 2.4.1-1 - Update to 2.4.1 From 7e745f6429afe95de2d2021db1e5a8a86b466769 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 17:56:21 +0000 Subject: [PATCH 36/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-django-compressor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 2afa237..e43779c 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,7 +1,7 @@ %global pypi_name django_compressor Name: python-django-compressor Version: 2.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -63,6 +63,9 @@ processed with optional, configurable compilers and filters. %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 2.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 2.4.1-2 - Rebuilt for Python 3.11 From 20403d4e614586a9af0f1cac014b87eb9e26925b Mon Sep 17 00:00:00 2001 From: aekoroglu Date: Wed, 17 Aug 2022 15:27:37 +0300 Subject: [PATCH 37/58] Update to 4.1 (RHBZ #1715669 and #2105261) --- .gitignore | 12 +- changelog | 124 +++++++++++++++++++++ python-django-compressor.spec | 204 ++++++---------------------------- rdep-version.patch | 12 ++ sources | 2 +- 5 files changed, 172 insertions(+), 182 deletions(-) create mode 100644 changelog create mode 100644 rdep-version.patch diff --git a/.gitignore b/.gitignore index 03e60e6..97b6fa0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,2 @@ -/django_compressor-1.2.tar.gz -/django_compressor-1.3.tar.gz -/django_compressor-1.4.tar.gz -/django_compressor-1.5.tar.gz -/django_compressor-1.6.tar.gz -/django_compressor-2.0.tar.gz -/python-django-compressor-2.1.tar.gz -/python-django-compressor-2.2.tar.gz -/python-django-compressor-2.4.tar.gz -/python-django-compressor-2.4.1.tar.gz +/python-django-compressor-*.tar.gz +/django-compressor-*.tar.gz diff --git a/changelog b/changelog new file mode 100644 index 0000000..7593c83 --- /dev/null +++ b/changelog @@ -0,0 +1,124 @@ +* Mon Jun 13 2022 Python Maint - 2.4.1-2 +- Rebuilt for Python 3.11 + +* Mon Mar 14 2022 Karolina Kula - 2.4.1-1 +- Update to 2.4.1 + +* Fri Jan 21 2022 Fedora Release Engineering - 2.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 2.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 2.4-3 +- Rebuilt for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 2.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Sep 09 2020 Yatin Karel - 2.4-1 +- Update to 2.4 + +* Wed Jul 29 2020 Fedora Release Engineering - 2.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 2.2-10 +- Rebuilt for Python 3.9 + +* Thu Jan 30 2020 Fedora Release Engineering - 2.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 03 2019 Miro Hrončok - 2.2-8 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Miro Hrončok - 2.2-7 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 2.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 2.2-3 +- Rebuilt for Python 3.7 + +* Fri Feb 09 2018 Fedora Release Engineering - 2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jan 31 2018 Matthias Runge - 2.2-1 +- update to 2.2 + +* Fri Jan 26 2018 Matthias Runge - 2.1-6 +- Drop python2 package for https://fedoraproject.org/wiki/Changes/Django20 + +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 2.1-5 +- Python 2 binary package renamed to python2-django-compressor + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + +* Thu Jul 27 2017 Fedora Release Engineering - 2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 19 2016 Miro Hrončok - 2.1-2 +- Rebuild for Python 3.6 + +* Thu Aug 11 2016 Matthias Runge - 2.1-1 +- update to 2.1 (rhbz#1365700) +- modernize spec + +* Tue Jul 19 2016 Fedora Release Engineering - 2.0-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Fri Feb 26 2016 Matthias Runge - 2.0-1 +- update to 2.0 (rhbz#1296716) + +* Thu Feb 04 2016 Fedora Release Engineering - 1.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Nov 20 2015 Matthias Runge - 1.6-1 +- update to 1.6 (rhbz#1283807) + +* Tue Nov 10 2015 Fedora Release Engineering - 1.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Thu Aug 27 2015 Matthias Runge - 1.5-2 +- add python3 subpackage + +* Wed Aug 26 2015 Matthias Runge - 1.5-1 +- update to 1.5 + +* Thu Jun 18 2015 Fedora Release Engineering - 1.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Apr 15 2015 Matthias Runge - 1.4-3 +- make compress command work on django-1.8 + +* Sat Jun 07 2014 Fedora Release Engineering - 1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon May 26 2014 Matthias Runge - 1.4-1 +- update to 1.4 (rhbz#1100732) + +* Sun Aug 04 2013 Fedora Release Engineering - 1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Mar 20 2013 Matthias Runge - 1.3-1 +- update to python-django-compressor-1.3 (rhbz#923735) + +* Thu Feb 14 2013 Fedora Release Engineering - 1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Sep 24 2012 Matthias Runge - 1.2-3 +- add requirement Django/python-django + +* Fri Sep 14 2012 Matthias Runge - 1.2-2 +- add requirement python-versiontools + +* Tue Sep 11 2012 Matthias Runge - 1.2-1 +- Initial package. diff --git a/python-django-compressor.spec b/python-django-compressor.spec index e43779c..22e8813 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,16 +1,5 @@ -%global pypi_name django_compressor -Name: python-django-compressor -Version: 2.4.1 -Release: 3%{?dist} -Summary: Compresses linked and inline JavaScript or CSS into single cached files - -License: MIT -URL: http://pypi.python.org/pypi/django_compressor/%{version} -Source0: https://github.com/django-compressor/django-compressor/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz - -BuildArch: noarch - -%global _description\ +%global srcname django-compressor +%global _desc\ Django Compressor combines and compresses linked and inline Javascript\ or CSS in a Django templates into cacheable static files by using the\ ``compress`` template tag. HTML in between\ @@ -18,175 +7,48 @@ or CSS in a Django templates into cacheable static files by using the\ parsed and searched for CSS or JS. These styles and scripts are subsequently\ processed with optional, configurable compilers and filters. -%description %_description +Name: python-django-compressor +Version: 4.1 +Release: %autorelease +Summary: Compresses linked and inline JavaScript or CSS into single cached files -%package -n python3-django-compressor -Summary: Compresses linked and inline JavaScript or CSS into single cached files -Requires: python3-versiontools -Requires: python3-django-appconf -Requires: python3-django -Requires: python3-rjsmin -Requires: python3-rcssmin +License: MIT +URL: https://github.com/django-compressor/django-compressor +Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz -BuildRequires: python3-devel -BuildRequires: python3-setuptools +Patch0: rdep-version.patch + +BuildArch: noarch + +BuildRequires: python3-devel + +%description %_desc + +%package -n python3-%{srcname} +Summary: %{summary} + +%description -n python3-%{srcname} +%_desc # Added in f28 cycle. -Obsoletes: python2-django-compressor < 2.1-6 -Obsoletes: python-django-compressor < 2.1-6 - -%description -n python3-django-compressor -Django Compressor combines and compresses linked and inline Javascript -or CSS in a Django templates into cacheable static files by using the -``compress`` template tag. HTML in between -``{% compress js/css %}`` and ``{% endcompress %}`` is -parsed and searched for CSS or JS. These styles and scripts are subsequently -processed with optional, configurable compilers and filters. - - +Obsoletes: python2-%{srcname} < 2.1-6 +Obsoletes: python-%{srcname} < 2.1-6 %prep -%autosetup -n django-compressor-%{version} +%autosetup -p1 -n %{srcname}-%{version} + +%generate_buildrequires +%pyproject_buildrequires %build -%py3_build +%pyproject_wheel %install -%py3_install +%pyproject_install +%pyproject_save_files compressor - - -%files -n python3-django-compressor +%files -n python3-%{srcname} -f %{pyproject_files} %doc README.rst -%license LICENSE -%{python3_sitelib}/compressor -%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog -* Fri Jul 22 2022 Fedora Release Engineering - 2.4.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Python Maint - 2.4.1-2 -- Rebuilt for Python 3.11 - -* Mon Mar 14 2022 Karolina Kula - 2.4.1-1 -- Update to 2.4.1 - -* Fri Jan 21 2022 Fedora Release Engineering - 2.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 2.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 2.4-3 -- Rebuilt for Python 3.10 - -* Wed Jan 27 2021 Fedora Release Engineering - 2.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Sep 09 2020 Yatin Karel - 2.4-1 -- Update to 2.4 - -* Wed Jul 29 2020 Fedora Release Engineering - 2.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 26 2020 Miro Hrončok - 2.2-10 -- Rebuilt for Python 3.9 - -* Thu Jan 30 2020 Fedora Release Engineering - 2.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Oct 03 2019 Miro Hrončok - 2.2-8 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Mon Aug 19 2019 Miro Hrončok - 2.2-7 -- Rebuilt for Python 3.8 - -* Fri Jul 26 2019 Fedora Release Engineering - 2.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 2.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 2.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 19 2018 Miro Hrončok - 2.2-3 -- Rebuilt for Python 3.7 - -* Fri Feb 09 2018 Fedora Release Engineering - 2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jan 31 2018 Matthias Runge - 2.2-1 -- update to 2.2 - -* Fri Jan 26 2018 Matthias Runge - 2.1-6 -- Drop python2 package for https://fedoraproject.org/wiki/Changes/Django20 - -* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 2.1-5 -- Python 2 binary package renamed to python2-django-compressor - See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 - -* Thu Jul 27 2017 Fedora Release Engineering - 2.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 19 2016 Miro Hrončok - 2.1-2 -- Rebuild for Python 3.6 - -* Thu Aug 11 2016 Matthias Runge - 2.1-1 -- update to 2.1 (rhbz#1365700) -- modernize spec - -* Tue Jul 19 2016 Fedora Release Engineering - 2.0-2 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Fri Feb 26 2016 Matthias Runge - 2.0-1 -- update to 2.0 (rhbz#1296716) - -* Thu Feb 04 2016 Fedora Release Engineering - 1.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Nov 20 2015 Matthias Runge - 1.6-1 -- update to 1.6 (rhbz#1283807) - -* Tue Nov 10 2015 Fedora Release Engineering - 1.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - -* Thu Aug 27 2015 Matthias Runge - 1.5-2 -- add python3 subpackage - -* Wed Aug 26 2015 Matthias Runge - 1.5-1 -- update to 1.5 - -* Thu Jun 18 2015 Fedora Release Engineering - 1.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Apr 15 2015 Matthias Runge - 1.4-3 -- make compress command work on django-1.8 - -* Sat Jun 07 2014 Fedora Release Engineering - 1.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon May 26 2014 Matthias Runge - 1.4-1 -- update to 1.4 (rhbz#1100732) - -* Sun Aug 04 2013 Fedora Release Engineering - 1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Mar 20 2013 Matthias Runge - 1.3-1 -- update to python-django-compressor-1.3 (rhbz#923735) - -* Thu Feb 14 2013 Fedora Release Engineering - 1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Sep 24 2012 Matthias Runge - 1.2-3 -- add requirement Django/python-django - -* Fri Sep 14 2012 Matthias Runge - 1.2-2 -- add requirement python-versiontools - -* Tue Sep 11 2012 Matthias Runge - 1.2-1 -- Initial package. +%autochangelog diff --git a/rdep-version.patch b/rdep-version.patch new file mode 100644 index 0000000..16a9fe2 --- /dev/null +++ b/rdep-version.patch @@ -0,0 +1,12 @@ +--- a/setup.py 2022-08-17 14:46:30.186903576 +0300 ++++ b/setup.py 2022-08-17 14:46:42.507861281 +0300 +@@ -149,7 +149,7 @@ + zip_safe=False, + install_requires=[ + 'django-appconf >= 1.0.3', +- 'rcssmin == 1.1.0', +- 'rjsmin == 1.2.0', ++ 'rcssmin >= 1.1.0', ++ 'rjsmin >= 1.2.0', + ], + ) diff --git a/sources b/sources index 3adcfa9..f9d77cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-django-compressor-2.4.1.tar.gz) = aedaaf749508e62c08e0bb1334b31d015a21c17290b2c441cb16fd393e81d3ce0f587d4f4b18ebd8bb156f6ac75ac2d7a1cfc2e9e7f1c4b4d557462fceafc454 +SHA512 (django-compressor-4.1.tar.gz) = eb1e4fc5d9ada8fb32a1059c87b447735cf0e1c40853b2313b5f7f5d1c9cf3c66d96ebf40a721175db5fe721c44b077bc026270d59e90890e1807125a38a33a1 From 9a0eeafc7ccc43171bbe12f4725681bc61c5b5c1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 12:40:48 +0000 Subject: [PATCH 38/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From bd6cd6ca5c9732304b8bfadd8d0087ae9c1a0a87 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 29 Jun 2023 13:33:54 +0200 Subject: [PATCH 39/58] Rebuilt for Python 3.12 From ef93f09bb967322f55a4595debc32a3c2830b2d6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 09:00:20 +0000 Subject: [PATCH 40/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From a07f14cb1ccb7faebebde177d2cbff5f59f94462 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Tue, 16 Jan 2024 11:22:01 -0600 Subject: [PATCH 41/58] Update to 4.4 (rhbz#1715669) - cleanup unused patches Signed-off-by: Michel Lind --- ...ressor-fix-attributeerror-in-offline.patch | 37 ---- ...compressor-make-compress-run-through.patch | 162 ------------------ django-compressor-use-get_template.patch | 48 ------ python-django-compressor.spec | 2 +- rdep-version.patch | 16 +- sources | 2 +- 6 files changed, 10 insertions(+), 257 deletions(-) delete mode 100644 django-compressor-fix-attributeerror-in-offline.patch delete mode 100644 django-compressor-make-compress-run-through.patch delete mode 100644 django-compressor-use-get_template.patch diff --git a/django-compressor-fix-attributeerror-in-offline.patch b/django-compressor-fix-attributeerror-in-offline.patch deleted file mode 100644 index 75a1dc7..0000000 --- a/django-compressor-fix-attributeerror-in-offline.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ac70fbfb7f8349e5c1150f40bf1d21ba635d0cb8 Mon Sep 17 00:00:00 2001 -From: Chirag Jadwani -Date: Fri, 29 Aug 2014 13:15:35 +0530 -Subject: [PATCH] Fix AttributeError in offline compression - ---- - compressor/offline/django.py | 2 ++ - .../test_block_super_base_compressed/test_compressor_offline.html | 5 +++++ - 2 files changed, 7 insertions(+) - -diff --git a/compressor/offline/django.py b/compressor/offline/django.py -index 3986562..b326093 100644 ---- a/compressor/offline/django.py -+++ b/compressor/offline/django.py -@@ -54,6 +54,8 @@ def remove_block_nodes(nodelist, block_stack, block_context): - if not block_stack: - continue - node = block_context.get_block(block_stack[-1].name) -+ if not node: -+ continue - if isinstance(node, BlockNode): - expanded_block = expand_blocknode(node, block_stack, block_context) - new_nodelist.extend(expanded_block) -diff --git a/compressor/tests/test_templates/test_block_super_base_compressed/test_compressor_offline.html b/compressor/tests/test_templates/test_block_super_base_compressed/test_compressor_offline.html -index 01382ec..10097c1 100644 ---- a/compressor/tests/test_templates/test_block_super_base_compressed/test_compressor_offline.html -+++ b/compressor/tests/test_templates/test_block_super_base_compressed/test_compressor_offline.html -@@ -5,4 +5,9 @@ - -+ {% block orphan %} -+ {{ block.super }} -+ An 'orphan' block that refers to a non-existent super block. -+ Contents of this block are ignored. -+ {% endblock %} - {% endspaceless %}{% endblock %} diff --git a/django-compressor-make-compress-run-through.patch b/django-compressor-make-compress-run-through.patch deleted file mode 100644 index 4252405..0000000 --- a/django-compressor-make-compress-run-through.patch +++ /dev/null @@ -1,162 +0,0 @@ -From 72b33ddbcdc41eb5af42b86329d81d96894a9d10 Mon Sep 17 00:00:00 2001 -From: Carlton Gibson -Date: Tue, 10 Mar 2015 20:04:07 +0100 -Subject: [PATCH] Make `compress` command (at least) run through on 1.8 - -FAILED (failures=15, errors=15, skipped=1) - -AssertionError: 2 != 12 -OfflineGenerationError: ... key "XYZ" missing ... ---- - compressor/management/commands/compress.py | 41 +++++++++++++++++------------- - compressor/offline/django.py | 27 ++++++++++++++------ - 2 files changed, 43 insertions(+), 25 deletions(-) - -diff --git a/compressor/management/commands/compress.py b/compressor/management/commands/compress.py -index 6be215e..0bc436a 100644 ---- a/compressor/management/commands/compress.py -+++ b/compressor/management/commands/compress.py -@@ -5,6 +5,7 @@ - from fnmatch import fnmatch - from optparse import make_option - -+import django - from django.core.management.base import NoArgsCommand, CommandError - import django.template - from django.template import Context -@@ -53,24 +54,30 @@ class Command(NoArgsCommand): - requires_model_validation = False - - def get_loaders(self): -- from django.template.loader import template_source_loaders -- if template_source_loaders is None: -- try: -- from django.template.loader import ( -- find_template as finder_func) -- except ImportError: -- from django.template.loader import ( -- find_template_source as finder_func) # noqa -- try: -- # Force django to calculate template_source_loaders from -- # TEMPLATE_LOADERS settings, by asking to find a dummy template -- source, name = finder_func('test') -- except django.template.TemplateDoesNotExist: -- pass -- # Reload template_source_loaders now that it has been calculated ; -- # it should contain the list of valid, instanciated template loaders -- # to use. -+ if django.VERSION < (1, 8): - from django.template.loader import template_source_loaders -+ if template_source_loaders is None: -+ try: -+ from django.template.loader import ( -+ find_template as finder_func) -+ except ImportError: -+ from django.template.loader import ( -+ find_template_source as finder_func) # noqa -+ try: -+ # Force django to calculate template_source_loaders from -+ # TEMPLATE_LOADERS settings, by asking to find a dummy template -+ source, name = finder_func('test') -+ except django.template.TemplateDoesNotExist: -+ pass -+ # Reload template_source_loaders now that it has been calculated ; -+ # it should contain the list of valid, instanciated template loaders -+ # to use. -+ from django.template.loader import template_source_loaders -+ else: -+ from django.template import engines -+ template_source_loaders = [] -+ for e in engines.all(): -+ template_source_loaders.extend(e.engine.get_template_loaders(e.engine.loaders)) - loaders = [] - # If template loader is CachedTemplateLoader, return the loaders - # that it wraps around. So if we have -diff --git a/compressor/offline/django.py b/compressor/offline/django.py -index b326093..107c6e4 100644 ---- a/compressor/offline/django.py -+++ b/compressor/offline/django.py -@@ -1,6 +1,7 @@ - from __future__ import absolute_import - from copy import copy - -+import django - from django import template - from django.conf import settings - from django.template import Context -@@ -14,7 +15,7 @@ - from compressor.templatetags.compress import CompressorNode - - --def handle_extendsnode(extendsnode, block_context=None): -+def handle_extendsnode(extendsnode, block_context=None, original=None): - """Create a copy of Node tree of a derived template replacing - all blocks tags with the nodes of appropriate blocks. - Also handles {{ block.super }} tags. -@@ -26,6 +27,9 @@ def handle_extendsnode(extendsnode, block_context=None): - block_context.add_blocks(blocks) - - context = Context(settings.COMPRESS_OFFLINE_CONTEXT) -+ if original is not None: -+ context.template = original -+ - compiled_parent = extendsnode.get_parent(context) - parent_nodelist = compiled_parent.nodelist - # If the parent template has an ExtendsNode it is not the root. -@@ -33,7 +37,7 @@ def handle_extendsnode(extendsnode, block_context=None): - # The ExtendsNode has to be the first non-text node. - if not isinstance(node, TextNode): - if isinstance(node, ExtendsNode): -- return handle_extendsnode(node, block_context) -+ return handle_extendsnode(node, block_context, original) - break - # Add blocks of the root template to block context. - blocks = dict((n.name, n) for n in -@@ -95,7 +99,10 @@ def __init__(self, charset): - - def parse(self, template_name): - try: -- return get_template(template_name) -+ if django.VERSION < (1, 8): -+ return get_template(template_name) -+ else: -+ return get_template(template_name).template - except template.TemplateSyntaxError as e: - raise TemplateSyntaxError(str(e)) - except template.TemplateDoesNotExist as e: -@@ -111,15 +118,17 @@ def process_node(self, template, context, node): - pass - - def render_nodelist(self, template, context, node): -+ if django.VERSION >= (1, 8): -+ context.template = template - return node.nodelist.render(context) - - def render_node(self, template, context, node): - return node.render(context, forced=True) - -- def get_nodelist(self, node): -+ def get_nodelist(self, node, original=None): - if isinstance(node, ExtendsNode): - try: -- return handle_extendsnode(node) -+ return handle_extendsnode(node, block_context=None, original=original) - except template.TemplateSyntaxError as e: - raise TemplateSyntaxError(str(e)) - except template.TemplateDoesNotExist as e: -@@ -134,10 +143,12 @@ def get_nodelist(self, node): - nodelist = getattr(node, 'nodelist', []) - return nodelist - -- def walk_nodes(self, node): -- for node in self.get_nodelist(node): -+ def walk_nodes(self, node, original=None): -+ if django.VERSION >= (1, 8) and original is None: -+ original = node -+ for node in self.get_nodelist(node, original): - if isinstance(node, CompressorNode) and node.is_offline_compression_enabled(forced=True): - yield node - else: -- for node in self.walk_nodes(node): -+ for node in self.walk_nodes(node, original): - yield node diff --git a/django-compressor-use-get_template.patch b/django-compressor-use-get_template.patch deleted file mode 100644 index b890d49..0000000 --- a/django-compressor-use-get_template.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c8495264b503a595fbc89e6c8a83a402eff445c6 Mon Sep 17 00:00:00 2001 -From: Mathieu Pillard -Date: Sun, 25 May 2014 14:09:33 +0200 -Subject: [PATCH] Use get_template() when dealing with django templates - ---- - compressor/offline/django.py | 16 +++++++--------- - 1 file changed, 7 insertions(+), 9 deletions(-) - -diff --git a/compressor/offline/django.py b/compressor/offline/django.py -index 6541471..3986562 100644 ---- a/compressor/offline/django.py -+++ b/compressor/offline/django.py -@@ -1,13 +1,12 @@ - from __future__ import absolute_import --import io - from copy import copy - - from django import template - from django.conf import settings --from django.template import Template - from django.template import Context - from django.template.base import Node, VariableNode, TextNode, NodeList - from django.template.defaulttags import IfNode -+from django.template.loader import get_template - from django.template.loader_tags import ExtendsNode, BlockNode, BlockContext - - -@@ -93,13 +92,12 @@ def __init__(self, charset): - self.charset = charset - - def parse(self, template_name): -- with io.open(template_name, mode='rb') as file: -- try: -- return Template(file.read().decode(self.charset)) -- except template.TemplateSyntaxError as e: -- raise TemplateSyntaxError(str(e)) -- except template.TemplateDoesNotExist as e: -- raise TemplateDoesNotExist(str(e)) -+ try: -+ return get_template(template_name) -+ except template.TemplateSyntaxError as e: -+ raise TemplateSyntaxError(str(e)) -+ except template.TemplateDoesNotExist as e: -+ raise TemplateDoesNotExist(str(e)) - - def process_template(self, template, context): - return True diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 22e8813..a36c1d0 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -8,7 +8,7 @@ parsed and searched for CSS or JS. These styles and scripts are subsequently\ processed with optional, configurable compilers and filters. Name: python-django-compressor -Version: 4.1 +Version: 4.4 Release: %autorelease Summary: Compresses linked and inline JavaScript or CSS into single cached files diff --git a/rdep-version.patch b/rdep-version.patch index 16a9fe2..73e620c 100644 --- a/rdep-version.patch +++ b/rdep-version.patch @@ -1,12 +1,12 @@ ---- a/setup.py 2022-08-17 14:46:30.186903576 +0300 -+++ b/setup.py 2022-08-17 14:46:42.507861281 +0300 -@@ -149,7 +149,7 @@ +--- a/setup.py ++++ b/setup.py +@@ -164,7 +164,7 @@ setup( zip_safe=False, install_requires=[ - 'django-appconf >= 1.0.3', -- 'rcssmin == 1.1.0', -- 'rjsmin == 1.2.0', -+ 'rcssmin >= 1.1.0', -+ 'rjsmin >= 1.2.0', + "django-appconf >= 1.0.3", +- "rcssmin == 1.1.1", +- "rjsmin == 1.2.1", ++ "rcssmin >= 1.1.1", ++ "rjsmin >= 1.2.1", ], ) diff --git a/sources b/sources index f9d77cb..3139d48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (django-compressor-4.1.tar.gz) = eb1e4fc5d9ada8fb32a1059c87b447735cf0e1c40853b2313b5f7f5d1c9cf3c66d96ebf40a721175db5fe721c44b077bc026270d59e90890e1807125a38a33a1 +SHA512 (django-compressor-4.4.tar.gz) = 4fb0fcb1f11d73a724d4d3161b4964f9b4a5bf6ec674d198756ad262d9983528a605aadde6bb10ef2054e477ac08fbc0397242e8969f47d3710bec6f21215086 From 4ec455047aae9d2ff93fb3ab775ae4a6a7556c97 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 00:46:41 +0000 Subject: [PATCH 42/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f73b71e9e92831b1840f71143e25f469fc73c345 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 03:27:20 +0000 Subject: [PATCH 43/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From c63dc811bdf235bacebe4d266df75c79c20d9b94 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 8 Jun 2024 01:28:29 +0200 Subject: [PATCH 44/58] Rebuilt for Python 3.13 From 78da4b37180ea1b555f4e4133466c94e63fe2ec1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 11:02:24 +0000 Subject: [PATCH 45/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 35c449bbe33f8e1ca41e8ec9637dd139f3fed7ba Mon Sep 17 00:00:00 2001 From: karolinku Date: Fri, 2 Aug 2024 12:05:49 +0200 Subject: [PATCH 46/58] Replace git source with pypi one There has been discovered that github source differs from pypi one which is causing errors for 4.4 version, i.e. dicovering previous version 4.3 with setupy.py --version. --- .gitignore | 1 + python-django-compressor.spec | 7 ++++--- sources | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 97b6fa0..8e9edb6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /python-django-compressor-*.tar.gz /django-compressor-*.tar.gz +/django_compressor-4.4.tar.gz diff --git a/python-django-compressor.spec b/python-django-compressor.spec index a36c1d0..09c0c1e 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,4 +1,5 @@ %global srcname django-compressor +%global pypi_name django_compressor %global _desc\ Django Compressor combines and compresses linked and inline Javascript\ or CSS in a Django templates into cacheable static files by using the\ @@ -14,7 +15,7 @@ Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT URL: https://github.com/django-compressor/django-compressor -Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz +Source0: %{pypi_source django_compressor} Patch0: rdep-version.patch @@ -35,8 +36,8 @@ Obsoletes: python2-%{srcname} < 2.1-6 Obsoletes: python-%{srcname} < 2.1-6 %prep -%autosetup -p1 -n %{srcname}-%{version} - +%autosetup -p1 -n %{pypi_name}-%{version} + %generate_buildrequires %pyproject_buildrequires diff --git a/sources b/sources index 3139d48..2cab061 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (django-compressor-4.4.tar.gz) = 4fb0fcb1f11d73a724d4d3161b4964f9b4a5bf6ec674d198756ad262d9983528a605aadde6bb10ef2054e477ac08fbc0397242e8969f47d3710bec6f21215086 +SHA512 (django_compressor-4.4.tar.gz) = 54a3443f8900aca89534bb792f6e1d7d46ec9cec81c2bb2e019ea2a0e861845805d187748cc12531209be25c3d9f5dd3cd0f019fb9f439c9b1e7ad2a5785c6c8 From 66ec10d2b95cc3b6201afacb051ccf934e3b5a9b Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Fri, 20 Dec 2024 16:28:25 -0600 Subject: [PATCH 47/58] Update to 4.5.1 (resolves: rhbz#2292613) Signed-off-by: Michel Lind --- .gitignore | 1 + python-django-compressor.spec | 2 +- rdep-version.patch | 10 +++++----- sources | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 8e9edb6..19ab6e1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /python-django-compressor-*.tar.gz /django-compressor-*.tar.gz /django_compressor-4.4.tar.gz +/django_compressor-4.5.1.tar.gz diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 09c0c1e..5f2e927 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -9,7 +9,7 @@ parsed and searched for CSS or JS. These styles and scripts are subsequently\ processed with optional, configurable compilers and filters. Name: python-django-compressor -Version: 4.4 +Version: 4.5.1 Release: %autorelease Summary: Compresses linked and inline JavaScript or CSS into single cached files diff --git a/rdep-version.patch b/rdep-version.patch index 73e620c..8a0e5b4 100644 --- a/rdep-version.patch +++ b/rdep-version.patch @@ -1,12 +1,12 @@ --- a/setup.py +++ b/setup.py @@ -164,7 +164,7 @@ setup( - zip_safe=False, install_requires=[ + "Django >= 4.2", "django-appconf >= 1.0.3", -- "rcssmin == 1.1.1", -- "rjsmin == 1.2.1", -+ "rcssmin >= 1.1.1", -+ "rjsmin >= 1.2.1", +- "rcssmin == 1.1.2", +- "rjsmin == 1.2.2", ++ "rcssmin >= 1.1.2", ++ "rjsmin >= 1.2.2", ], ) diff --git a/sources b/sources index 2cab061..153f926 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (django_compressor-4.4.tar.gz) = 54a3443f8900aca89534bb792f6e1d7d46ec9cec81c2bb2e019ea2a0e861845805d187748cc12531209be25c3d9f5dd3cd0f019fb9f439c9b1e7ad2a5785c6c8 +SHA512 (django_compressor-4.5.1.tar.gz) = 696e032de9c6cd39a924e28e98a476f49fc25629ec1f1d446d78e6be93695435a9cf1b3222807dd6644efd19955c2252648105bacc207b2ee5c00a6338e7046a From 8da4cb4feaf06a156faf6b660983d0cda733727f Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Fri, 20 Dec 2024 16:52:55 -0600 Subject: [PATCH 48/58] Fix building with Python 3.14; resolves: rhbz#2322719 Signed-off-by: Michel Lind --- django-compressor-py314-ast.diff | 11 +++++++++++ python-django-compressor.spec | 5 ++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 django-compressor-py314-ast.diff diff --git a/django-compressor-py314-ast.diff b/django-compressor-py314-ast.diff new file mode 100644 index 0000000..75d8a43 --- /dev/null +++ b/django-compressor-py314-ast.diff @@ -0,0 +1,11 @@ +--- a/setup.py ++++ b/setup.py +@@ -14,7 +14,7 @@ class VersionFinder(ast.NodeVisitor): + + def visit_Assign(self, node): + if node.targets[0].id == "__version__": +- self.version = node.value.s ++ self.version = node.value.value + + + def read(*parts): diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 5f2e927..1b34fd5 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -17,7 +17,10 @@ License: MIT URL: https://github.com/django-compressor/django-compressor Source0: %{pypi_source django_compressor} -Patch0: rdep-version.patch +Patch: rdep-version.patch +# Fix for https://github.com/django-compressor/django-compressor/issues/1270 +# https://github.com/django-compressor/django-compressor/pull/1271 +Patch: django-compressor-py314-ast.diff BuildArch: noarch From d38151b86e7b79c441e10650ed63b1e5a8c7d16d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 13:39:33 +0000 Subject: [PATCH 49/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From a60ba9a21fbe98cd6639524529da9c18184ab9ad Mon Sep 17 00:00:00 2001 From: Tim Landscheidt Date: Sun, 23 Mar 2025 18:15:48 +0000 Subject: [PATCH 50/58] Fix Obsoletes fields for python3-django-compressor --- python-django-compressor.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 1b34fd5..775e876 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -31,13 +31,12 @@ BuildRequires: python3-devel %package -n python3-%{srcname} Summary: %{summary} -%description -n python3-%{srcname} -%_desc - # Added in f28 cycle. Obsoletes: python2-%{srcname} < 2.1-6 Obsoletes: python-%{srcname} < 2.1-6 +%description -n python3-%{srcname} %_desc + %prep %autosetup -p1 -n %{pypi_name}-%{version} From 20499935df4d239c0f865e2fdb87d3be86079c8b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 12:20:58 +0200 Subject: [PATCH 51/58] Rebuilt for Python 3.14 From e8cf3aab29af92161605db1d777e30bb06ba5230 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 07:34:48 +0000 Subject: [PATCH 52/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 2c695380716ae88643511d1cbf12cd6cb7b6c5a5 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 13:36:42 +0200 Subject: [PATCH 53/58] Rebuilt for Python 3.14.0rc2 bytecode From a3b82fdbcfefd3f282b9fdb9beede48aaeae0317 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 13:09:36 +0200 Subject: [PATCH 54/58] Rebuilt for Python 3.14.0rc3 bytecode From 1a5548185bfba43986d492de943b06dad703ed16 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Wed, 10 Dec 2025 22:00:43 +0000 Subject: [PATCH 55/58] Enable Packit [skip changelog] Signed-off-by: Michel Lind --- packit.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 packit.yaml diff --git a/packit.yaml b/packit.yaml new file mode 100644 index 0000000..fdf84eb --- /dev/null +++ b/packit.yaml @@ -0,0 +1,16 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +copy_upstream_release_description: false + +jobs: +- job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide + +- job: koji_build + trigger: commit + allowed_committers: ['packit'] + dist_git_branches: + - fedora-rawhide From fcfc8dd48490e30a9b45803e241b6b3797a18f1e Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Wed, 10 Dec 2025 22:02:17 +0000 Subject: [PATCH 56/58] Update to 4.6.0 upstream release - Resolves: rhbz#2413786 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 3 +++ python-django-compressor.spec | 2 +- sources | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 README.packit diff --git a/.gitignore b/.gitignore index 19ab6e1..e5d2aa8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /django-compressor-*.tar.gz /django_compressor-4.4.tar.gz /django_compressor-4.5.1.tar.gz +/django_compressor-4.6.0.tar.gz diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..2511bf4 --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 1.12.0. diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 775e876..f039f17 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -9,7 +9,7 @@ parsed and searched for CSS or JS. These styles and scripts are subsequently\ processed with optional, configurable compilers and filters. Name: python-django-compressor -Version: 4.5.1 +Version: 4.6.0 Release: %autorelease Summary: Compresses linked and inline JavaScript or CSS into single cached files diff --git a/sources b/sources index 153f926..dec55a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (django_compressor-4.5.1.tar.gz) = 696e032de9c6cd39a924e28e98a476f49fc25629ec1f1d446d78e6be93695435a9cf1b3222807dd6644efd19955c2252648105bacc207b2ee5c00a6338e7046a +SHA512 (django_compressor-4.6.0.tar.gz) = 5bb5fc01b3beb022623b6409f710640eb51196349c0268c1d85239ce2c6a8889761c3efb16e9cc4e7b1d6bdd7f3a16ea8abf4ba9083a03500bcd10344457e0a2 From c47467d43f54b873c2abcc1c30938654d325238c Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Wed, 10 Dec 2025 22:45:58 +0000 Subject: [PATCH 57/58] Remove unneeded patches Signed-off-by: Michel Lind --- python-django-compressor.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index f039f17..16fcfb1 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -17,11 +17,6 @@ License: MIT URL: https://github.com/django-compressor/django-compressor Source0: %{pypi_source django_compressor} -Patch: rdep-version.patch -# Fix for https://github.com/django-compressor/django-compressor/issues/1270 -# https://github.com/django-compressor/django-compressor/pull/1271 -Patch: django-compressor-py314-ast.diff - BuildArch: noarch BuildRequires: python3-devel From 4088983b633af3a468230b8ddd036885276aca54 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Thu, 11 Dec 2025 17:14:51 +0000 Subject: [PATCH 58/58] Revert pyproject.toml conversion when building with older setuptools - Drop patches Signed-off-by: Michel Lind --- django-compressor-py314-ast.diff | 11 -- python-django-compressor.spec | 13 +++ rdep-version.patch | 12 --- setup.py | 172 +++++++++++++++++++++++++++++++ 4 files changed, 185 insertions(+), 23 deletions(-) delete mode 100644 django-compressor-py314-ast.diff delete mode 100644 rdep-version.patch create mode 100644 setup.py diff --git a/django-compressor-py314-ast.diff b/django-compressor-py314-ast.diff deleted file mode 100644 index 75d8a43..0000000 --- a/django-compressor-py314-ast.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -14,7 +14,7 @@ class VersionFinder(ast.NodeVisitor): - - def visit_Assign(self, node): - if node.targets[0].id == "__version__": -- self.version = node.value.s -+ self.version = node.value.value - - - def read(*parts): diff --git a/python-django-compressor.spec b/python-django-compressor.spec index 16fcfb1..fa81435 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -8,6 +8,13 @@ or CSS in a Django templates into cacheable static files by using the\ parsed and searched for CSS or JS. These styles and scripts are subsequently\ processed with optional, configurable compilers and filters. +# setuptools < 77.0.3 +%if (%{defined fedora} && 0%{?fedora} <= 42) || (%{defined rhel} && 0%{?rhel} <= 10) +%bcond old_setuptools 1 +%else +%bcond old_setuptools 0 +%endif + Name: python-django-compressor Version: 4.6.0 Release: %autorelease @@ -16,6 +23,8 @@ Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT URL: https://github.com/django-compressor/django-compressor Source0: %{pypi_source django_compressor} +# deleted in 4e543307 - migration to pyproject.toml +Source1: setup.py BuildArch: noarch @@ -34,6 +43,10 @@ Obsoletes: python-%{srcname} < 2.1-6 %prep %autosetup -p1 -n %{pypi_name}-%{version} +%if %{with old_setuptools} +rm pyproject.toml +cp -p %{SOURCE1} setup.py +%endif %generate_buildrequires %pyproject_buildrequires diff --git a/rdep-version.patch b/rdep-version.patch deleted file mode 100644 index 8a0e5b4..0000000 --- a/rdep-version.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -164,7 +164,7 @@ setup( - install_requires=[ - "Django >= 4.2", - "django-appconf >= 1.0.3", -- "rcssmin == 1.1.2", -- "rjsmin == 1.2.2", -+ "rcssmin >= 1.1.2", -+ "rjsmin >= 1.2.2", - ], - ) diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..be846ae --- /dev/null +++ b/setup.py @@ -0,0 +1,172 @@ +import ast +import codecs +import os +import sys +from fnmatch import fnmatchcase +from pathlib import Path + +from setuptools import find_packages, setup + + +class VersionFinder(ast.NodeVisitor): + def __init__(self): + self.version = None + + def visit_Assign(self, node): + if node.targets[0].id == "__version__": + self.version = node.value.value + + +def read(*parts): + filename = os.path.join(os.path.dirname(__file__), *parts) + with codecs.open(filename, encoding="utf-8") as fp: + return fp.read() + + +def find_version(*parts): + finder = VersionFinder() + finder.visit(ast.parse(read(*parts))) + return finder.version + + +# Provided as an attribute, so you can append to these instead +# of replicating them: +standard_exclude = ("*.py", "*.pyc", "*$py.class", "*~", ".*", "*.bak") +standard_exclude_directories = ( + ".*", + "CVS", + "_darcs", + "./build", + "./dist", + "EGG-INFO", + "*.egg-info", +) + + +# (c) 2005 Ian Bicking and contributors; written for Paste (http://pythonpaste.org) +# Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php +# Note: you may want to copy this into your setup.py file verbatim, as +# you can't import this from another package, when you don't know if +# that package is installed yet. +def find_package_data( + where=".", + package="", + exclude=standard_exclude, + exclude_directories=standard_exclude_directories, + only_in_packages=True, + show_ignored=False, +): + """ + Return a dictionary suitable for use in ``package_data`` + in a distutils ``setup.py`` file. + + The dictionary looks like:: + + {'package': [files]} + + Where ``files`` is a list of all the files in that package that + don't match anything in ``exclude``. + + If ``only_in_packages`` is true, then top-level directories that + are not packages won't be included (but directories under packages + will). + + Directories matching any pattern in ``exclude_directories`` will + be ignored; by default directories with leading ``.``, ``CVS``, + and ``_darcs`` will be ignored. + + If ``show_ignored`` is true, then all the files that aren't + included in package data are shown on stderr (for debugging + purposes). + + Note patterns use wildcards, or can be exact paths (including + leading ``./``), and all searching is case-insensitive. + """ + + out = {} + stack = [(str(Path(where)), "", package, only_in_packages)] + while stack: + where, prefix, package, only_in_packages = stack.pop(0) + for name in os.listdir(where): + fn = os.path.join(where, name) + if os.path.isdir(fn): + bad_name = False + for pattern in exclude_directories: + if fnmatchcase(name, pattern) or fn.lower() == pattern.lower(): + bad_name = True + if show_ignored: + print( + "Directory %s ignored by pattern %s" % (fn, pattern), + file=sys.stderr, + ) + break + if bad_name: + continue + if os.path.isfile(os.path.join(fn, "__init__.py")) and not prefix: + if not package: + new_package = name + else: + new_package = package + "." + name + stack.append((fn, "", new_package, False)) + else: + stack.append((fn, prefix + name + "/", package, only_in_packages)) + elif package or not only_in_packages: + # is a file + bad_name = False + for pattern in exclude: + if fnmatchcase(name, pattern) or fn.lower() == pattern.lower(): + bad_name = True + if show_ignored: + print( + "File %s ignored by pattern %s" % (fn, pattern), + file=sys.stderr, + ) + break + if bad_name: + continue + out.setdefault(package, []).append(prefix + name) + return out + + +setup( + name="django_compressor", + version=find_version("compressor", "__init__.py"), + url="https://django-compressor.readthedocs.io/en/latest/", + project_urls={ + "Source": "https://github.com/django-compressor/django-compressor", + }, + license="MIT", + description=( + "Compresses linked and inline JavaScript or CSS into single cached files.", + ), + long_description=read("README.rst"), + maintainer="Mathieu Pillard", + packages=find_packages(), + package_data=find_package_data(), + classifiers=[ + "Development Status :: 5 - Production/Stable", + "Framework :: Django", + "Framework :: Django :: 4.2", + "Framework :: Django :: 5.0", + "Framework :: Django :: 5.1", + "Framework :: Django :: 5.2", + "Intended Audience :: Developers", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", + "Programming Language :: Python", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", + "Topic :: Internet :: WWW/HTTP", + ], + zip_safe=False, + python_requires=">=3.10", + install_requires=[ + "Django >= 4.2", + "django-appconf >= 1.0.3", + "rcssmin >= 1.2.1", + "rjsmin >= 1.2.4", + ], +)