Merge pull request #297 from uktrade/release/jagermeister

Release Jagermeister
uktrade · Jul 13, 2017 · 59b2744 · 59b2744
2 parents df31e1a + 19c74b8
commit 59b2744
Show file tree

Hide file tree

Showing 47 changed files with 1,688 additions and 909 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,65 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: python:3.6
+
+      - image: elasticsearch:2.3
+
+      - image: postgres:9.5
+        environment:
+          POSTGRES_DB=datahub
+
+    environment:
+      DATABASE_URL: postgresql://postgres@localhost/datahub
+      DATAHUB_SECRET: secret
+      DEBUG: 'True'
+      DJANGO_SECRET_KEY: changeme
+      DJANGO_SETTINGS_MODULE: config.settings.local
+      ES_INDEX: test_index
+      ES_URL: http://localhost:9200
+      CDMS_AUTH_URL: http://example.com
+      AWS_DEFAULT_REGION: eu-west-2
+      AWS_ACCESS_KEY_ID: foo
+      AWS_SECRET_ACCESS_KEY: bar
+      DOCUMENTS_BUCKET: baz
+
+    working_directory: ~/app
+
+    steps:
+      - checkout
+
+      - restore_cache:
+          name: Restore pip cache
+          keys:
+            - v1-leeloo-{{ checksum "requirements.txt" }}
+            - v1-leeloo-
+          paths:
+            - ~/cache/pip
+
+      - run:
+          name: Install dependencies
+          command: pip install --cache-dir ~/cache/pip -r requirements.txt
+
+      - save_cache:
+          name: Save pip cache
+          key: v1-leeloo-{{ checksum "requirements.txt" }}
+          paths:
+            - ~/cache/pip
+      - run:
+          name: Run Flake8
+          command: flake8
+
+      - run:
+          name: Run tests
+          command: |
+            set -xu
+            ./tests-auth.sh
+            ./tests.sh
+
+      - run:
+          name: Publish coverage
+          command: |
+            set -xu
+            wget -O codecov.sh https://codecov.io/bash
+            bash ./codecov.sh -t ${COV_TOKEN}
diff --git a/circle.yml b/circle.yml
diff --git a/datahub/company/migrations/0001_squash_0030_initial.py b/datahub/company/migrations/0001_squash_0030_initial.py
@@ -46,7 +46,7 @@ class Migration(migrations.Migration):
                 'abstract': False,
             },
             managers=[
-                ('objects', datahub.company.models.AdviserManager()),
+                ('objects', datahub.company.models.adviser.AdviserManager()),
             ],
         ),
         migrations.CreateModel(
@@ -108,7 +108,7 @@ class Migration(migrations.Migration):
                 ('trading_address_county', models.CharField(blank=True, max_length=255, null=True)),
                 ('trading_address_postcode', models.CharField(blank=True, max_length=255, null=True)),
                 ('account_manager', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='companies', to=settings.AUTH_USER_MODEL)),
-                ('archived_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)),
+                ('archived_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
                 ('business_type', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='metadata.BusinessType')),
                 ('classification', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='metadata.CompanyClassification')),
                 ('employee_range', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='metadata.EmployeeRange')),
@@ -160,7 +160,7 @@ class Migration(migrations.Migration):
                 ('contactable_by_phone', models.BooleanField(default=True)),
                 ('address_country', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='metadata.Country')),
                 ('advisor', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='contacts', to=settings.AUTH_USER_MODEL)),
-                ('archived_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)),
+                ('archived_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
                 ('company', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='contacts', to='company.Company')),
                 ('title', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='metadata.Title')),
             ],

diff --git a/datahub/company/migrations/0003_fix_blank_fields.py b/datahub/company/migrations/0003_fix_blank_fields.py
@@ -33,7 +33,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='company',
             name='archived_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL),
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL),
         ),
         migrations.AlterField(
             model_name='company',
@@ -88,7 +88,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='contact',
             name='archived_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL),
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL),
         ),
         migrations.AlterField(
             model_name='contact',