Merge branch 'test' into CSCMETAX-394-remove-sensitive-data-in-oai-pmh

Author: junsk1

.flake8

@@ -27,5 +27,5 @@ ignore =
     # do not use bare except
     E722
 
-# often contains "unused" imports
-exclude = __init__.py, src/metax_api/migrations, src/static
+# often contains "unused" imports, too long lines (generated files), and such
+exclude = __init__.py,src/metax_api/migrations/*,src/static

.gitignore

@@ -6,6 +6,4 @@
 /src/.coverage
 .idea/
 ubuntu-xenial-16.04-cloudimg-console.log
-/src/metax_api/migrations/*
-!/src/metax_api/migrations/*__keep*
 .ropeproject/

src/metax_api/management/commands/loadinitialdata.py

@@ -100,7 +100,7 @@ def _load_data_catalogs(self):
                 except:
                     raise CommandError(response.content)
 
-                if self._error_is_already_exists(errors['catalog_json']):
+                if self._error_is_already_exists(errors.get('catalog_json', {})):
                     self.stdout.write('Catalog %s already exists, updating instead...' %
                         dc['catalog_json']['identifier'])
 
@@ -139,7 +139,7 @@ def _load_file_storages(self):
                     errors = response.json()
                 except:
                     raise CommandError(response.content)
-                if self._error_is_already_exists(errors['file_storage_json']):
+                if self._error_is_already_exists(errors.get('file_storage_json', {})):
                     self.stdout.write('File storage %s already exists, updating instead...' %
                         fs['file_storage_json']['identifier'])
 

src/metax_api/migrations/0001_initial.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-08-14 12:21
 from __future__ import unicode_literals
 
 from django.db import migrations
@@ -9,8 +8,6 @@ class Migration(migrations.Migration):
 
     """
     Create unique indexes for fields inside the jsonfields in different models.
-
-    Note that this file is not deleted during the recreate-db command.
     """
 
     dependencies = [