diff --git a/Backport-Fix-rst-error-in-README-and-HISTORY-791.patch b/Backport-Fix-rst-error-in-README-and-HISTORY-791.patch new file mode 100644 index 0000000000000000000000000000000000000000..7eed8799b16c75e71fa1d282860ae479fb32677e --- /dev/null +++ b/Backport-Fix-rst-error-in-README-and-HISTORY-791.patch @@ -0,0 +1,39 @@ +From 3d828d2f44e5429f79c98460bc5f04d098f7922b Mon Sep 17 00:00:00 2001 +From: Peyman Salehi +Date: Thu, 9 Mar 2023 13:36:20 +0330 +Subject: [PATCH] Fix rst error in README and HISTORY (#791) + +--- + HISTORY.rst | 2 +- + README.rst | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/HISTORY.rst b/HISTORY.rst +index 40a6ad9..e972378 100644 +--- a/HISTORY.rst ++++ b/HISTORY.rst +@@ -4,7 +4,7 @@ History + ======= + + 2.1.0 +-========== ++===== + + * Update README.rst and add Pipeline overview image. + * Add TypeScript compiler support. +diff --git a/README.rst b/README.rst +index 11c9b49..184f81a 100644 +--- a/README.rst ++++ b/README.rst +@@ -37,7 +37,7 @@ To install it, simply: + + + Quickstart +-------- ++---------- + + Pipeline compiles and compress your assets files from + ``STATICFILES_DIRS`` to your ``STATIC_ROOT`` when you run Django's +-- +2.9.3.windows.1 + diff --git a/Backport-Lint-Python-with-Ruff-790.patch b/Backport-Lint-Python-with-Ruff-790.patch new file mode 100644 index 0000000000000000000000000000000000000000..48984dddd1906f0905a073efc9de79f6a5e004c8 --- /dev/null +++ b/Backport-Lint-Python-with-Ruff-790.patch @@ -0,0 +1,28 @@ +From 275c4b5e659a1b06a8741c2dfb4f3d1bc8ed91ef Mon Sep 17 00:00:00 2001 +From: Christian Clauss +Date: Fri, 10 Mar 2023 13:29:26 +0100 +Subject: [PATCH] Lint Python with Ruff (#790) + +--- + .github/workflows/test.yml | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml +index 570772c..72d977e 100644 +--- a/.github/workflows/test.yml ++++ b/.github/workflows/test.yml +@@ -85,3 +85,11 @@ jobs: + uses: codecov/codecov-action@v3 + with: + name: Python ${{ matrix.python-version }} ++ ++ ruff: ++ runs-on: ubuntu-latest ++ steps: ++ - uses: actions/checkout@v3 ++ - run: pip install --user ruff ++ - run: ruff --extend-select=C4,C9,I,PLC,PLE,PLR,U --format=github ++ --ignore=C414,I001,UP032 --target-version=py37 . +-- +2.9.3.windows.1 + diff --git a/Backport-Use-dict-instead-of-OrderedDict-792.patch b/Backport-Use-dict-instead-of-OrderedDict-792.patch new file mode 100644 index 0000000000000000000000000000000000000000..318a823bd0754440f0163d0d7d3ab54711cc1745 --- /dev/null +++ b/Backport-Use-dict-instead-of-OrderedDict-792.patch @@ -0,0 +1,31 @@ +From 38deeb512dada011dd5d40117769e28667a2261d Mon Sep 17 00:00:00 2001 +From: Peyman Salehi +Date: Mon, 3 Apr 2023 19:04:07 +0330 +Subject: [PATCH] Use dict instead of OrderedDict (#792) + +--- + pipeline/collector.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/pipeline/collector.py b/pipeline/collector.py +index 5070d34..70b7fed 100644 +--- a/pipeline/collector.py ++++ b/pipeline/collector.py +@@ -1,5 +1,4 @@ + import os +-from collections import OrderedDict + + import django + from django.contrib.staticfiles import finders +@@ -33,7 +32,7 @@ class Collector: + if self.request and self.request is request: + return + self.request = request +- found_files = OrderedDict() ++ found_files = {} + for finder in finders.get_finders(): + # Ignore our finder to avoid looping + if isinstance(finder, PipelineFinder): +-- +2.9.3.windows.1 + diff --git a/python-django-pipeline.spec b/python-django-pipeline.spec index 692575b71e7c79f968e2b3943486c7af5df45f9d..4164d15e0aa426ffa9a1b0bae9d216dac5f39e9f 100644 --- a/python-django-pipeline.spec +++ b/python-django-pipeline.spec @@ -1,13 +1,16 @@ %global _empty_manifest_terminate_build 0 Name: python-django-pipeline Version: 2.1.0 -Release: 1 +Release: 2 Summary: Pipeline is an asset packaging library for Django. License: MIT URL: https://github.com/jazzband/django-pipeline Source0: https://files.pythonhosted.org/packages/source/d/django-pipeline/django-pipeline-%{version}.tar.gz BuildArch: noarch +Patch0: Backport-Fix-rst-error-in-README-and-HISTORY-791.patch +Patch1: Backport-Lint-Python-with-Ruff-790.patch +Patch2: Backport-Use-dict-instead-of-OrderedDict-792.patch %description Pipeline is an asset packaging library for Django, providing both CSS and @@ -74,6 +77,11 @@ mv %{buildroot}/doclist.lst . %{_docdir}/* %changelog +* Fri Jun 21 2024 wuzhaomin - 2.1.0-2 +- Fix rst error in README and HISTORY (#791) +- Lint Python with Ruff (#790) +- Use dict instead of OrderedDict (#792) + * Mon Apr 10 2023 yaoxin - 2.1.0-1 - Update to 2.1.0