Update support and fix python 3.12

pfouque · jpic · commit b331fbfe46ac · 2024-01-09T20:49:05.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,35 @@
 __pycache__
-*pyc
-*egg-info
-.tox
+.venv
+.Python
+*.pyc
+*.orig
+.cache/
+*,cover
 .coverage
-.cache
+.tox/
+.idea/
+*.sqlite
+
+*.egg-info
+build/
+dist/
+venv/
+*.egg/
+src/cities_light/version.py
+
+# Ignore the downloaded data.
+src/cities_light/data/
+
+# vscode & codespaces
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+pythonenv3.8/
+
+# Local History for Visual Studio Code
+.history/
+
 dbdiff/tests/db.sqlite3
diff --git a/.travis.yml b/.travis.yml
@@ -4,14 +4,57 @@ python:
 - '3.6'
 env:
   matrix:
-  - TOXENV=py27-django111-sqlite
-  - TOXENV=py27-django111-postgresql
-  - TOXENV=py36-django111-sqlite
-  - TOXENV=py36-django111-postgresql
-  - TOXENV=py36-django20-sqlite
-  - TOXENV=py36-django20-postgresql
-  - TOXENV=py36-django21-sqlite
-  - TOXENV=py36-django21-postgresql
+  - TOXENV=py310-django50-sqlite
+  - TOXENV=py310-django50-mysql
+  - TOXENV=py310-django50-postgresql
+  - TOXENV=py311-django50-sqlite
+  - TOXENV=py311-django50-mysql
+  - TOXENV=py311-django50-postgresql
+  - TOXENV=py312-django50-sqlite
+  - TOXENV=py312-django50-mysql
+  - TOXENV=py312-django50-postgresql
+  - TOXENV=py38-django42-sqlite
+  - TOXENV=py38-django42-mysql
+  - TOXENV=py38-django42-postgresql
+  - TOXENV=py39-django42-sqlite
+  - TOXENV=py39-django42-mysql
+  - TOXENV=py39-django42-postgresql
+  - TOXENV=py310-django42-sqlite
+  - TOXENV=py310-django42-mysql
+  - TOXENV=py310-django42-postgresql
+  - TOXENV=py311-django42-sqlite
+  - TOXENV=py311-django42-mysql
+  - TOXENV=py311-django42-postgresql
+  - TOXENV=py38-django41-sqlite
+  - TOXENV=py38-django41-mysql
+  - TOXENV=py38-django41-postgresql
+  - TOXENV=py39-django41-sqlite
+  - TOXENV=py39-django41-mysql
+  - TOXENV=py39-django41-postgresql
+  - TOXENV=py310-django41-sqlite
+  - TOXENV=py310-django41-mysql
+  - TOXENV=py310-django41-postgresql
+  - TOXENV=py311-django41-sqlite
+  - TOXENV=py311-django41-mysql
+  - TOXENV=py311-django41-postgresql
+  - TOXENV=py38-django40-sqlite
+  - TOXENV=py38-django40-mysql
+  - TOXENV=py38-django40-postgresql
+  - TOXENV=py39-django40-sqlite
+  - TOXENV=py39-django40-mysql
+  - TOXENV=py39-django40-postgresql
+  - TOXENV=py310-django40-sqlite
+  - TOXENV=py310-django40-mysql
+  - TOXENV=py310-django40-postgresql
+  - TOXENV=py38-django32-sqlite
+  - TOXENV=py38-django32-mysql
+  - TOXENV=py38-django32-postgresql
+  - TOXENV=py39-django32-sqlite
+  - TOXENV=py39-django32-mysql
+  - TOXENV=py39-django32-postgresql
+  - TOXENV=py310-django32-sqlite
+  - TOXENV=py310-django32-mysql
+  - TOXENV=py310-django32-postgresql
   - TOXENV=qa
 install:
 - pip install -U pip
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+Unreleased Refresh supported dependencies and support
+
 0.9.5 Add Fixture.exclude global
 
 0.9.4 Fixes missing upstream commits in 0.9.3
diff --git a/README.rst b/README.rst
@@ -93,8 +93,8 @@ See tests and docstrings for crunchy details.
 Requirements
 ============
 
-MySQL, SQLite and PostgreSQL, Python 2.7 and 3.4 are supported along with
-Django 1.7 to 1.10 - it's always better to support django's master so that we
+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.
 
diff --git a/dbdiff/tests/decimal_test/migrations/0001_initial.py b/dbdiff/tests/decimal_test/migrations/0001_initial.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/dbdiff/tests/decimal_test/migrations/0002_auto_20160102_0914.py b/dbdiff/tests/decimal_test/migrations/0002_auto_20160102_0914.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/dbdiff/tests/test_compare.py b/dbdiff/tests/test_compare.py
@@ -1,15 +1,11 @@
 """Public API tests."""
 
-from __future__ import unicode_literals
-
 import os
 import tempfile
 
 from django import test
 from django.contrib.auth.models import Group
 
-import six
-
 from ..exceptions import DiffFound, FixtureCreated
 from ..fixture import Fixture
 
@@ -57,8 +53,8 @@ def test_000_fixture_auto_create(self):
 1 instance(s) of auth.group have not expected fields
 #1:
   name:
-- u'testgroup'
-+ u'BOOM'
+- 'testgroup'
++ 'BOOM'
 '''
 
         with self.assertRaises(DiffFound) as result:
@@ -73,12 +69,12 @@ def test_000_fixture_auto_create(self):
         expected = '''
 1 unexpected instance(s) of auth.group found in the dump:
 #2:
-{u'name': u'unexpected', u'permissions': []}
+{'name': 'unexpected', 'permissions': []}
 1 instance(s) of auth.group have not expected fields
 #1:
   name:
-- u'testgroup'
-+ u'BOOM'
+- 'testgroup'
++ 'BOOM'
 '''
 
         with self.assertRaises(DiffFound) as result:
@@ -90,24 +86,17 @@ def test_000_fixture_auto_create(self):
         expected = '''
 1 unexpected instance(s) of auth.group found in the dump:
 #2:
-{u'name': u'unexpected', u'permissions': []}
+{'name': 'unexpected', 'permissions': []}
 1 expected instance(s) of auth.group missing from dump:
 #1:
-{u'name': u'testgroup', u'permissions': []}
+{'name': 'testgroup', 'permissions': []}
 '''
 
         with self.assertRaises(DiffFound) as result:
             fixture.assertNoDiff()
         self.assert_message_is(expected, result)
 
     def assert_message_is(self, expected, result):
-        if six.PY3:
-            expected = expected.replace("u'", "'")
-
-        msg = (
-            result.exception.message
-            if six.PY2 else result.exception.args[0]
-        )
-
+        msg = result.exception.args[0]
         out = '\n'.join(msg.split('\n')[1:])
         assert out.strip() == expected.strip()
diff --git a/dbdiff/utils.py b/dbdiff/utils.py
@@ -1,13 +1,11 @@
 """Utils for dbdiff."""
 
-import imp
 import os
 
 from django.apps import apps
 from django.db import connections
 
-import six
-
+from importlib.util import find_spec
 
 def get_tree(dump, exclude=None):
     """Return a tree of model -> pk -> fields."""
@@ -86,7 +84,8 @@ def get_absolute_path(path):
     if path.startswith('.'):
         module_path = '.'
     else:
-        module_path = imp.find_module(path.split('/')[0])[1]
+        module_path = find_spec(path.split('/')[0]).submodule_search_locations[0]
+
     return os.path.abspath(os.path.join(
         module_path,
         *path.split('/')[1:]
@@ -96,7 +95,7 @@ def get_absolute_path(path):
 def get_model_names(model_classes):
     """Return model names for model classes."""
     return [
-        m if isinstance(m, six.string_types)
+        m if isinstance(m, str)
         else '%s.%s' % (m._meta.app_label, m._meta.model_name)
         for m in model_classes
     ]
diff --git a/setup.py b/setup.py
@@ -22,18 +22,27 @@ def read(fname):
     long_description=read('README.rst'),
     license='MIT',
     keywords='django test database fixture diff',
-    install_requires=['ijson', 'json_delta', 'six'],
+    install_requires=['ijson', 'json_delta'],
     entry_points={'pytest11': ['dbdiff = dbdiff.plugin']},
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Web Environment',
-        'Framework :: Django',
         '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 :: 2',
         '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',
     ],
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,10 @@
 [tox]
-envlist = py{27,36,37}-django{18,110,111,20,21}{-sqlite,-mysql,-postgresql}
+envlist =
+    py{310,311,312}-django50-{sqlite,mysql,postgresql}
+    py{38,39,310,311}-django42-{sqlite,mysql,postgresql}
+    py{38,39,310,311}-django41-{sqlite,mysql,postgresql}
+    py{38,39,310}-django40-{sqlite,mysql,postgresql}
+    py{38,39,310}-django32-{sqlite,mysql,postgresql}
 
 [testenv]
 usedevelop = true
@@ -16,11 +21,11 @@ deps =
     pytest-cov
     mock
     coverage
-    django18: Django>=1.8,<1.9
-    django10: Django>=1.10,<1.11
-    django111: Django>=1.11,<2.0
-    django20: Django>=2.0,<2.1
-    django21: Django>=2.1,<2.2
+    django50: Django==5.0a1
+    django42: Django>=4.2,<5.0
+    django41: Django>=4.1,<4.2
+    django40: Django>=4.0,<4.1
+    django32: Django>=3.2,<4.0
     postgresql: psycopg2
     mysql: mysqlclient
 setenv =
@@ -29,7 +34,9 @@ setenv =
     sqlite: DJANGO_SETTINGS_MODULE=dbdiff.tests.project.settings_sqlite
     postgresql: DJANGO_SETTINGS_MODULE=dbdiff.tests.project.settings_postgresql
     mysql: DJANGO_SETTINGS_MODULE=dbdiff.tests.project.settings_mysql
-passenv = TEST_* DBDIFF_*
+passenv = 
+    TEST_*
+    DBDIFF_*
 
 [testenv:qa]
 basepython = python2.7

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+Unreleased Refresh supported dependencies and support`
	`2`	`+`
`1`	`3`	`0.9.5 Add Fixture.exclude global`
`2`	`4`
`3`	`5`	`0.9.4 Fixes missing upstream commits in 0.9.3`