From b6a870c0e5136ff95399ea5d0f4e2652d4d94010 Mon Sep 17 00:00:00 2001 From: dadosch Date: Fri, 24 Aug 2018 21:31:43 +0200 Subject: [PATCH 01/15] django v2 compatible: tests needed --- requirements.txt | 106 ++++++++++++++++++++-------------------- src/documents/admin.py | 5 +- src/documents/models.py | 5 +- src/paperless/urls.py | 4 +- src/reminders/models.py | 2 +- 5 files changed, 64 insertions(+), 58 deletions(-) diff --git a/requirements.txt b/requirements.txt index 125a89ac7..69c1afd48 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,53 +1,53 @@ -apipkg==1.4 -attrs==18.1.0 -certifi==2018.4.16 -chardet==3.0.4 -coverage==4.5.1 -coveralls==1.3.0 -dateparser==0.7.0 -django-cors-headers==2.4.0 -django-crispy-forms==1.7.2 -django-extensions==2.0.7 -django-filter==1.1.0 -django-flat-responsive==2.0 -django==1.11.13 -djangorestframework==3.8.2 -docopt==0.6.2 -execnet==1.5.0 -factory-boy==2.11.1 -faker==0.8.15 -filemagic==1.6 -flake8==3.5.0 -fuzzywuzzy==0.15.0 -gunicorn==19.8.1 -idna==2.6 -inotify_simple==1.1.7; sys_platform == 'linux' -langdetect==1.0.7 -mccabe==0.6.1 -more-itertools==4.1.0 -pdftotext==2.0.2 -pillow==5.1.0 -pluggy==0.6.0 -py==1.5.3 -pycodestyle==2.3.1 -pyflakes==1.6.0 -pyocr==0.5.1 -pytest-cov==2.5.1 -pytest-django==3.2.1 -pytest-env==0.6.2 -pytest-forked==0.2 -pytest-sugar==0.9.1 -pytest-xdist==1.22.2 -pytest==3.5.1 -python-dateutil==2.7.3 -python-dotenv==0.8.2 -python-gnupg==0.4.2 -python-levenshtein==0.12.0 -pytz==2018.4 -regex==2018.2.21 -requests==2.18.4 -six==1.11.0 -termcolor==1.1.0 -text-unidecode==1.2 -tzlocal==1.5.1 -urllib3==1.22 +apipkg>=1.4 +attrs>=18.1.0 +certifi>=2018.4.16 +chardet>=3.0.4 +coverage>=4.5.1 +coveralls>=1.3.0 +dateparser>=0.7.0 +django-cors-headers>=2.4.0 +django-crispy-forms>=1.7.2 +django-extensions>=2.0.7 +django-filter>=2.0.0 +django-flat-responsive>=2.0 +django>=2.1 +djangorestframework>=3.8.2 +docopt>=0.6.2 +execnet>=1.5.0 +factory-boy>=2.11.1 +faker>=0.8.15 +filemagic>=1.6 +flake8>=3.5.0 +fuzzywuzzy>=0.15.0 +gunicorn>=19.8.1 +idna>=2.6 +inotify_simple>=1.1.7; sys_platform == 'linux' +langdetect>=1.0.7 +mccabe>=0.6.1 +more-itertools>=4.1.0 +pdftotext>=2.0.2 +pillow>=5.1.0 +pluggy>=0.6.0 +py>=1.5.3 +pycodestyle>=2.3.1 +pyflakes>=1.6.0 +pyocr>=0.5.1 +pytest-cov>=2.5.1 +pytest-django>=3.2.1 +pytest-env>=0.6.2 +pytest-forked>=0.2 +pytest-sugar>=0.9.1 +pytest-xdist>=1.22.2 +pytest>=3.5.1 +python-dateutil>=2.7.3 +python-dotenv>=0.8.2 +python-gnupg>=0.4.2 +python-levenshtein>=0.12.0 +pytz>=2018.4 +regex>=2018.2.21 +requests>=2.18.4 +six>=1.11.0 +termcolor>=1.1.0 +text-unidecode>=1.2 +tzlocal>=1.5.1 +urllib3>=1.22 diff --git a/src/documents/admin.py b/src/documents/admin.py index 659ad8581..327aaab22 100644 --- a/src/documents/admin.py +++ b/src/documents/admin.py @@ -3,7 +3,10 @@ from datetime import datetime from django.conf import settings from django.contrib import admin from django.contrib.auth.models import User, Group -from django.core.urlresolvers import reverse +try: + from django.core.urlresolvers import reverse +except: + from django.urls import reverse from django.templatetags.static import static from .models import Correspondent, Tag, Document, Log diff --git a/src/documents/models.py b/src/documents/models.py index 7390c1d3c..ad7521abc 100644 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -10,7 +10,10 @@ from collections import OrderedDict from fuzzywuzzy import fuzz from django.conf import settings -from django.core.urlresolvers import reverse +try: + from django.core.urlresolvers import reverse +except: + from django.urls import reverse from django.db import models from django.template.defaultfilters import slugify from django.utils import timezone diff --git a/src/paperless/urls.py b/src/paperless/urls.py index e5e559f12..468bb768c 100644 --- a/src/paperless/urls.py +++ b/src/paperless/urls.py @@ -28,9 +28,9 @@ urlpatterns = [ # API url( r"^api/auth/", - include('rest_framework.urls', namespace="rest_framework") + include(('rest_framework.urls','rest_framework'), namespace="rest_framework") ), - url(r"^api/", include(router.urls, namespace="drf")), + url(r"^api/", include((router.urls, 'drf'), namespace="drf")), # File downloads url( diff --git a/src/reminders/models.py b/src/reminders/models.py index d6fb744f7..c01b5193e 100644 --- a/src/reminders/models.py +++ b/src/reminders/models.py @@ -3,6 +3,6 @@ from django.db import models class Reminder(models.Model): - document = models.ForeignKey("documents.Document") + document = models.ForeignKey("documents.Document",on_delete=models.DO_NOTHING) date = models.DateTimeField() note = models.TextField(blank=True) From 6cd06f6c8a68f039f88ef82e09d8cf9faa8ef51c Mon Sep 17 00:00:00 2001 From: dadosch Date: Fri, 24 Aug 2018 21:52:27 +0200 Subject: [PATCH 02/15] improved codestyle, go back to == in requirements --- requirements.txt | 106 ++++++++++++++++++++-------------------- src/documents/admin.py | 2 +- src/documents/models.py | 2 +- src/paperless/urls.py | 4 +- src/reminders/models.py | 4 +- 5 files changed, 61 insertions(+), 57 deletions(-) diff --git a/requirements.txt b/requirements.txt index 69c1afd48..23fab569f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,53 +1,53 @@ -apipkg>=1.4 -attrs>=18.1.0 -certifi>=2018.4.16 -chardet>=3.0.4 -coverage>=4.5.1 -coveralls>=1.3.0 -dateparser>=0.7.0 -django-cors-headers>=2.4.0 -django-crispy-forms>=1.7.2 -django-extensions>=2.0.7 -django-filter>=2.0.0 -django-flat-responsive>=2.0 -django>=2.1 -djangorestframework>=3.8.2 -docopt>=0.6.2 -execnet>=1.5.0 -factory-boy>=2.11.1 -faker>=0.8.15 -filemagic>=1.6 -flake8>=3.5.0 -fuzzywuzzy>=0.15.0 -gunicorn>=19.8.1 -idna>=2.6 -inotify_simple>=1.1.7; sys_platform == 'linux' -langdetect>=1.0.7 -mccabe>=0.6.1 -more-itertools>=4.1.0 -pdftotext>=2.0.2 -pillow>=5.1.0 -pluggy>=0.6.0 -py>=1.5.3 -pycodestyle>=2.3.1 -pyflakes>=1.6.0 -pyocr>=0.5.1 -pytest-cov>=2.5.1 -pytest-django>=3.2.1 -pytest-env>=0.6.2 -pytest-forked>=0.2 -pytest-sugar>=0.9.1 -pytest-xdist>=1.22.2 -pytest>=3.5.1 -python-dateutil>=2.7.3 -python-dotenv>=0.8.2 -python-gnupg>=0.4.2 -python-levenshtein>=0.12.0 -pytz>=2018.4 -regex>=2018.2.21 -requests>=2.18.4 -six>=1.11.0 -termcolor>=1.1.0 -text-unidecode>=1.2 -tzlocal>=1.5.1 -urllib3>=1.22 +apipkg==1.4 +attrs==18.1.0 +certifi==2018.4.16 +chardet==3.0.4 +coverage==4.5.1 +coveralls==1.3.0 +dateparser==0.7.0 +django-cors-headers==2.4.0 +django-crispy-forms==1.7.2 +django-extensions==2.0.7 +django-filter==2.0.0 +django-flat-responsive==2.0 +django>=2.0 +djangorestframework==3.8.2 +docopt==0.6.2 +execnet==1.5.0 +factory-boy==2.11.1 +faker==0.8.15 +filemagic==1.6 +flake8==3.5.0 +fuzzywuzzy==0.15.0 +gunicorn==19.8.1 +idna==2.6 +inotify_simple==1.1.7; sys_platform == 'linux' +langdetect==1.0.7 +mccabe==0.6.1 +more-itertools==4.1.0 +pdftotext==2.0.2 +pillow==5.1.0 +pluggy==0.6.0 +py==1.5.3 +pycodestyle==2.3.1 +pyflakes==1.6.0 +pyocr==0.5.1 +pytest-cov==2.5.1 +pytest-django==3.2.1 +pytest-env==0.6.2 +pytest-forked==0.2 +pytest-sugar==0.9.1 +pytest-xdist==1.22.2 +pytest==3.5.1 +python-dateutil==2.7.3 +python-dotenv==0.8.2 +python-gnupg==0.4.2 +python-levenshtein==0.12.0 +pytz==2018.4 +regex==2018.2.21 +requests==2.18.4 +six==1.11.0 +termcolor==1.1.0 +text-unidecode==1.2 +tzlocal==1.5.1 +urllib3==1.22 diff --git a/src/documents/admin.py b/src/documents/admin.py index 327aaab22..534f9143b 100644 --- a/src/documents/admin.py +++ b/src/documents/admin.py @@ -5,7 +5,7 @@ from django.contrib import admin from django.contrib.auth.models import User, Group try: from django.core.urlresolvers import reverse -except: +except ImportError: from django.urls import reverse from django.templatetags.static import static diff --git a/src/documents/models.py b/src/documents/models.py index ad7521abc..971451268 100644 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -12,7 +12,7 @@ from fuzzywuzzy import fuzz from django.conf import settings try: from django.core.urlresolvers import reverse -except: +except ImportError: from django.urls import reverse from django.db import models from django.template.defaultfilters import slugify diff --git a/src/paperless/urls.py b/src/paperless/urls.py index 468bb768c..f66ce6664 100644 --- a/src/paperless/urls.py +++ b/src/paperless/urls.py @@ -28,7 +28,9 @@ urlpatterns = [ # API url( r"^api/auth/", - include(('rest_framework.urls','rest_framework'), namespace="rest_framework") + include( + ('rest_framework.urls', 'rest_framework'), + namespace="rest_framework") ), url(r"^api/", include((router.urls, 'drf'), namespace="drf")), diff --git a/src/reminders/models.py b/src/reminders/models.py index c01b5193e..b34c455aa 100644 --- a/src/reminders/models.py +++ b/src/reminders/models.py @@ -3,6 +3,8 @@ from django.db import models class Reminder(models.Model): - document = models.ForeignKey("documents.Document",on_delete=models.DO_NOTHING) + document = models.ForeignKey( + "documents.Document", on_delete=models.DO_NOTHING + ) date = models.DateTimeField() note = models.TextField(blank=True) From 40e79a731fb186ddfbc3b15b03302a727fa5b215 Mon Sep 17 00:00:00 2001 From: dadosch Date: Fri, 24 Aug 2018 22:03:26 +0200 Subject: [PATCH 03/15] builds failing maybe because of old versions --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 23fab569f..5f7a0f081 100644 --- a/requirements.txt +++ b/requirements.txt @@ -33,12 +33,12 @@ pycodestyle==2.3.1 pyflakes==1.6.0 pyocr==0.5.1 pytest-cov==2.5.1 -pytest-django==3.2.1 +pytest-django==3.4.2 pytest-env==0.6.2 pytest-forked==0.2 pytest-sugar==0.9.1 -pytest-xdist==1.22.2 -pytest==3.5.1 +pytest-xdist==1.22.5 +pytest==3.7.2 python-dateutil==2.7.3 python-dotenv==0.8.2 python-gnupg==0.4.2 From 91cecd47af81015b519ca65f67088d050983ac3f Mon Sep 17 00:00:00 2001 From: dadosch Date: Wed, 29 Aug 2018 00:04:48 +0200 Subject: [PATCH 04/15] apply some patches from @brookst --- requirements.txt | 12 ++++++------ src/documents/migrations/0003_sender.py | 2 +- .../migrations/0011_auto_20160303_1929.py | 2 +- .../migrations/0012_auto_20160305_0040.py | 2 +- .../migrations/0014_document_checksum.py | 2 +- .../migrations/0019_add_consumer_user.py | 2 +- .../migrations/0020_document_added.py | 2 +- src/paperless/settings.py | 9 ++++----- .../migrations/0002_auto_20180824_2018.py | 19 +++++++++++++++++++ src/reminders/models.py | 2 +- 10 files changed, 36 insertions(+), 18 deletions(-) create mode 100644 src/reminders/migrations/0002_auto_20180824_2018.py diff --git a/requirements.txt b/requirements.txt index 5f7a0f081..1e1158b31 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,13 @@ -apipkg==1.4 +apipkg==1.5 attrs==18.1.0 -certifi==2018.4.16 +certifi>=2018.8.24 chardet==3.0.4 coverage==4.5.1 -coveralls==1.3.0 +coveralls==1.4.0 dateparser==0.7.0 django-cors-headers==2.4.0 django-crispy-forms==1.7.2 -django-extensions==2.0.7 +django-extensions==2.1.0 django-filter==2.0.0 django-flat-responsive==2.0 django>=2.0 @@ -15,7 +15,7 @@ djangorestframework==3.8.2 docopt==0.6.2 execnet==1.5.0 factory-boy==2.11.1 -faker==0.8.15 +faker==0.9.0 filemagic==1.6 flake8==3.5.0 fuzzywuzzy==0.15.0 @@ -27,7 +27,7 @@ mccabe==0.6.1 more-itertools==4.1.0 pdftotext==2.0.2 pillow==5.1.0 -pluggy==0.6.0 +pluggy==0.7.1 py==1.5.3 pycodestyle==2.3.1 pyflakes==1.6.0 diff --git a/src/documents/migrations/0003_sender.py b/src/documents/migrations/0003_sender.py index ce2508994..d3aad9903 100644 --- a/src/documents/migrations/0003_sender.py +++ b/src/documents/migrations/0003_sender.py @@ -32,7 +32,7 @@ def realign_senders(apps, schema_editor): class Migration(migrations.Migration): - + atomic = False dependencies = [ ('documents', '0002_auto_20151226_1316'), ] diff --git a/src/documents/migrations/0011_auto_20160303_1929.py b/src/documents/migrations/0011_auto_20160303_1929.py index af4ee4c66..7b77a8835 100644 --- a/src/documents/migrations/0011_auto_20160303_1929.py +++ b/src/documents/migrations/0011_auto_20160303_1929.py @@ -6,7 +6,7 @@ from django.db import migrations class Migration(migrations.Migration): - + atomic = False dependencies = [ ('documents', '0010_log'), ] diff --git a/src/documents/migrations/0012_auto_20160305_0040.py b/src/documents/migrations/0012_auto_20160305_0040.py index 5168c9206..f1659f4a1 100644 --- a/src/documents/migrations/0012_auto_20160305_0040.py +++ b/src/documents/migrations/0012_auto_20160305_0040.py @@ -112,7 +112,7 @@ def move_documents_and_create_thumbnails(apps, schema_editor): class Migration(migrations.Migration): - + atomic = False dependencies = [ ('documents', '0011_auto_20160303_1929'), ] diff --git a/src/documents/migrations/0014_document_checksum.py b/src/documents/migrations/0014_document_checksum.py index 167245dea..b58b9ebc1 100644 --- a/src/documents/migrations/0014_document_checksum.py +++ b/src/documents/migrations/0014_document_checksum.py @@ -128,7 +128,7 @@ def do_nothing(apps, schema_editor): class Migration(migrations.Migration): - + atomic = False dependencies = [ ('documents', '0013_auto_20160325_2111'), ] diff --git a/src/documents/migrations/0019_add_consumer_user.py b/src/documents/migrations/0019_add_consumer_user.py index a3d7d787e..82670e53f 100644 --- a/src/documents/migrations/0019_add_consumer_user.py +++ b/src/documents/migrations/0019_add_consumer_user.py @@ -15,7 +15,7 @@ def reverse_func(apps, schema_editor): class Migration(migrations.Migration): - + atomic = False dependencies = [ ('documents', '0018_auto_20170715_1712'), ] diff --git a/src/documents/migrations/0020_document_added.py b/src/documents/migrations/0020_document_added.py index dbddf80ae..485c04671 100644 --- a/src/documents/migrations/0020_document_added.py +++ b/src/documents/migrations/0020_document_added.py @@ -12,7 +12,7 @@ def set_added_time_to_created_time(apps, schema_editor): doc.save() class Migration(migrations.Migration): - + atomic = False dependencies = [ ('documents', '0019_add_consumer_user'), ] diff --git a/src/paperless/settings.py b/src/paperless/settings.py index e40af01d1..dec20ec3c 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -82,14 +82,13 @@ if os.getenv("PAPERLESS_INSTALLED_APPS"): -MIDDLEWARE_CLASSES = [ +MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'corsheaders.middleware.CorsMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] @@ -99,9 +98,9 @@ CORS_ORIGIN_WHITELIST = tuple(os.getenv("PAPERLESS_CORS_ALLOWED_HOSTS", "localho # If auth is disabled, we just use our "bypass" authentication middleware if bool(os.getenv("PAPERLESS_DISABLE_LOGIN", "false").lower() in ("yes", "y", "1", "t", "true")): - _index = MIDDLEWARE_CLASSES.index("django.contrib.auth.middleware.AuthenticationMiddleware") - MIDDLEWARE_CLASSES[_index] = "paperless.middleware.Middleware" - MIDDLEWARE_CLASSES.remove("django.contrib.auth.middleware.SessionAuthenticationMiddleware") + _index = MIDDLEWARE.index("django.contrib.auth.middleware.AuthenticationMiddleware") + MIDDLEWARE[_index] = "paperless.middleware.Middleware" + MIDDLEWARE.remove("django.contrib.auth.middleware.SessionAuthenticationMiddleware") ROOT_URLCONF = 'paperless.urls' diff --git a/src/reminders/migrations/0002_auto_20180824_2018.py b/src/reminders/migrations/0002_auto_20180824_2018.py new file mode 100644 index 000000000..4056767bf --- /dev/null +++ b/src/reminders/migrations/0002_auto_20180824_2018.py @@ -0,0 +1,19 @@ +# Generated by Django 2.1 on 2018-08-24 20:18 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('reminders', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='reminder', + name='document', + field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='documents.Document'), + ), + ] diff --git a/src/reminders/models.py b/src/reminders/models.py index b34c455aa..64affaf77 100644 --- a/src/reminders/models.py +++ b/src/reminders/models.py @@ -4,7 +4,7 @@ from django.db import models class Reminder(models.Model): document = models.ForeignKey( - "documents.Document", on_delete=models.DO_NOTHING + "documents.Document", on_delete=models.PROTECTION ) date = models.DateTimeField() note = models.TextField(blank=True) From 633d2b376fedba1e0967fac291bc5ca6279c485a Mon Sep 17 00:00:00 2001 From: dadosch Date: Wed, 29 Aug 2018 00:08:01 +0200 Subject: [PATCH 05/15] PROTECT, not PROTECTION --- src/reminders/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/reminders/models.py b/src/reminders/models.py index 64affaf77..77d872afb 100644 --- a/src/reminders/models.py +++ b/src/reminders/models.py @@ -4,7 +4,7 @@ from django.db import models class Reminder(models.Model): document = models.ForeignKey( - "documents.Document", on_delete=models.PROTECTION + "documents.Document", on_delete=models.PROTECT ) date = models.DateTimeField() note = models.TextField(blank=True) From 0b9c4f9963b289c16d107805f117519cbb8891b5 Mon Sep 17 00:00:00 2001 From: dadosch Date: Wed, 29 Aug 2018 00:19:08 +0200 Subject: [PATCH 06/15] remove my auto generated migration file --- .../migrations/0002_auto_20180824_2018.py | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 src/reminders/migrations/0002_auto_20180824_2018.py diff --git a/src/reminders/migrations/0002_auto_20180824_2018.py b/src/reminders/migrations/0002_auto_20180824_2018.py deleted file mode 100644 index 4056767bf..000000000 --- a/src/reminders/migrations/0002_auto_20180824_2018.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1 on 2018-08-24 20:18 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('reminders', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='reminder', - name='document', - field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='documents.Document'), - ), - ] From efc57852d1ac2968ea29afd233bd89c66329e99b Mon Sep 17 00:00:00 2001 From: dadosch Date: Wed, 29 Aug 2018 00:37:07 +0200 Subject: [PATCH 07/15] remove atomic=False where it is obviously not needed) --- src/documents/migrations/0003_sender.py | 1 - src/documents/migrations/0012_auto_20160305_0040.py | 1 - src/documents/migrations/0014_document_checksum.py | 1 - src/documents/migrations/0019_add_consumer_user.py | 1 - src/documents/migrations/0020_document_added.py | 1 - 5 files changed, 5 deletions(-) diff --git a/src/documents/migrations/0003_sender.py b/src/documents/migrations/0003_sender.py index d3aad9903..27eead032 100644 --- a/src/documents/migrations/0003_sender.py +++ b/src/documents/migrations/0003_sender.py @@ -32,7 +32,6 @@ def realign_senders(apps, schema_editor): class Migration(migrations.Migration): - atomic = False dependencies = [ ('documents', '0002_auto_20151226_1316'), ] diff --git a/src/documents/migrations/0012_auto_20160305_0040.py b/src/documents/migrations/0012_auto_20160305_0040.py index f1659f4a1..a0b4b27af 100644 --- a/src/documents/migrations/0012_auto_20160305_0040.py +++ b/src/documents/migrations/0012_auto_20160305_0040.py @@ -112,7 +112,6 @@ def move_documents_and_create_thumbnails(apps, schema_editor): class Migration(migrations.Migration): - atomic = False dependencies = [ ('documents', '0011_auto_20160303_1929'), ] diff --git a/src/documents/migrations/0014_document_checksum.py b/src/documents/migrations/0014_document_checksum.py index b58b9ebc1..bc563cf86 100644 --- a/src/documents/migrations/0014_document_checksum.py +++ b/src/documents/migrations/0014_document_checksum.py @@ -128,7 +128,6 @@ def do_nothing(apps, schema_editor): class Migration(migrations.Migration): - atomic = False dependencies = [ ('documents', '0013_auto_20160325_2111'), ] diff --git a/src/documents/migrations/0019_add_consumer_user.py b/src/documents/migrations/0019_add_consumer_user.py index 82670e53f..bc52ae7f6 100644 --- a/src/documents/migrations/0019_add_consumer_user.py +++ b/src/documents/migrations/0019_add_consumer_user.py @@ -15,7 +15,6 @@ def reverse_func(apps, schema_editor): class Migration(migrations.Migration): - atomic = False dependencies = [ ('documents', '0018_auto_20170715_1712'), ] diff --git a/src/documents/migrations/0020_document_added.py b/src/documents/migrations/0020_document_added.py index 485c04671..d5b53a051 100644 --- a/src/documents/migrations/0020_document_added.py +++ b/src/documents/migrations/0020_document_added.py @@ -12,7 +12,6 @@ def set_added_time_to_created_time(apps, schema_editor): doc.save() class Migration(migrations.Migration): - atomic = False dependencies = [ ('documents', '0019_add_consumer_user'), ] From efb015733796e58be5cc01359f04b6ee4325f8ad Mon Sep 17 00:00:00 2001 From: dadosch Date: Fri, 31 Aug 2018 00:04:02 +0200 Subject: [PATCH 08/15] add fix for messed up html at reminders, thanks to @brookst --- src/documents/admin.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/documents/admin.py b/src/documents/admin.py index 534f9143b..4143ef2a1 100644 --- a/src/documents/admin.py +++ b/src/documents/admin.py @@ -8,6 +8,8 @@ try: except ImportError: from django.urls import reverse from django.templatetags.static import static +from django.utils.safestring import mark_safe +from django.utils.html import format_html, format_html_join from .models import Correspondent, Tag, Document, Log @@ -180,7 +182,7 @@ class DocumentAdmin(CommonAdmin): ) } ) - return r + return mark_safe(r) tags_.allow_tags = True def document(self, obj): @@ -201,15 +203,14 @@ class DocumentAdmin(CommonAdmin): @staticmethod def _html_tag(kind, inside=None, **kwargs): - attributes = [] - for lft, rgt in kwargs.items(): - attributes.append('{}="{}"'.format(lft, rgt)) + attributes = format_html_join(' ', '{}="{}"', kwargs.items()) if inside is not None: - return "<{kind} {attributes}>{inside}".format( - kind=kind, attributes=" ".join(attributes), inside=inside) + return format_html("<{kind} {attributes}>{inside}", + kind=kind, attributes=attributes, inside=inside) - return "<{} {}/>".format(kind, " ".join(attributes)) + + return format_html("<{} {}/>", kind, attributes) class LogAdmin(CommonAdmin): From ec862ed5261e40ddf31dab320477a6db15b42d77 Mon Sep 17 00:00:00 2001 From: dadosch Date: Fri, 31 Aug 2018 00:17:48 +0200 Subject: [PATCH 09/15] make pycodestyle happy... --- src/documents/admin.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/documents/admin.py b/src/documents/admin.py index 4143ef2a1..7a6f3c368 100644 --- a/src/documents/admin.py +++ b/src/documents/admin.py @@ -202,13 +202,11 @@ class DocumentAdmin(CommonAdmin): @staticmethod def _html_tag(kind, inside=None, **kwargs): - - attributes = format_html_join(' ', '{}="{}"', kwargs.items()) + attributes = format_html_join(' ', '{}="{}"', kwargs.items()) if inside is not None: return format_html("<{kind} {attributes}>{inside}", - kind=kind, attributes=attributes, inside=inside) - + kind=kind, attributes=attributes, inside=inside) return format_html("<{} {}/>", kind, attributes) From 39afe41f08b657c3514aff1f346a6f5b53165e94 Mon Sep 17 00:00:00 2001 From: Daniel Quinn Date: Sun, 2 Sep 2018 21:25:30 +0100 Subject: [PATCH 10/15] Drop django-flat-responsive It's not necessary for Django 2.0+ as the new system is responsive by default. --- Pipfile | 1 - Pipfile.lock | 9 +-------- requirements.txt | 1 - src/paperless/settings.py | 1 - 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Pipfile b/Pipfile index e1b5ace59..a9331f134 100644 --- a/Pipfile +++ b/Pipfile @@ -12,7 +12,6 @@ django-cors-headers = "*" django-crispy-forms = "*" django-extensions = "*" django-filter = "*" -django-flat-responsive = "*" djangorestframework = "*" factory-boy = "*" filemagic = "*" diff --git a/Pipfile.lock b/Pipfile.lock index 63e9883ea..614ee0e78 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "f349fa350cdef16f1b8673d7a317516c0682a801e2039d1d7dc25d90ea2aed38" + "sha256": "e20c2294bcafd346ee57901df94a515a12976ed192dc37df848b39b56bdd1f4b" }, "pipfile-spec": 6, "requires": {}, @@ -144,13 +144,6 @@ "index": "pypi", "version": "==2.0.0" }, - "django-flat-responsive": { - "hashes": [ - "sha256:451caa2700c541b52fb7ce2d34d3d8dee9e980cf29f5463bc8a8c6256a1a6474" - ], - "index": "pypi", - "version": "==2.0" - }, "djangorestframework": { "hashes": [ "sha256:b6714c3e4b0f8d524f193c91ecf5f5450092c2145439ac2769711f7eba89a9d9", diff --git a/requirements.txt b/requirements.txt index 9fc0c6b76..247d9993a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,6 @@ django-cors-headers==2.4.0 django-crispy-forms==1.7.2 django-extensions==2.1.2 django-filter==2.0.0 -django-flat-responsive==2.0 django==2.0.8 djangorestframework==3.8.2 docopt==0.6.2 diff --git a/src/paperless/settings.py b/src/paperless/settings.py index dec20ec3c..2eb6d655a 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -68,7 +68,6 @@ INSTALLED_APPS = [ "reminders.apps.RemindersConfig", "paperless_tesseract.apps.PaperlessTesseractConfig", - "flat_responsive", # TODO: Remove as of Django 2.x "django.contrib.admin", "rest_framework", From 729f00560040930cf35bb15af976567994ce9627 Mon Sep 17 00:00:00 2001 From: Daniel Quinn Date: Sun, 2 Sep 2018 21:26:06 +0100 Subject: [PATCH 11/15] Remove old Python 2.x style code --- src/documents/filters.py | 6 +++--- src/documents/serialisers.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/documents/filters.py b/src/documents/filters.py index 2ed7f29db..902cca2c3 100644 --- a/src/documents/filters.py +++ b/src/documents/filters.py @@ -5,7 +5,7 @@ from .models import Correspondent, Document, Tag class CorrespondentFilterSet(FilterSet): - class Meta(object): + class Meta: model = Correspondent fields = { "name": [ @@ -18,7 +18,7 @@ class CorrespondentFilterSet(FilterSet): class TagFilterSet(FilterSet): - class Meta(object): + class Meta: model = Tag fields = { "name": [ @@ -50,7 +50,7 @@ class DocumentFilterSet(FilterSet): lookup_expr='isnull', distinct=True) - class Meta(object): + class Meta: model = Document fields = { "title": [ diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index 504999276..f71a0c5ab 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -5,14 +5,14 @@ from .models import Correspondent, Tag, Document, Log class CorrespondentSerializer(serializers.HyperlinkedModelSerializer): - class Meta(object): + class Meta: model = Correspondent fields = ("id", "slug", "name") class TagSerializer(serializers.HyperlinkedModelSerializer): - class Meta(object): + class Meta: model = Tag fields = ( "id", "slug", "name", "colour", "match", "matching_algorithm") @@ -34,7 +34,7 @@ class DocumentSerializer(serializers.ModelSerializer): view_name="drf:correspondent-detail", allow_null=True) tags = TagsField(view_name="drf:tag-detail", many=True) - class Meta(object): + class Meta: model = Document fields = ( "id", @@ -57,7 +57,7 @@ class LogSerializer(serializers.ModelSerializer): time = serializers.DateTimeField() messages = serializers.CharField() - class Meta(object): + class Meta: model = Log fields = ( "time", From 2400245b9619b2935022c36d9228624c3abeffd6 Mon Sep 17 00:00:00 2001 From: Daniel Quinn Date: Sun, 2 Sep 2018 21:26:20 +0100 Subject: [PATCH 12/15] pep8 --- src/documents/migrations/0020_document_added.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/documents/migrations/0020_document_added.py b/src/documents/migrations/0020_document_added.py index d5b53a051..bd3566481 100644 --- a/src/documents/migrations/0020_document_added.py +++ b/src/documents/migrations/0020_document_added.py @@ -11,6 +11,7 @@ def set_added_time_to_created_time(apps, schema_editor): doc.added = doc.created doc.save() + class Migration(migrations.Migration): dependencies = [ ('documents', '0019_add_consumer_user'), From f5e725c69114ed0c313dc6f96cedd670700d4d7b Mon Sep 17 00:00:00 2001 From: Daniel Quinn Date: Sun, 2 Sep 2018 21:26:30 +0100 Subject: [PATCH 13/15] Switch out field_name= for name= This appears to be a django-filter version change thing. --- src/documents/filters.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/documents/filters.py b/src/documents/filters.py index 902cca2c3..68861d967 100644 --- a/src/documents/filters.py +++ b/src/documents/filters.py @@ -42,13 +42,16 @@ class DocumentFilterSet(FilterSet): ) } - correspondent__name = CharFilter(name="correspondent__name", **CHAR_KWARGS) - correspondent__slug = CharFilter(name="correspondent__slug", **CHAR_KWARGS) - tags__name = CharFilter(name="tags__name", **CHAR_KWARGS) - tags__slug = CharFilter(name="tags__slug", **CHAR_KWARGS) - tags__empty = BooleanFilter(name='tags', - lookup_expr='isnull', - distinct=True) + correspondent__name = CharFilter( + field_name="correspondent__name", **CHAR_KWARGS) + correspondent__slug = CharFilter( + field_name="correspondent__slug", **CHAR_KWARGS) + tags__name = CharFilter( + field_name="tags__name", **CHAR_KWARGS) + tags__slug = CharFilter( + field_name="tags__slug", **CHAR_KWARGS) + tags__empty = BooleanFilter( + field_name="tags", lookup_expr="isnull", distinct=True) class Meta: model = Document From 08174a6b520db57d10e98dfad8c2b8c9524841b3 Mon Sep 17 00:00:00 2001 From: Daniel Quinn Date: Sun, 2 Sep 2018 21:46:52 +0100 Subject: [PATCH 14/15] Add note about the removal of puritanical language --- CODE_OF_CONDUCT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 643aa0698..d57b2e7e5 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -40,7 +40,7 @@ Project maintainers who do not follow or enforce the Code of Conduct in good fai ## Attribution -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4 to remove puritanical language. The original is available at [http://contributor-covenant.org/version/1/4][version] [homepage]: http://contributor-covenant.org [version]: http://contributor-covenant.org/version/1/4/ From d5180fe5e134fd5511964d26a18de00197b125f6 Mon Sep 17 00:00:00 2001 From: Daniel Quinn Date: Sun, 2 Sep 2018 21:48:09 +0100 Subject: [PATCH 15/15] Updates for 2.2.0 --- docs/changelog.rst | 19 +++++++++++++++++++ src/paperless/version.py | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 84cc6bae9..d92c48b59 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,17 @@ Changelog ######### +2.2.0 +===== + +* Thanks to `dadosch`_ and `Wolfgang Mader`_, this is the first version of + Paperless that supports Django 2.0! As a result of their hard work, you can + now also run Paperless on Python 3.7 as well: `#386`_ & `#390`_. +* `Stéphane Brunner`_ added a few lines of code that made tagging interface a lot + easier on those of us with lots of different tags: `#391`_. +* `Kilian Koeltzsch`_ noticed a bug in how we capture & automatically create + tags, so that's fixed now too: `#384`_. + 2.1.0 ===== @@ -451,6 +462,10 @@ bulk of the work on this big change. .. _mcronce: https://github.com/mcronce .. _Enno Lohmeier: https://github.com/elohmeier .. _Mark McFate: https://github.com/SummittDweller +.. _dadosch: https://github.com/dadosch +.. _Wolfgang Mader: https://github.com/wmader +.. _Stéphane Brunner: https://github.com/sbrunner +.. _Kilian Koeltzsch: https://github.com/kiliankoe .. _#20: https://github.com/danielquinn/paperless/issues/20 .. _#44: https://github.com/danielquinn/paperless/issues/44 @@ -525,6 +540,10 @@ bulk of the work on this big change. .. _#374: https://github.com/danielquinn/paperless/pull/374 .. _#375: https://github.com/danielquinn/paperless/pull/375 .. _#376: https://github.com/danielquinn/paperless/pull/376 +.. _#384: https://github.com/danielquinn/paperless/issues/384 +.. _#386: https://github.com/danielquinn/paperless/issues/386 +.. _#391: https://github.com/danielquinn/paperless/pull/391 +.. _#390: https://github.com/danielquinn/paperless/pull/390 .. _pipenv: https://docs.pipenv.org/ .. _a new home on Docker Hub: https://hub.docker.com/r/danielquinn/paperless/ diff --git a/src/paperless/version.py b/src/paperless/version.py index fc2d6561c..2de334c18 100644 --- a/src/paperless/version.py +++ b/src/paperless/version.py @@ -1 +1 @@ -__version__ = (2, 1, 0) +__version__ = (2, 2, 0)