Skip to content

Commit

Permalink
Merge 7a63998 into 20eff78
Browse files Browse the repository at this point in the history
  • Loading branch information
radiac committed Jul 22, 2020
2 parents 20eff78 + 7a63998 commit 78453fa
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.rst
Expand Up @@ -24,7 +24,7 @@ Features
backups
* Anonymise all models to sanitise working copies of a production database

Supports Django 1.8 to 2.1, on 3.4+.
Supports Django 1.11 to 2.2, on Python 3.4 to 3.8.

See the `full documentation <https://django-gdpr-assist.readthedocs.io>`_ for details
of how GDPR-assist works; in particular:
Expand Down
3 changes: 2 additions & 1 deletion docs/upgrading.rst
Expand Up @@ -96,14 +96,15 @@ Changelog

Features:

* Add support for Django 2.2
* Add ``can_anonymise`` flag to ``PrivacyMeta`` to support searching and exporting data
which shouldn't be anonymised. (#15, #17)
* Add bulk anonymisation operations to improve efficiency of large anonymisations


Changes:

* This version removes Django 1.8 support
* Remove support for Django 1.8


Bugfixes:
Expand Down
3 changes: 3 additions & 0 deletions setup.py
Expand Up @@ -123,10 +123,13 @@ def runtests(args):
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Framework :: Django",
"Framework :: Django :: 1.11",
"Framework :: Django :: 2.0",
"Framework :: Django :: 2.1",
"Framework :: Django :: 2.2",
],
install_requires=["django-yaa-settings"],
extras_require={
Expand Down
2 changes: 2 additions & 0 deletions tests/test_admin.py
Expand Up @@ -28,6 +28,8 @@


class AdminTestCase(TestCase):
databases = "__all__"

def setUp(self):
self.client = Client()
user = User.objects.create_superuser(
Expand Down
6 changes: 6 additions & 0 deletions tests/test_anonymisation.py
Expand Up @@ -34,6 +34,8 @@


class TestAnonymisationBase(TestCase):
databases = "__all__"

def get_model(self, key):
return self.models[key]

Expand Down Expand Up @@ -749,6 +751,8 @@ def test_customfield__raise_exception(self):


class TestRelation(TestCase):
databases = "__all__"

def test_onetoonefield_anonymise__anonymise_not_propagated(self):
target = PrivateTargetModel.objects.create(chars="Test")
obj = OneToOneFieldModel.objects.create(chars="Test", target=target)
Expand Down Expand Up @@ -854,6 +858,8 @@ def test_anonymise_twice_with_force__anonymised_twice(self):


class TestQuerySet(TestCase):
databases = "__all__"

def test_queryset_anonymise__anonymise_all(self):
objs = []
for i in range(5):
Expand Down
2 changes: 2 additions & 0 deletions tests/test_commands.py
Expand Up @@ -38,6 +38,8 @@ def __exit__(self, *args):


class CommandTestCase(TestCase):
databases = "__all__"

def run_command(self, command, *args, **kwargs):
# Silent
kwargs["verbosity"] = 1
Expand Down
4 changes: 3 additions & 1 deletion tests/test_logger.py
Expand Up @@ -16,6 +16,8 @@


class TestLogger(TestCase):
databases = "__all__"

def setUp(self):
EventLog.objects.all().delete()

Expand Down Expand Up @@ -78,7 +80,7 @@ def test_logged_object_deleted_get_target__returns_none(self):
self.assertIsNone(found)

def test_anonymise_privacy_object__disabled_anonymise__anonymisation__not__logged(
self
self,
):
obj = baker.make(ModelWithPrivacyMetaCanNotAnonymise)
self.assertEqual(EventLog.objects.count(), 0)
Expand Down
4 changes: 4 additions & 0 deletions tox.ini
Expand Up @@ -4,6 +4,7 @@ envlist =
py{34,35,36}-django1.11
py{34,35,36}-django2.0
py{35,36}-django2.1
py{35,36,37,38}-django2.2
report

[testenv]
Expand All @@ -19,11 +20,14 @@ basepython =
py34: python3.4
py35: python3.5
py36: python3.6
py37: python3.7
py38: python3.8

deps =
django1.11: django>=1.11, <2.0
django2.0: django>=2.0, <2.1
django2.1: django>=2.1, <2.2
django2.2: django>=2.2, <3.0
ipdb
six
django-yaa-settings
Expand Down

0 comments on commit 78453fa

Please sign in to comment.