Remove django-pgcrypto-fields.

incuna · Mar 2, 2017 · 9706aa7 · 9706aa7
1 parent 26be183
commit 9706aa7
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 102 deletions.
diff --git a/README.md b/README.md
@@ -8,10 +8,6 @@ Logging for changes made to Django model instances.
 
 Add `model_logging` to your `INSTALLED_APPS`.
 
-This library uses [`django-pgcrypto-fields`](https://github.com/incuna/django-pgcrypto-fields),
-which means you will need PGP public and private keys.  See the `settings.configure()`
-block in `model_logging/tests/run.py` for an (extremely insecure) example.
-
 ## Usage
 
 #### Low-level use

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+Upcoming
+
+* BREAKING CHANGE: Remove django-pgcrypto-fields.
+
 ### v0.1.0
 
 * Add LogEntry model, together with a supporting serializer and view mixins.
diff --git a/model_logging/migrations/0001_initial.py b/model_logging/migrations/0001_initial.py
@@ -2,7 +2,6 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
-import pgcrypto.fields
 from django.conf import settings
 import django.utils.timezone
 
@@ -21,7 +20,7 @@ class Migration(migrations.Migration):
                 ('date_created', models.DateTimeField(default=django.utils.timezone.now)),
                 ('operation', models.CharField(max_length=255, choices=[('added', 'Added'), ('removed', 'Removed'), ('modified', 'Modified')])),
                 ('model_path', models.CharField(max_length=255)),
-                ('data', pgcrypto.fields.TextPGPPublicKeyField(default='')),
+                ('data', models.TextField(default='')),
                 ('creator', models.ForeignKey(null=True, related_name='log_entries_created', to=settings.AUTH_USER_MODEL)),
                 ('user', models.ForeignKey(null=True, related_name='log_entries', to=settings.AUTH_USER_MODEL)),
             ],

diff --git a/model_logging/models.py b/model_logging/models.py
@@ -2,7 +2,6 @@
 from django.db import models
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
-from pgcrypto.fields import TextPGPPublicKeyField
 
 
 def get_model_path(model):
@@ -66,7 +65,7 @@ class LogEntry(models.Model):
 
     operation = models.CharField(choices=OPERATION_CHOICES, max_length=255)
     model_path = models.CharField(max_length=255)
-    data = TextPGPPublicKeyField(default='')
+    data = models.TextField(default='')
     user = models.ForeignKey(
         settings.AUTH_USER_MODEL,
         null=True,

diff --git a/model_logging/tests/keys/private.key b/model_logging/tests/keys/private.key
diff --git a/model_logging/tests/keys/public.key b/model_logging/tests/keys/public.key
diff --git a/model_logging/tests/run.py b/model_logging/tests/run.py
@@ -21,7 +21,6 @@
 
     INSTALLED_APPS=(
         'model_logging',
-        'pgcrypto',
 
         'django',
         'django.contrib.admin',
@@ -30,11 +29,6 @@
         'django.contrib.sessions',
         'django.contrib.sites',
     ),
-
-    # Dummy pgcrypto configuration
-    PGCRYPTO_KEY='so_secure_you_guys',
-    PUBLIC_PGP_KEY=open('model_logging/tests/keys/public.key').read(),
-    PRIVATE_PGP_KEY=open('model_logging/tests/keys/private.key').read(),
 )
 
 

diff --git a/setup.py b/setup.py
@@ -5,7 +5,6 @@
 
 
 install_requires={
-    'django-pgcrypto-fields>=1.0.0,<2.0.0',
     'simplejson>=3.8.0,<4.0.0',
     'djangorestframework>=3.2.4,<4.0.0',
 }