diff --git a/.gitignore b/.gitignore index e5d2aa8..9e07d36 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1 @@ -/python-django-compressor-*.tar.gz -/django-compressor-*.tar.gz -/django_compressor-4.4.tar.gz -/django_compressor-4.5.1.tar.gz -/django_compressor-4.6.0.tar.gz +/django_compressor-1.2.tar.gz diff --git a/README.packit b/README.packit deleted file mode 100644 index 2511bf4..0000000 --- a/README.packit +++ /dev/null @@ -1,3 +0,0 @@ -This repository is maintained by packit. -https://packit.dev/ -The file was generated using packit 1.12.0. diff --git a/changelog b/changelog deleted file mode 100644 index 7593c83..0000000 --- a/changelog +++ /dev/null @@ -1,124 +0,0 @@ -* 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/packit.yaml b/packit.yaml deleted file mode 100644 index fdf84eb..0000000 --- a/packit.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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 diff --git a/python-django-compressor.spec b/python-django-compressor.spec index fa81435..d3b0440 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,65 +1,69 @@ -%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\ -``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\ + +Name: python-django-compressor +Version: 1.2 +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/1.2 +Source0: http://pypi.python.org/packages/source/d/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +BuildArch: noarch + +BuildRequires: python2-devel +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 +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. -# 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 -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 - -BuildRequires: python3-devel - -%description %_desc - -%package -n python3-%{srcname} -Summary: %{summary} - -# 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} -%if %{with old_setuptools} -rm pyproject.toml -cp -p %{SOURCE1} setup.py -%endif +%setup -q -n %{pypi_name}-%{version} +# 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 + -%generate_buildrequires -%pyproject_buildrequires %build -%pyproject_wheel +%{__python} setup.py build + %install -%pyproject_install -%pyproject_save_files compressor +%{__python} setup.py install --skip-build --root %{buildroot} -%files -n python3-%{srcname} -f %{pyproject_files} -%doc README.rst + +%files +%doc README.rst LICENSE +%{python_sitelib}/compressor +%{python_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info %changelog -%autochangelog +* 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/setup.py b/setup.py deleted file mode 100644 index be846ae..0000000 --- a/setup.py +++ /dev/null @@ -1,172 +0,0 @@ -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", - ], -) diff --git a/sources b/sources index dec55a4..b3676c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (django_compressor-4.6.0.tar.gz) = 5bb5fc01b3beb022623b6409f710640eb51196349c0268c1d85239ce2c6a8889761c3efb16e9cc4e7b1d6bdd7f3a16ea8abf4ba9083a03500bcd10344457e0a2 +a740f2f67a3532cd0da412f0123e34c5 django_compressor-1.2.tar.gz