Merge master from og repo into our own version

.github/workflows/release.yml

@@ -0,0 +1,40 @@
+name: Release
+
+on:
+  push:
+    tags:
+    - '*'
+
+jobs:
+  build:
+    if: github.repository == 'jazzband/django-taggit'
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+
+      - name: Install dependencies
+        run: |
+          python -m pip install -U pip
+          python -m pip install -U setuptools twine wheel
+
+      - name: Build package
+        run: |
+          python setup.py --version
+          python setup.py sdist --format=gztar bdist_wheel
+          twine check dist/*
+
+      - name: Upload packages to Jazzband
+        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+        uses: pypa/gh-action-pypi-publish@master
+        with:
+          user: jazzband
+          password: ${{ secrets.JAZZBAND_RELEASE_KEY }}
+          repository_url: https://jazzband.co/projects/django-taggit/upload

.github/workflows/test.yml

@@ -0,0 +1,60 @@
+name: Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    name: Python ${{ matrix.python-version }}
+    runs-on: ubuntu-latest
+
+    # The maximum number of minutes to let a workflow run
+    # before GitHub automatically cancels it. Default: 360
+    timeout-minutes: 30
+
+    strategy:
+      # When set to true, GitHub cancels
+      # all in-progress jobs if any matrix job fails.
+      fail-fast: false
+
+      max-parallel: 5
+
+      matrix:
+        python-version:
+          - "3.8"
+          - "3.9"
+          - "3.10"
+          - "3.11"
+          - "3.12"
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Get pip cache dir
+        id: pip-cache
+        run: echo "::set-output name=dir::$(pip cache dir)"
+
+      - name: Cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.pip-cache.outputs.dir }}
+          key: ${{ matrix.python-version }}-v1-${{ hashFiles('**/setup.py') }}-${{ hashFiles('**/tox.ini') }}
+          restore-keys: |
+            ${{ matrix.python-version }}-v1-
+
+      - name: Install Python dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install --upgrade tox tox-gh-actions
+
+      - name: Tox tests
+        run: tox -v
+
+      - name: Upload coverage
+        uses: codecov/codecov-action@v1
+        with:
+          name: Python ${{ matrix.python-version }}

.gitignore

@@ -48,7 +48,6 @@ coverage.xml
 .pytest_cache/
 
 # Translations
-*.mo
 *.pot
 
 # Django stuff:
@@ -102,3 +101,6 @@ venv.bak/
 
 # mypy
 .mypy_cache/
+
+# PyCharm files
+.idea/

.pre-commit-config.yaml

@@ -0,0 +1,25 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.6.0
+    hooks:
+      - id: check-yaml
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+  - repo: https://github.com/psf/black
+    rev: 24.4.2
+    hooks:
+      - id: black
+  - repo: https://github.com/PyCQA/flake8
+    rev: 7.1.0
+    hooks:
+      - id: flake8
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.16.0
+    hooks:
+    -   id: pyupgrade
+        args: [--py37-plus]
+  - repo: https://github.com/adamchainz/django-upgrade
+    rev: 1.19.0
+    hooks:
+    - id: django-upgrade
+      args: [--target-version, "3.2"]

.readthedocs.yml

@@ -0,0 +1,13 @@
+version: 2
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.9"
+
+python:
+  install:
+    - method: pip
+      path: .
+
+sphinx:
+  configuration: docs/conf.py

AUTHORS

@@ -1,5 +1,7 @@
 django-taggit was originally created by Alex Gaynor.
 
+django-taggit-serializer was originally created by Paul Oostenrijk.
+
 The following is a list of much appreciated contributors:
 
 Nathan Borror <nathan@playgroundblues.com>
@@ -16,3 +18,5 @@ Florian Apolloner <apollo13@apolloner.eu>
 Andrew Pryde <andrew@rocketpod.co.uk>
 John Whitlock <jwhitlock@mozilla.com>
 Jon Dufresne <jon.dufresne@gmail.com>
+Pablo Olmedo Dorado <pablolmedorado@gmail.com>
+Steve Reciao <stevenrecio@gmail.com>

CHANGELOG.rst

@@ -1,6 +1,154 @@
 Changelog
 =========
 
+(Unreleased)
+~~~~~~~~~~~~
+* Added a management command (``remove_orphaned_tags``) to remove orphaned tags
+
+6.0.0 (2024-07-27)
+~~~~~~~~~~~~~~~~~~
+
+* By default, order tag items on instances by the primary key. This generally means that they will be ordered by "creation date" for the tag item.
+  The previous behavior for this was that by default tag items were not ordered. In practice tag items often end up ordered by creation date anyways, just due to how databases work, but this was not a guarantee.
+  If you wish to have the old behavior, set ``ordering=[]`` to your ``TaggableManager`` instance.
+  We believe that this should not cause a noticable performance change, and the number of queries involved should not change.
+* Added the ability to merge tags via the admin
+* Add Django 5.0 support (no code changes were needed, but now we test this release).
+* Add Python 3.12 support
+* Add support for dumpdata/loaddata using natural keys
+
+5.0.1 (2023-10-26)
+~~~~~~~~~~~~~~~~~~
+
+* Fix the package metadata to properly reflect the right Django and Python version requirements
+  Release 5.0.0 improperly stated its Django bounds as >=3.2, so people installing without bounds will end up on a version that won't work.
+
+5.0.0 (2023-10-24)
+~~~~~~~~~~~~~~~~~~
+* **Backwards icompatible:** Rename the (``content_type``, ``object_id``) index on ``TaggedItem``.
+  It is very unlikely for this to affect your code itself, and a migration will rename the index. This should not cause any downtime according to my research (Postgres does not lock the table for index renames, and Oracle holds a tiny lock to do it, and the change is only to the metadata, so is not dependent on table size).
+
+* **Backwards incompatible:** Remove the ``.index_together`` and ``.unique_together`` attributes on ``TaggedItem``
+
+  We are instead using ``constraints`` and ``indexes`` to set up these properties.
+* Remove support for Django 3.2.
+* Remove usage of deprecated APIs for Django 4.2
+* Remove support for Python 3.7 (no code changes involved)
+* Fix ``tag_kwargs`` and ``TAGGIT_CASE_INSENSITIVE=True`` discrepency.
+
+4.0.0 (2023-05-04)
+~~~~~~~~~~~~~~~~~~
+* Remove Python 3.6 support (no code changes occurred, but we no longer test this release).
+* Remove Django 4.0 support (no code changes occurred, but we no longer test this release).
+* Add Django 4.2 support.
+
+3.1.0 (2022-11-08)
+~~~~~~~~~~~~~~~~~~
+
+* Add Python 3.11 support (no code changes were needed, but now we test this release).
+* Add Django 4.1 support (no code changes were needed, but now we test this release).
+* Fixed an issue where object caches would not be properly cleared after updating tags, leading
+  to stale reads in cases where ``prefetch_related`` is used.
+* Change ``TagListSerializerField`` to be a subclass of ``ListField``. This should improve support for API document generation. This change should not affect API behavior, but might affect metaprogramming code, so please procede carefully during this update.
+
+3.0.0 (2022-05-02)
+~~~~~~~~~~~~~~~~~~
+
+* **Backwards incompatible:** Tag slugification used to silently strip non-ASCII characters
+  from the tag name to make the slug. This leads to a lot of confusion for anyone using
+  languages with non-latin alphabets, as well as weird performance issues.
+
+  Tag slugification will now, by default, maintain unicode characters as-is during
+  slugification. This will lead to less surprises, but might cause issues for you if you are
+  expecting all of your tag slugs to fit within a regex like ``[a-zA-Z0-9]`` (for example in
+  URL routing configurations).
+
+  Generally speaking, this should not require action on your part as a library user, as
+  existing tag slugs are persisted in the database, and only new tags will receive the
+  enhanced unicode-compatible slug.
+
+  If you wish to maintain the old stripping behavior, set the setting
+  ``TAGGIT_STRIP_UNICODE_WHEN_SLUGIFYING`` to ``True``.
+
+  As a reminder, custom tag models can easily customize slugification behavior by overriding
+  the ``slugify`` method to your business needs.
+
+`` Drop Django 2.2 support.
+
+2.1.0 (2022-01-24)
+~~~~~~~~~~~~~~~~~~
+
+* Add Python 3.10 support.
+* Add Django 4.0 support.
+* Drop Django 3.1 support.
+
+
+2.0.0 (2021-11-14)
+~~~~~~~~~~~~~~~~~~
+
+* **Backwards incompatible:** ``TaggableManager.set`` now takes a list of tags
+  (instead of varargs) so that its API matches Django's ``RelatedManager.set``. Example:
+
+  - previously: ``item.tags.set("red", "blue")``
+  - now: ``item.tags.set(["red", "blue"])``
+
+* Fix issue where ``TagField`` would incorrectly report that a field has changed on empty values.
+* Update Russian translation.
+* Add Persian translation
+* Fix issue for many languages where content types were not being properly translated.
+* Provide translators additional context regarding strings in TagBase model.
+
+
+1.5.1 (2021-07-01)
+~~~~~~~~~~~~~~~~~~
+
+* Fix compiled Ukranian translation (which would cause a failure on load for this locale).
+* Update compiled Danish translation.
+
+
+1.5.0 (2021-06-30)
+~~~~~~~~~~~~~~~~~~
+
+* Vendor in the `django-taggit-serializer` project (under `taggit.serializers`).
+* Add Arabic translation.
+* Add Ukranian translation.
+
+
+1.4.0 (2021-04-19)
+~~~~~~~~~~~~~~~~~~
+
+* Add Python 3.9 support.
+* Remove Python 3.5 support.
+* Add Django 3.2 support.
+* Remove Django 1.11 and 3.0 support.
+* Add Danish translation.
+* Fix crashing that could occur with ``similar_objects`` in multi-inheritance contexts.
+* Add support for custom fields on through table models with `through_defaults` for ``TaggedManager.add`` and ``TaggedManager.set``.
+
+
+1.3.0 (2020-05-19)
+~~~~~~~~~~~~~~~~~~
+
+* Model and field ``verbose_name`` and ``verbose_name_plural`` attributes are
+  now lowercase. This simplifies using the name in the middle of a sentence.
+  When used as a header, title, or at the beginning of a sentence, a text
+  transformed can be used to adjust the case.
+* Fix prefetch_related when using UUIDTaggedItem.
+* Allow for passing in extra constructor parameters when using
+  ``TaggableManager.add``. This is especially useful when using custom
+  tag models.
+
+1.2.0 (2019-12-03)
+~~~~~~~~~~~~~~~~~~
+
+* **Removed** support for end-of-life Django 2.0 and 2.1.
+* Added support for Django 3.0.
+* Added support for Python 3.8.
+* Moved ``TaggedItemBase.tags_for()`` to ItemBase.
+* Replaced reference to removed Django's ``.virtual_fields`` with
+  ``.private_field``.
+* Added ``TextareaTagWidget``.
+
 1.1.0 (2019-03-22)
 ~~~~~~~~~~~~~~~~~~