Merge pull request #605 from benjaoming/replace-ugettext

Remove reversion from Django 4 (alpha) tests

setup.cfg

@@ -3,7 +3,7 @@ line_length = 120
 combine_as_imports = true
 known_django = django
 known_first_party = tests, djmoney, moneyed
-known_third_party = moneyed,pytest,rest_framework,reversion,setuptools,sphinx_rtd_theme
+known_third_party = moneyed,pytest,rest_framework,setuptools,sphinx_rtd_theme
 sections=FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
 include_trailing_comma = true
 multi_line_output = 3

setup.py

@@ -31,7 +31,6 @@ def run_tests(self):
     "pytest-django",
     "pytest-pythonpath",
     "pytest-cov",
-    "django-reversion",
     "mixer",
 ]
 

tests/settings.py

@@ -26,7 +26,6 @@
     "django.contrib.sites",
     "djmoney",
     "djmoney.contrib.exchange",
-    "reversion",
     "tests.testapp",
 ]
 

tests/settings_reversion.py

@@ -0,0 +1,4 @@
+from .settings import *  # noqa
+
+
+INSTALLED_APPS.append("reversion")  # noqa

tests/test_reversion.py

@@ -1,14 +1,18 @@
+from django.conf import settings
+
 import pytest
-from reversion.models import Version
-from reversion.revisions import create_revision
 
 from djmoney.money import Money
 
 from .testapp.models import RevisionedModel
 
 
 @pytest.mark.django_db
+@pytest.mark.skipif("reversion" not in settings.INSTALLED_APPS, reason="django-reversion not enabled")
 def test_that_can_safely_restore_deleted_object():
+    from reversion.models import Version
+    from reversion.revisions import create_revision
+
     amount = Money(100, "GHS")
     with create_revision():
         instance = RevisionedModel.objects.create(amount=amount)

tests/testapp/models.py

@@ -5,18 +5,24 @@
 """
 from decimal import Decimal
 
+from django.conf import settings
 from django.core.validators import MinValueValidator
 from django.db import models
 
-from reversion.revisions import register
-
 from djmoney.models.fields import MoneyField
 from djmoney.models.managers import money_manager, understands_money
 from djmoney.models.validators import MaxMoneyValidator, MinMoneyValidator
 from djmoney.money import Money
 from moneyed import Money as OldMoney
 
 
+# Import reversion if configured
+if "reversion" in settings.INSTALLED_APPS:
+    from reversion.revisions import register
+else:
+    register = lambda _: None  # noqa
+
+
 class ModelWithVanillaMoneyField(models.Model):
     money = MoneyField(max_digits=10, decimal_places=2, default=0.0)
     second_money = MoneyField(max_digits=10, decimal_places=2, default=0.0, default_currency="EUR")

tox.ini

@@ -23,9 +23,12 @@ deps =
     django30: {[django]3.0.x}
     django31: {[django]3.1.x}
     django_master: {[django]master}
-commands = py.test --ds=tests.settings --cov=./djmoney {posargs} -W error::DeprecationWarning
+commands = py.test --ds=tests.settings_reversion --cov=./djmoney {posargs} -W error::DeprecationWarning
 usedevelop = false
 
+[testenv:django_master-py{39,38,37,36,py3}]
+commands = py.test --ds=tests.settings --cov=./djmoney {posargs} -W error::DeprecationWarning
+
 [testenv:lint]
 deps =
     flake8
@@ -59,7 +62,6 @@ commands =
        djangorestframework>=3.12.0
 master =
        https://github.com/django/django/tarball/master
-       django-reversion>=3.0.8
        djangorestframework>=3.12.0
 
 [testenv:no_rest_framework]