Compare commits

...
Sign in to create a new pull request.

17 commits

Author SHA1 Message Date
Michel Lind
4088983b63
Revert pyproject.toml conversion when building with older setuptools
- Drop patches

Signed-off-by: Michel Lind <salimma@fedoraproject.org>
2025-12-11 17:14:51 +00:00
Michel Lind
c47467d43f
Remove unneeded patches
Signed-off-by: Michel Lind <salimma@fedoraproject.org>
2025-12-10 22:45:58 +00:00
Michel Lind
fcfc8dd484
Update to 4.6.0 upstream release
- Resolves: rhbz#2413786

Commit authored by Packit automation (https://packit.dev/)
2025-12-10 22:02:17 +00:00
Michel Lind
1a5548185b
Enable Packit
[skip changelog]

Signed-off-by: Michel Lind <salimma@fedoraproject.org>
2025-12-10 22:00:43 +00:00
Python Maint
a3b82fdbcf Rebuilt for Python 3.14.0rc3 bytecode 2025-09-19 13:09:36 +02:00
Python Maint
2c69538071 Rebuilt for Python 3.14.0rc2 bytecode 2025-08-15 13:36:42 +02:00
Fedora Release Engineering
e8cf3aab29 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 07:34:48 +00:00
Python Maint
20499935df Rebuilt for Python 3.14 2025-06-03 12:20:58 +02:00
Tim Landscheidt
a60ba9a21f Fix Obsoletes fields for python3-django-compressor 2025-03-23 18:18:02 +00:00
Fedora Release Engineering
d38151b86e Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-18 13:39:33 +00:00
Michel Lind
8da4cb4fea
Fix building with Python 3.14; resolves: rhbz#2322719
Signed-off-by: Michel Lind <salimma@fedoraproject.org>
2024-12-20 16:52:55 -06:00
Michel Lind
66ec10d2b9
Update to 4.5.1 (resolves: rhbz#2292613)
Signed-off-by: Michel Lind <salimma@fedoraproject.org>
2024-12-20 16:28:25 -06:00
karolinku
35c449bbe3 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.
2024-08-06 15:51:12 +02:00
Fedora Release Engineering
78da4b3718 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-19 11:02:24 +00:00
Python Maint
c63dc811bd Rebuilt for Python 3.13 2024-06-08 01:28:29 +02:00
Fedora Release Engineering
f73b71e9e9 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-26 03:27:20 +00:00
Fedora Release Engineering
4ec455047a Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-22 00:46:41 +00:00
7 changed files with 215 additions and 22 deletions

3
.gitignore vendored
View file

@ -1,2 +1,5 @@
/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

3
README.packit Normal file
View file

@ -0,0 +1,3 @@
This repository is maintained by packit.
https://packit.dev/
The file was generated using packit 1.12.0.

16
packit.yaml Normal file
View file

@ -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

View file

@ -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\
@ -7,16 +8,23 @@ 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.4
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: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
Patch0: rdep-version.patch
Source0: %{pypi_source django_compressor}
# deleted in 4e543307 - migration to pyproject.toml
Source1: setup.py
BuildArch: noarch
@ -27,16 +35,19 @@ 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 %{srcname}-%{version}
%autosetup -p1 -n %{pypi_name}-%{version}
%if %{with old_setuptools}
rm pyproject.toml
cp -p %{SOURCE1} setup.py
%endif
%generate_buildrequires
%pyproject_buildrequires

View file

@ -1,12 +0,0 @@
--- 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",
],
)

172
setup.py Normal file
View file

@ -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",
],
)

View file

@ -1 +1 @@
SHA512 (django-compressor-4.4.tar.gz) = 4fb0fcb1f11d73a724d4d3161b4964f9b4a5bf6ec674d198756ad262d9983528a605aadde6bb10ef2054e477ac08fbc0397242e8969f47d3710bec6f21215086
SHA512 (django_compressor-4.6.0.tar.gz) = 5bb5fc01b3beb022623b6409f710640eb51196349c0268c1d85239ce2c6a8889761c3efb16e9cc4e7b1d6bdd7f3a16ea8abf4ba9083a03500bcd10344457e0a2