diff --git a/.gitignore b/.gitignore index e5d2aa8..8e9edb6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ /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 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/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..09c0c1e 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -8,23 +8,16 @@ 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 +Version: 4.4 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 + +Patch0: rdep-version.patch BuildArch: noarch @@ -35,18 +28,15 @@ 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} -%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 new file mode 100644 index 0000000..73e620c --- /dev/null +++ b/rdep-version.patch @@ -0,0 +1,12 @@ +--- a/setup.py ++++ b/setup.py +@@ -164,7 +164,7 @@ setup( + zip_safe=False, + install_requires=[ + "django-appconf >= 1.0.3", +- "rcssmin == 1.1.1", +- "rjsmin == 1.2.1", ++ "rcssmin >= 1.1.1", ++ "rjsmin >= 1.2.1", + ], + ) 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..2cab061 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (django_compressor-4.6.0.tar.gz) = 5bb5fc01b3beb022623b6409f710640eb51196349c0268c1d85239ce2c6a8889761c3efb16e9cc4e7b1d6bdd7f3a16ea8abf4ba9083a03500bcd10344457e0a2 +SHA512 (django_compressor-4.4.tar.gz) = 54a3443f8900aca89534bb792f6e1d7d46ec9cec81c2bb2e019ea2a0e861845805d187748cc12531209be25c3d9f5dd3cd0f019fb9f439c9b1e7ad2a5785c6c8