django-dbdiff 0.9.6__tar.gz → 0.9.7__tar.gz

{django-dbdiff-0.9.6 → django_dbdiff-0.9.7}/PKG-INFO

@@ -1,39 +1,38 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: django-dbdiff
-Version: 0.9.6
+Version: 0.9.7
 Summary: Database data diffing against fixtures for testing
-Home-page: https://github.com/yourlabs/django-dbdiff
-Author: James Pic
-Author-email: jamespic@gmail.com
+Author-email: James Pic <jamespic@gmail.com>
 License: MIT
-Keywords: django test database fixture diff
+Project-URL: Homepage, https://github.com/yourlabs/django-dbdiff
+Keywords: django,test,database,fixture,diff
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 3.2
-Classifier: Framework :: Django :: 4.0
-Classifier: Framework :: Django :: 4.1
 Classifier: Framework :: Django :: 4.2
-Classifier: Framework :: Django :: 5.0
+Classifier: Framework :: Django :: 5.2
+Classifier: Framework :: Django :: 6.0
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Requires-Python: >=3.10
+Description-Content-Type: text/x-rst
 Requires-Dist: ijson
 Requires-Dist: json_delta
 
-.. image:: https://travis-ci.org/yourlabs/django-dbdiff.svg
-    :target: https://travis-ci.org/yourlabs/django-dbdiff
-.. image:: https://codecov.io/github/yourlabs/django-dbdiff/coverage.svg?branch=master
-    :target: https://codecov.io/github/yourlabs/django-dbdiff?branch=master
+.. image:: https://github.com/yourlabs/django-dbdiff/actions/workflows/ci.yml/badge.svg
+    :target: https://github.com/yourlabs/django-dbdiff/actions/workflows/ci.yml
+.. image:: https://codecov.io/gh/yourlabs/django-dbdiff/branch/master/graph/badge.svg
+    :target: https://codecov.io/gh/yourlabs/django-dbdiff
 .. image:: https://badge.fury.io/py/django-dbdiff.png
    :target: http://badge.fury.io/py/django-dbdiff
 
@@ -89,11 +88,11 @@ Example:
 
 .. code-block:: python
 
-    from django import TransactionTestCase
+    from django.test import TransactionTestCase
     from dbdiff.fixture import Fixture
 
 
-    class YourImportTest(test.TransactionTestCase):
+    class YourImportTest(TransactionTestCase):
         reset_sequences = True
 
         def test_your_import(self):
@@ -115,6 +114,16 @@ If you need to ignore fields globally, set the class-level variable exclude as s
 
    Fixture.exclude = {'mrsrequest.mrsrequest': ['token']}
 
+If your import produces records with non-deterministic primary keys (e.g.
+UUIDs or sequence gaps), pass ``ignore_pk=True`` to match records by their
+field content instead of by pk:
+
+.. code-block:: python
+
+    Fixture('yourapp/tests/yourtest.json',
+            models=[YourModel],
+            ignore_pk=True).assertNoDiff()
+
 Instead of deleting the fixtures manually before running the tests to
 regenerate them, just run your tests with FIXTURE_REWRITE=1 environment
 variable. This will overwrite the fixtures and make the tests look like it
@@ -125,10 +134,10 @@ See tests and docstrings for crunchy details.
 Requirements
 ============
 
-MySQL, SQLite and PostgreSQL, Python 3.8 to 3.12 are supported along with
-Django 3.2 to 5.0 - it's always better to support django's master so that we
-can **upgrade easily when it is released**, which is one of the selling points
-for having 100% coverage.
+MySQL, SQLite and PostgreSQL, Python 3.10 to 3.14 are supported along with
+Django 4.2, 5.2, and 6.0 - it's always better to support django's master so
+that we can **upgrade easily when it is released**, which is one of the selling
+points for having 100% coverage.
 
 Install
 =======

{django-dbdiff-0.9.6 → django_dbdiff-0.9.7}/README.rst

@@ -1,7 +1,7 @@
-.. image:: https://travis-ci.org/yourlabs/django-dbdiff.svg
-    :target: https://travis-ci.org/yourlabs/django-dbdiff
-.. image:: https://codecov.io/github/yourlabs/django-dbdiff/coverage.svg?branch=master
-    :target: https://codecov.io/github/yourlabs/django-dbdiff?branch=master
+.. image:: https://github.com/yourlabs/django-dbdiff/actions/workflows/ci.yml/badge.svg
+    :target: https://github.com/yourlabs/django-dbdiff/actions/workflows/ci.yml
+.. image:: https://codecov.io/gh/yourlabs/django-dbdiff/branch/master/graph/badge.svg
+    :target: https://codecov.io/gh/yourlabs/django-dbdiff
 .. image:: https://badge.fury.io/py/django-dbdiff.png
    :target: http://badge.fury.io/py/django-dbdiff
 
@@ -57,11 +57,11 @@ Example:
 
 .. code-block:: python
 
-    from django import TransactionTestCase
+    from django.test import TransactionTestCase
     from dbdiff.fixture import Fixture
 
 
-    class YourImportTest(test.TransactionTestCase):
+    class YourImportTest(TransactionTestCase):
         reset_sequences = True
 
         def test_your_import(self):
@@ -83,6 +83,16 @@ If you need to ignore fields globally, set the class-level variable exclude as s
 
    Fixture.exclude = {'mrsrequest.mrsrequest': ['token']}
 
+If your import produces records with non-deterministic primary keys (e.g.
+UUIDs or sequence gaps), pass ``ignore_pk=True`` to match records by their
+field content instead of by pk:
+
+.. code-block:: python
+
+    Fixture('yourapp/tests/yourtest.json',
+            models=[YourModel],
+            ignore_pk=True).assertNoDiff()
+
 Instead of deleting the fixtures manually before running the tests to
 regenerate them, just run your tests with FIXTURE_REWRITE=1 environment
 variable. This will overwrite the fixtures and make the tests look like it
@@ -93,10 +103,10 @@ See tests and docstrings for crunchy details.
 Requirements
 ============
 
-MySQL, SQLite and PostgreSQL, Python 3.8 to 3.12 are supported along with
-Django 3.2 to 5.0 - it's always better to support django's master so that we
-can **upgrade easily when it is released**, which is one of the selling points
-for having 100% coverage.
+MySQL, SQLite and PostgreSQL, Python 3.10 to 3.14 are supported along with
+Django 4.2, 5.2, and 6.0 - it's always better to support django's master so
+that we can **upgrade easily when it is released**, which is one of the selling
+points for having 100% coverage.
 
 Install
 =======

{django-dbdiff-0.9.6 → django_dbdiff-0.9.7}/dbdiff/apps.py

@@ -9,8 +9,7 @@ from .utils import patch_transaction_test_case
 
 
 class DefaultConfig(AppConfig):
-    """
-    Register patched serializers and patch TransactionTestCase for sqlite.
+    """Register patched serializers and patch TransactionTestCase for sqlite.
 
     .. py:attribute:: debug
 
@@ -23,8 +22,7 @@ class DefaultConfig(AppConfig):
     default_indent = 4
 
     def ready(self):
-        """
-        Register dbdiff.serializers.json and set debug.
+        """Register dbdiff.serializers.json and set debug.
 
         Enables debug if a DBDIFF_DEBUG environment variable is found.
 

{django-dbdiff-0.9.6 → django_dbdiff-0.9.7}/dbdiff/exceptions.py

@@ -59,8 +59,7 @@ class DiffFound(DbDiffException):
 
 
 class FixtureCreated(DbDiffException):
-    """
-    Raised when a fixture was created.
+    """Raised when a fixture was created.
 
     This purposely fails a test, to avoid misleading the user into thinking
     that the test was properly executed against a versioned fixture. Imagine

{django-dbdiff-0.9.6 → django_dbdiff-0.9.7}/dbdiff/fixture.py

@@ -5,11 +5,10 @@ import json
 import os
 import tempfile
 
+import ijson
 from django.apps import apps
 from django.core.management import call_command
 
-import ijson
-
 from .exceptions import DiffFound, FixtureCreated
 from .utils import (
     diff,
@@ -18,13 +17,11 @@ from .utils import (
     get_tree,
 )
 
-
 REWRITE = os.getenv('FIXTURE_REWRITE')
 
 
 class Fixture(object):
-    """
-    Is able to print out diffs between database and a fixture.
+    """Is able to print out diffs between database and a fixture.
 
     .. py:attribute:: path
 
@@ -46,9 +43,10 @@ class Fixture(object):
 
     exclude = dict()
 
-    def __init__(self, relative_path, models=None, database=None):
-        """
-        Instanciate a FixtureDiff on a database.
+    def __init__(
+        self, relative_path, models=None, database=None, ignore_pk=False
+    ):
+        """Instanciate a FixtureDiff on a database.
 
         relative_path is used to calculate :py:attr:`path`, with
         :py:func:`~utils.get_absolute_path`.
@@ -58,14 +56,19 @@ class Fixture(object):
 
         database should be the name of the database to use, `default` by
         default.
+
+        ignore_pk when True, matches records by field content instead of
+        primary key. Records with the same content but different pks
+        are considered equal.
         """
         self.path = get_absolute_path(relative_path)
         self.models = models if models else self.parse_models()
         self.database = database or 'default'
+        self.ignore_pk = ignore_pk
 
     def parse_models(self):
         """Return the list of models inside the fixture file."""
-        with open(self.path, 'r') as f:
+        with open(self.path, 'rb') as f:
             return [apps.get_model(i.lower())
                     for i in ijson.items(f, 'item.model')]
 
@@ -91,31 +94,39 @@ class Fixture(object):
 
             return len(line) - len(line.lstrip(' '))
 
-    def diff(self, exclude=None):
-        """
-        Diff the fixture against a datadump of fixture models.
+    def diff(self, exclude=None, ignore_pk=None):
+        """Diff the fixture against a datadump of fixture models.
 
         If passed, exclude should be a list of field names to exclude from
         being diff'ed.
+
+        ignore_pk when True, matches records by field content instead of
+        primary key. Defaults to the instance's ignore_pk attribute.
         """
         fh, dump_path = tempfile.mkstemp('_dbdiff')
 
         exclude_final = copy.copy(self.exclude)
         exclude_final.update(exclude or {})
 
-        with os.fdopen(fh, 'w') as f:
-            self.dump(f)
+        try:
+            with os.fdopen(fh, 'w') as f:
+                self.dump(f)
 
-        with open(self.path, 'r') as e, open(dump_path, 'r') as r:
-            expected, result = json.load(e), json.load(r)
+            with open(self.path, 'r') as e, open(dump_path, 'r') as r:
+                expected, result = json.load(e), json.load(r)
 
-        unexpected, missing, different = diff(
-            get_tree(expected, exclude_final),
-            get_tree(result, exclude_final),
-        )
+            if ignore_pk is None:
+                ignore_pk = self.ignore_pk
 
-        if not unexpected and not missing and not diff:
+            unexpected, missing, different = diff(
+                get_tree(expected, exclude_final),
+                get_tree(result, exclude_final),
+                ignore_pk=ignore_pk,
+            )
+        finally:
             os.unlink(dump_path)
+
+        if not unexpected and not missing and not different:
             return None
 
         return unexpected, missing, different
@@ -150,8 +161,11 @@ class Fixture(object):
             if not REWRITE:
                 raise FixtureCreated(self)
 
-        unexpected, missing, different = self.diff(exclude=exclude)
+        result = self.diff(exclude=exclude)
+        if result is None:
+            return
 
+        unexpected, missing, different = result
         if unexpected or missing or different:
             raise DiffFound(self, unexpected, missing, different)
 

{django-dbdiff-0.9.6 → django_dbdiff-0.9.7}/dbdiff/sequence.py

@@ -14,8 +14,7 @@ def pk_sequence_get(model):
 
 
 def sequence_reset(model):
-    """
-    Better sequence reset than TransactionTestCase.
+    """Better sequence reset than TransactionTestCase.
 
     The difference with using TransactionTestCase with reset_sequences=True is
     that this will reset sequences for the given models to their higher value,
@@ -49,7 +48,7 @@ def sequence_reset(model):
                 column=pk_field, table=table
             )
         )
-        result = cursor.fetchone()[0] or 0
+        result = cursor.fetchone()[0] or 1
         reset = 'ALTER TABLE {table} AUTO_INCREMENT = %s' % result
 
     connection.cursor().execute(

{django-dbdiff-0.9.6 → django_dbdiff-0.9.7}/dbdiff/serializers/base.py

@@ -10,8 +10,7 @@ class BaseSerializerMixin(object):
 
     @classmethod
     def recursive_dict_sort(cls, data):
-        """
-        Return a recursive OrderedDict for a dict.
+        """Return a recursive OrderedDict for a dict.
 
         Django's default model-to-dict logic - implemented in
         django.core.serializers.python.Serializer.get_dump_object() - returns a
@@ -28,8 +27,7 @@ class BaseSerializerMixin(object):
 
     @classmethod
     def remove_microseconds(cls, data):
-        """
-        Strip microseconds from datetimes for mysql.
+        """Strip microseconds from datetimes for mysql.
 
         MySQL doesn't have microseconds in datetimes, so dbdiff's serializer
         removes microseconds from datetimes so that fixtures are cross-database
@@ -51,8 +49,7 @@ class BaseSerializerMixin(object):
 
     @classmethod
     def normalize_decimals(cls, data):
-        """
-        Strip trailing zeros for constitency.
+        """Strip trailing zeros for consistency.
 
         In addition, dbdiff serialization forces Decimal normalization, because
         trailing zeros could happen in inconsistent ways.
@@ -67,8 +64,7 @@ class BaseSerializerMixin(object):
                 data['fields'][key] = value.normalize()
 
     def get_dump_object(self, obj):
-        """
-        Actual method used by Django serializers to dump dicts.
+        """Actual method used by Django serializers to dump dicts.
 
         By overridding this method, we're able to run our various
         data dump predictability methods.

{django-dbdiff-0.9.6 → django_dbdiff-0.9.7}/dbdiff/serializers/json.py

@@ -4,7 +4,6 @@ from django.core.serializers import json as upstream
 
 from .base import BaseSerializerMixin
 
-
 __all__ = ('Serializer', 'Deserializer')
 
 

{django-dbdiff-0.9.6 → django_dbdiff-0.9.7}/dbdiff/test.py

@@ -6,8 +6,7 @@ from .sequence import sequence_reset
 
 
 class DbdiffTestMixin(object):
-    """
-    Convenience mixin with better sequence resetting than TransactionTestCase.
+    """Mixin with better sequence resetting than TransactionTestCase.
 
     The difference with using TransactionTestCase with reset_sequences=True is
     that this will reset sequences for the given models to their higher value,
@@ -52,6 +51,7 @@ class DbdiffTestMixin(object):
         Fixture(
             self.dbdiff_expected,
             models=self.dbdiff_models,
+            ignore_pk=getattr(self, 'dbdiff_ignore_pk', False),
         ).assertNoDiff(
             exclude=self.dbdiff_exclude,
         )

{django-dbdiff-0.9.6 → django_dbdiff-0.9.7}/dbdiff/tests/decimal_test/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

{django-dbdiff-0.9.6 → django_dbdiff-0.9.7}/dbdiff/tests/decimal_test/migrations/0002_auto_20160102_0914.py

@@ -1,4 +1,4 @@
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

{django-dbdiff-0.9.6 → django_dbdiff-0.9.7}/dbdiff/tests/project/settings.py

@@ -1,5 +1,4 @@
-"""
-Django settings for project project.
+"""Django settings for project project.
 
 Generated by 'django-admin startproject' using Django 1.8.3.dev20150604012123.
 

{django-dbdiff-0.9.6 → django_dbdiff-0.9.7}/dbdiff/tests/project/settings_postgresql.py

@@ -4,13 +4,13 @@ import os
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'ENGINE': 'django.db.backends.postgresql',
         'HOST': os.environ.get('DB_HOST', ''),
         'NAME': os.environ.get('DB_NAME', 'dbdiff_test'),
         'USER': os.environ.get('DB_USER', 'postgres'),
         'PASSWORD': os.environ.get('DB_PASSWORD', ''),
         'PORT': os.environ.get('DB_PORT', '5432'),
         'OPTIONS': {},
-        
+
     }
 }

{django-dbdiff-0.9.6 → django_dbdiff-0.9.7}/dbdiff/tests/test_fixture.py

@@ -23,3 +23,12 @@ class FixtureTest(test.TransactionTestCase):
 
     def test_models(self):
         assert self.fixture.models == [Group]
+
+    def test_diff_exact_match_returns_none(self):
+        # Regression: the always-False `not diff` (imported function) bug
+        # caused diff() to never return None, leaking temp files and breaking
+        # assertNoDiff() with a TypeError on exact matches.
+        # Fixture: # [{"model": "auth.group", "pk": 1,
+        # "fields": {"name": "initial_name"}}]
+        Group.objects.create(id=1, name='initial_name')
+        assert self.fixture.diff() is None

{django-dbdiff-0.9.6 → django_dbdiff-0.9.7}/dbdiff/tests/test_mixin.py

@@ -1,14 +1,15 @@
-from dbdiff.test import DbdiffTestMixin
-
 from django import test
 from django.contrib.contenttypes.models import ContentType
 from django.db import connection
 
+from dbdiff.test import DbdiffTestMixin
+
 
 class ContentTypeTestCase(DbdiffTestMixin, test.TestCase):
     dbdiff_models = [ContentType]
     dbdiff_exclude = {'*': ['created']}
     dbdiff_reset_sequences = True
+    dbdiff_ignore_pk = True
     dbdiff_expected = 'dbdiff/tests/test_mixin.json'
 
     def test_db_import(self):

django_dbdiff-0.9.7/dbdiff/tests/test_utils.py

@@ -0,0 +1,53 @@
+import os
+
+from django.contrib.auth.models import Group
+
+from dbdiff.utils import diff, get_absolute_path, get_model_names
+
+
+def test_diff_ignore_pk():
+    """With ignore_pk=True, records are matched by content, not pk."""
+    expected = {
+        'auth.group': {
+            1: {'name': 'testgroup', 'permissions': []},
+        },
+    }
+    result = {
+        'auth.group': {
+            99: {'name': 'testgroup', 'permissions': []},  # diff pk
+        },
+    }
+    unexpected, missing, different = diff(expected, result, ignore_pk=True)
+    assert not unexpected and not missing and not different
+
+
+def test_diff_with_pk_by_default():
+    """Records with different pk are missing/unexpected without ignore_pk."""
+    expected = {
+        'auth.group': {
+            1: {'name': 'testgroup', 'permissions': []},
+        },
+    }
+    result = {
+        'auth.group': {
+            99: {'name': 'testgroup', 'permissions': []},
+        },
+    }
+    unexpected, missing, different = diff(expected, result, ignore_pk=False)
+    assert missing == {
+        'auth.group': {1: {'name': 'testgroup', 'permissions': []}}
+    }
+    assert unexpected == {
+        'auth.group': {99: {'name': 'testgroup', 'permissions': []}}
+    }
+
+
+def test_get_model_names():
+    assert get_model_names([Group, 'auth.user']) == ['auth.group', 'auth.user']
+
+
+def test_get_absolute_path_starting_with_dot():
+    assert get_absolute_path('./foo') == os.path.join(
+        os.path.abspath(os.path.dirname('__file__')),
+        'foo',
+    )

{django-dbdiff-0.9.6 → django_dbdiff-0.9.7}/dbdiff/utils.py

@@ -1,11 +1,11 @@
 """Utils for dbdiff."""
 
 import os
+from importlib.util import find_spec
 
 from django.apps import apps
 from django.db import connections
 
-from importlib.util import find_spec
 
 def get_tree(dump, exclude=None):
     """Return a tree of model -> pk -> fields."""
@@ -43,9 +43,18 @@ def _get_unexpected(expected, result):
     return unexpected
 
 
-def diff(expected, result):
-    """Return unexpected, missing and diff between expected and result."""
-    missing, diff = {}, {}
+def diff(expected, result, ignore_pk=False):  # noqa: C901
+    """Return unexpected, missing and diff between expected and result.
+
+    When ignore_pk is True, records are matched by their field values (content)
+    instead of primary key. Records with the same content but different pks
+    are considered matching.
+    """
+    missing, different = {}, {}
+
+    if ignore_pk:
+        unexpected, missing, different = _diff_by_content(expected, result)
+        return unexpected, missing, different
 
     unexpected = _get_unexpected(expected, result)
 
@@ -60,8 +69,7 @@ def diff(expected, result):
             if expected_fields == result_fields:
                 continue
 
-            diff.setdefault(model, {})
-            diff[model].setdefault(pk, {})
+            different.setdefault(model, {}).setdefault(pk, {})
 
             for expected_field, expected_value in expected_fields.items():
                 result_value = result_fields[expected_field]
@@ -69,11 +77,41 @@ def diff(expected, result):
                 if expected_value == result_value:
                     continue
 
-                diff[model][pk][expected_field] = (
+                different[model][pk][expected_field] = (
                     expected_value,
                     result_value
                 )
-    return unexpected, missing, diff
+    return unexpected, missing, different
+
+
+def _diff_by_content(expected, result):  # noqa: C901
+    """Diff by matching records on field content instead of primary key."""
+    unexpected, missing, different = {}, {}, {}
+
+    for model in set(expected.keys()) | set(result.keys()):
+        expected_list = list(expected.get(model, {}).items())
+        result_list = list(result.get(model, {}).items())
+        matched_result_indices = set()
+
+        for exp_pk, exp_fields in expected_list:
+            found = False
+            for i, (res_pk, res_fields) in enumerate(result_list):
+                if i in matched_result_indices:
+                    continue
+                if exp_fields == res_fields:
+                    matched_result_indices.add(i)
+                    found = True
+                    break
+            if not found:
+                missing.setdefault(model, {})
+                missing[model][exp_pk] = exp_fields
+
+        for i, (res_pk, res_fields) in enumerate(result_list):
+            if i not in matched_result_indices:
+                unexpected.setdefault(model, {})
+                unexpected[model][res_pk] = res_fields
+
+    return unexpected, missing, different
 
 
 def get_absolute_path(path):
@@ -84,7 +122,8 @@ def get_absolute_path(path):
     if path.startswith('.'):
         module_path = '.'
     else:
-        module_path = find_spec(path.split('/')[0]).submodule_search_locations[0]
+        spec = find_spec(path.split('/')[0])
+        module_path = spec.submodule_search_locations[0]
 
     return os.path.abspath(os.path.join(
         module_path,
@@ -114,27 +153,49 @@ def get_models_tables(models):
 
 
 def patch_transaction_test_case():
-    """Monkeypatch TransactionTestCase._reset_sequences to support SQLite."""
+    """Monkeypatch TransactionTestCase._reset_sequences to support SQLite.
+
+    Safe to call once, from AppConfig.ready(). Calling it a second time would
+    wrap the already-patched classmethod again; the inner _needs_explicit_cls
+    check would then see a classmethod and call _original(db_name), passing
+    db_name correctly, so double-patching doesn't break anything — but callers
+    should avoid it anyway.
+    """
+    import inspect
+
     from django.test.testcases import TransactionTestCase
-    TransactionTestCase.old_reset_sequences = \
-        TransactionTestCase._reset_sequences
 
-    def new_reset_sequences(self, db_name):
-        self.old_reset_sequences(db_name)
-        connection = connections[db_name]
+    _raw = inspect.getattr_static(TransactionTestCase, '_reset_sequences')
+    # Capture the already-resolved callable before we replace it.
+    # For classmethod/staticmethod, the descriptor protocol strips the
+    # wrapper so TransactionTestCase._reset_sequences(db_name) works.
+    # For a plain function (Django 4.x), it needs an explicit first arg.
+    _needs_explicit_cls = not isinstance(_raw, (classmethod, staticmethod))
+    _original = TransactionTestCase._reset_sequences
 
+    def _sqlite_reset(db_name):
+        connection = connections[db_name]
         if connection.vendor != 'sqlite':
             return
-
         tables = get_models_tables(apps.get_models())
         statements = [
             "UPDATE SQLITE_SEQUENCE SET SEQ=0 WHERE NAME='%s';" % t
             for t in tables
         ]
-
         cursor = connection.cursor()
-
         for statement in statements:
             cursor.execute(statement)
 
+    # Always install as @classmethod so Django 5.x (which calls
+    # cls._reset_sequences(db_name)) passes db_name in the right position.
+    # Django 4.x calls self._reset_sequences(db_name) on instances, which
+    # also works because classmethods accept both call styles.
+    @classmethod
+    def new_reset_sequences(cls, db_name):  # noqa: N805
+        if _needs_explicit_cls:
+            _original(cls, db_name)
+        else:
+            _original(db_name)
+        _sqlite_reset(db_name)
+
     TransactionTestCase._reset_sequences = new_reset_sequences

{django-dbdiff-0.9.6 → django_dbdiff-0.9.7}/django_dbdiff.egg-info/PKG-INFO

@@ -1,39 +1,38 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: django-dbdiff
-Version: 0.9.6
+Version: 0.9.7
 Summary: Database data diffing against fixtures for testing
-Home-page: https://github.com/yourlabs/django-dbdiff
-Author: James Pic
-Author-email: jamespic@gmail.com
+Author-email: James Pic <jamespic@gmail.com>
 License: MIT
-Keywords: django test database fixture diff
+Project-URL: Homepage, https://github.com/yourlabs/django-dbdiff
+Keywords: django,test,database,fixture,diff
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 3.2
-Classifier: Framework :: Django :: 4.0
-Classifier: Framework :: Django :: 4.1
 Classifier: Framework :: Django :: 4.2
-Classifier: Framework :: Django :: 5.0
+Classifier: Framework :: Django :: 5.2
+Classifier: Framework :: Django :: 6.0
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Requires-Python: >=3.10
+Description-Content-Type: text/x-rst
 Requires-Dist: ijson
 Requires-Dist: json_delta
 
-.. image:: https://travis-ci.org/yourlabs/django-dbdiff.svg
-    :target: https://travis-ci.org/yourlabs/django-dbdiff
-.. image:: https://codecov.io/github/yourlabs/django-dbdiff/coverage.svg?branch=master
-    :target: https://codecov.io/github/yourlabs/django-dbdiff?branch=master
+.. image:: https://github.com/yourlabs/django-dbdiff/actions/workflows/ci.yml/badge.svg
+    :target: https://github.com/yourlabs/django-dbdiff/actions/workflows/ci.yml
+.. image:: https://codecov.io/gh/yourlabs/django-dbdiff/branch/master/graph/badge.svg
+    :target: https://codecov.io/gh/yourlabs/django-dbdiff
 .. image:: https://badge.fury.io/py/django-dbdiff.png
    :target: http://badge.fury.io/py/django-dbdiff
 
@@ -89,11 +88,11 @@ Example:
 
 .. code-block:: python
 
-    from django import TransactionTestCase
+    from django.test import TransactionTestCase
     from dbdiff.fixture import Fixture
 
 
-    class YourImportTest(test.TransactionTestCase):
+    class YourImportTest(TransactionTestCase):
         reset_sequences = True
 
         def test_your_import(self):
@@ -115,6 +114,16 @@ If you need to ignore fields globally, set the class-level variable exclude as s
 
    Fixture.exclude = {'mrsrequest.mrsrequest': ['token']}
 
+If your import produces records with non-deterministic primary keys (e.g.
+UUIDs or sequence gaps), pass ``ignore_pk=True`` to match records by their
+field content instead of by pk:
+
+.. code-block:: python
+
+    Fixture('yourapp/tests/yourtest.json',
+            models=[YourModel],
+            ignore_pk=True).assertNoDiff()
+
 Instead of deleting the fixtures manually before running the tests to
 regenerate them, just run your tests with FIXTURE_REWRITE=1 environment
 variable. This will overwrite the fixtures and make the tests look like it
@@ -125,10 +134,10 @@ See tests and docstrings for crunchy details.
 Requirements
 ============
 
-MySQL, SQLite and PostgreSQL, Python 3.8 to 3.12 are supported along with
-Django 3.2 to 5.0 - it's always better to support django's master so that we
-can **upgrade easily when it is released**, which is one of the selling points
-for having 100% coverage.
+MySQL, SQLite and PostgreSQL, Python 3.10 to 3.14 are supported along with
+Django 4.2, 5.2, and 6.0 - it's always better to support django's master so
+that we can **upgrade easily when it is released**, which is one of the selling
+points for having 100% coverage.
 
 Install
 =======

{django-dbdiff-0.9.6 → django_dbdiff-0.9.7}/django_dbdiff.egg-info/SOURCES.txt

@@ -1,5 +1,5 @@
 README.rst
-setup.py
+pyproject.toml
 dbdiff/__init__.py
 dbdiff/apps.py
 dbdiff/exceptions.py
@@ -38,4 +38,5 @@ django_dbdiff.egg-info/SOURCES.txt
 django_dbdiff.egg-info/dependency_links.txt
 django_dbdiff.egg-info/entry_points.txt
 django_dbdiff.egg-info/requires.txt
-django_dbdiff.egg-info/top_level.txt
+django_dbdiff.egg-info/top_level.txt
+docs/conf.py

django_dbdiff-0.9.7/django_dbdiff.egg-info/top_level.txt

@@ -0,0 +1,3 @@
+dbdiff
+dist
+docs

django_dbdiff-0.9.7/docs/conf.py

@@ -0,0 +1,22 @@
+import os
+import sys
+import django
+
+sys.path.insert(0, os.path.abspath('..'))
+os.environ.setdefault(
+    'DJANGO_SETTINGS_MODULE',
+    'dbdiff.tests.project.settings_sqlite',
+)
+django.setup()
+
+project = 'django-dbdiff'
+copyright = '2026, James Pic'
+author = 'James Pic'
+release = '0.9.7'
+
+extensions = [
+    'sphinx.ext.autodoc',
+    'sphinx.ext.viewcode',
+]
+
+html_theme = 'alabaster'

django_dbdiff-0.9.7/pyproject.toml

@@ -0,0 +1,62 @@
+[build-system]
+requires = ["setuptools>=61", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "django-dbdiff"
+version = "0.9.7"
+description = "Database data diffing against fixtures for testing"
+readme = "README.rst"
+license = {text = "MIT"}
+authors = [{name = "James Pic", email = "jamespic@gmail.com"}]
+keywords = ["django", "test", "database", "fixture", "diff"]
+requires-python = ">=3.10"
+dependencies = ["ijson", "json_delta"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Environment :: Web Environment",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Framework :: Django",
+    "Framework :: Django :: 4.2",
+    "Framework :: Django :: 5.2",
+    "Framework :: Django :: 6.0",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Topic :: Internet :: WWW/HTTP",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+]
+
+[project.urls]
+Homepage = "https://github.com/yourlabs/django-dbdiff"
+
+[project.entry-points."pytest11"]
+dbdiff = "dbdiff.plugin"
+
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.packages.find]
+where = ["."]
+exclude = ["dbdiff.tests*", "tests*", "tests.*"]
+
+[tool.ruff]
+line-length = 79
+
+[tool.ruff.lint]
+select = ["E", "W", "F", "C90", "T10", "I", "D", "N"]
+# D203 (blank-line-before-docstring) conflicts with D211; D213 conflicts with D212
+ignore = ["D203", "D213", "N818"]
+
+[tool.ruff.lint.mccabe]
+max-complexity = 7
+
+[tool.ruff.lint.per-file-ignores]
+"dbdiff/tests/**/*.py" = ["D100", "D101", "D102", "D103"]
+"dbdiff/tests/**/migrations/**" = ["D", "E501", "I"]

django-dbdiff-0.9.6/dbdiff/tests/test_utils.py

@@ -1,16 +0,0 @@
-import os
-
-from dbdiff.utils import get_absolute_path, get_model_names
-
-from django.contrib.auth.models import Group
-
-
-def test_get_model_names():
-    assert get_model_names([Group, 'auth.user']) == ['auth.group', 'auth.user']
-
-
-def test_get_absolute_path_starting_with_dot():
-    assert get_absolute_path('./foo') == os.path.join(
-        os.path.abspath(os.path.dirname('__file__')),
-        'foo',
-    )

django-dbdiff-0.9.6/django_dbdiff.egg-info/top_level.txt

@@ -1 +0,0 @@
-dbdiff

django-dbdiff-0.9.6/setup.py

@@ -1,49 +0,0 @@
-from setuptools import setup, find_packages
-import os
-
-
-# Utility function to read the README file.
-# Used for the long_description. It's nice, because now 1) we have a top level
-# README file and 2) it's easier to type in the README file than to put a raw
-# string in below ...
-def read(fname):
-    return open(os.path.join(os.path.dirname(__file__), fname)).read()
-
-
-setup(
-    name='django-dbdiff',
-    version='0.9.6',
-    description='Database data diffing against fixtures for testing',
-    author='James Pic',
-    author_email='jamespic@gmail.com',
-    url='https://github.com/yourlabs/django-dbdiff',
-    packages=find_packages(),
-    include_package_data=True,
-    long_description=read('README.rst'),
-    license='MIT',
-    keywords='django test database fixture diff',
-    install_requires=['ijson', 'json_delta'],
-    entry_points={'pytest11': ['dbdiff = dbdiff.plugin']},
-    classifiers=[
-        'Development Status :: 4 - Beta',
-        'Environment :: Web Environment',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: MIT License',
-        'Operating System :: OS Independent',
-        'Framework :: Django',
-        'Framework :: Django :: 3.2',
-        'Framework :: Django :: 4.0',
-        'Framework :: Django :: 4.1',
-        'Framework :: Django :: 4.2',
-        'Framework :: Django :: 5.0',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10',
-        'Programming Language :: Python :: 3.11',
-        'Programming Language :: Python :: 3.12',
-        'Topic :: Internet :: WWW/HTTP',
-        'Topic :: Software Development :: Libraries :: Python Modules',
-    ],
-)

{django-dbdiff-0.9.6 → django_dbdiff-0.9.7}/dbdiff/tests/test_decimal.py

@@ -2,8 +2,8 @@ import os
 
 from django import test
 
-from .decimal_test.models import TestModel as DecimalTestModel
 from ..fixture import Fixture
+from .decimal_test.models import TestModel as DecimalTestModel
 
 
 class DecimalDiffTest(test.TransactionTestCase):

{django-dbdiff-0.9.6 → django_dbdiff-0.9.7}/dbdiff/tests/test_plugin.py

@@ -1,9 +1,9 @@
+import pytest
+
 from dbdiff.tests.decimal_test.models import TestModel as DecimalModel
 from dbdiff.tests.inheritance.models import Child, Parent
 from dbdiff.tests.nonintpk.models import Nonintpk
 
-import pytest
-
 
 @pytest.mark.dbdiff(models=[DecimalModel])
 def test_insert_first():