From 8930c1049200d0b20c490c10418a7c310a108a59 Mon Sep 17 00:00:00 2001 From: ckleemann Date: Wed, 4 Mar 2020 18:14:29 +0100 Subject: [PATCH 1/6] Remove python 2 unicode compatible decorator --- secure_mail/models.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/secure_mail/models.py b/secure_mail/models.py index 8558cc2..d91e2d6 100644 --- a/secure_mail/models.py +++ b/secure_mail/models.py @@ -1,13 +1,11 @@ from __future__ import unicode_literals from django.db import models -from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ from secure_mail.utils import addresses_for_key, get_gpg -@python_2_unicode_compatible class Key(models.Model): """ Accepts a key and imports it via admin's save_model which @@ -51,7 +49,6 @@ def save(self, *args, **kwargs): address.save() -@python_2_unicode_compatible class Address(models.Model): """ Stores the address for a successfully imported key and allows From 62143ef5363ec136da07ed9449ec8725d5f9d305 Mon Sep 17 00:00:00 2001 From: ckleemann Date: Wed, 4 Mar 2020 18:15:50 +0100 Subject: [PATCH 2/6] remove imports from future --- secure_mail/backends.py | 2 -- secure_mail/management/commands/email_signing_key.py | 2 -- secure_mail/models.py | 2 -- 3 files changed, 6 deletions(-) diff --git a/secure_mail/backends.py b/secure_mail/backends.py index 9778104..750f6cd 100644 --- a/secure_mail/backends.py +++ b/secure_mail/backends.py @@ -1,5 +1,3 @@ -from __future__ import with_statement - from email.mime.base import MIMEBase from django.core.mail.backends.console import EmailBackend as ConsoleBackend diff --git a/secure_mail/management/commands/email_signing_key.py b/secure_mail/management/commands/email_signing_key.py index f2e5d37..1009eab 100644 --- a/secure_mail/management/commands/email_signing_key.py +++ b/secure_mail/management/commands/email_signing_key.py @@ -1,8 +1,6 @@ """ Script to generate and upload a signing key to keyservers """ -from __future__ import print_function - import argparse from django.core.management.base import LabelCommand, CommandError diff --git a/secure_mail/models.py b/secure_mail/models.py index d91e2d6..63c2848 100644 --- a/secure_mail/models.py +++ b/secure_mail/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import models from django.utils.translation import ugettext_lazy as _ From 5020c28b209b3563f20dc85a69246210c72a4e45 Mon Sep 17 00:00:00 2001 From: ckleemann Date: Wed, 20 May 2020 17:14:43 +0200 Subject: [PATCH 3/6] updatet ci matrix to supported django and python versions --- .travis.yml | 37 +++---------------------------------- 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/.travis.yml b/.travis.yml index 02a266c..1ebac21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,45 +3,14 @@ sudo: false language: python env: - - DJANGO_VERSION="Django>=1.8,<1.9" - - DJANGO_VERSION="Django>=1.9,<1.10" - - DJANGO_VERSION="Django>=1.10,<1.11" - - DJANGO_VERSION="Django>=1.11,<2.0" - DJANGO_VERSION="Django>=2.0,<2.1" + - DJANGO_VERSION="Django>=3.0,<3.1" - DJANGO_VERSION='https://github.com/django/django/archive/master.tar.gz' python: - - "2.7" - - "3.4" - - "3.5" - "3.6" - # - "3.7" + - "3.7" + - "3.8" matrix: - exclude: - - python: "3.6" - env: DJANGO_VERSION="Django>=1.8,<1.9" - - python: "3.6" - env: DJANGO_VERSION="Django>=1.9,<1.10" - - python: "3.6" - env: DJANGO_VERSION="Django>=1.10,<1.11" - - # - python: "3.7" - # env: DJANGO_VERSION="Django>=1.8,<1.9" - # - python: "3.7" - # env: DJANGO_VERSION="Django>=1.9,<1.10" - # - python: "3.7" - # env: DJANGO_VERSION="Django>=1.10,<1.11" - # - python: "3.7" - # env: DJANGO_VERSION="Django>=2.0,<2.1" - - # Django 2.0 won't support Python 2.x anymore - - python: "2.7" - env: DJANGO_VERSION="Django>=2.0,<2.1" - - # Django 2.1 won't support Python 3.4 anymore - - python: "2.7" - env: DJANGO_VERSION='https://github.com/django/django/archive/master.tar.gz' - - python: "3.4" - env: DJANGO_VERSION='https://github.com/django/django/archive/master.tar.gz' allow_failures: - env: DJANGO_VERSION='https://github.com/django/django/archive/master.tar.gz' From 5c2f72fdfa89c6fefe5f1edb73f3b8c719acb721 Mon Sep 17 00:00:00 2001 From: ckleemann Date: Wed, 20 May 2020 17:23:01 +0200 Subject: [PATCH 4/6] add a call to gnupg to create the gnupghome dir --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1ebac21..f4a3413 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,8 @@ install: before_script: # Make sure we have gpg installed; this also logs the version of GPG - gpg --version + # Create the gnupghome if it dose not exist + - gpg --list-keys script: - flake8 secure_mail --exclude=secure_mail/migrations - coverage run manage.py migrate From 96b24b5af29676c17749305aa32e742f31d2241c Mon Sep 17 00:00:00 2001 From: ckleemann Date: Wed, 20 May 2020 17:27:42 +0200 Subject: [PATCH 5/6] Revert "add a call to gnupg to create the gnupghome dir" This reverts commit 5c2f72fdfa89c6fefe5f1edb73f3b8c719acb721. --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f4a3413..1ebac21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,8 +21,6 @@ install: before_script: # Make sure we have gpg installed; this also logs the version of GPG - gpg --version - # Create the gnupghome if it dose not exist - - gpg --list-keys script: - flake8 secure_mail --exclude=secure_mail/migrations - coverage run manage.py migrate From 66dcbc63fd7ce799cf327d339e5d17f26e4d843e Mon Sep 17 00:00:00 2001 From: ckleemann Date: Fri, 22 May 2020 13:37:26 +0200 Subject: [PATCH 6/6] create missing directory --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1ebac21..23f836b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ install: before_script: # Make sure we have gpg installed; this also logs the version of GPG - gpg --version + - mkdir gpg_keyring script: - flake8 secure_mail --exclude=secure_mail/migrations - coverage run manage.py migrate