Feature/6 tox config (#8)

* basic config; pytest is WIP;
* config for pytest
* detox
* setup bump2version
* Bump version: 0.1.0 → 0.1.1

Author: chrisbc

.bumpversion.cfg

@@ -0,0 +1,16 @@
+[bumpversion]
+current_version = 0.1.1
+commit = True
+tag = False
+
+[bumpversion:file:pyproject.toml]
+search = version = "{current_version}"
+replace = version = "{new_version}"
+
+[bumpversion:file:package.json]
+search = "version": "{current_version}",
+replace = "version": "{new_version}"
+
+[bumpversion:file:nzshm_model_graphql_api/__init__.py]
+search = __version__ = '{current_version}'
+replace = __version__ = '{new_version}'

CHANGELOG.md

@@ -0,0 +1,10 @@
+# Changelog
+
+## [0.1.1] - 2023-09-01
+### Added
+ - pytest, tox, etc
+ - bumpversion & CHANGELOG.md
+
+## [0.1.0] - 2023-09-01
+* First version.
+

nshm/admin.py

@@ -1,38 +1,59 @@
 from django.contrib import admin
 
 from .models import (
+    GMCMLogicTree,
+    HazardSolution,
+    LocationList,
     SeismicHazardModel,
-    SourceLogicTree, 
+    SourceLogicTree,
     SourceLogicTreeComponent,
     SourceLogicTreeWeightedComponent,
-    GMCMLogicTree,
-    LocationList,
-    HazardSolution,
 )
 
+
 class SeismicHazardModelAdmin(admin.ModelAdmin):
     fields = ["version", "notes", "source_logic_tree", "gmcm_logic_tree"]
     list_display = ["version", "notes", "source_logic_tree", "gmcm_logic_tree"]
 
+
 class SourceLogicTreeAdmin(admin.ModelAdmin):
     fields = ["version", "notes"]
 
+
 class GMCMLogicTreeAdmin(admin.ModelAdmin):
     fields = ["version", "notes"]
 
+
 class SourceLogicTreeComponentAdmin(admin.ModelAdmin):
-    fields = ["tag", "notes", "inversion_toshi_id", "background_toshi_id", "tectonic_region", "group" ]
-    list_display = ["tag", "notes", "tectonic_region", "group" ]
-    list_filter = ["tectonic_region", "group" ]
+    fields = [
+        "tag",
+        "notes",
+        "inversion_toshi_id",
+        "background_toshi_id",
+        "tectonic_region",
+        "group",
+    ]
+    list_display = ["tag", "notes", "tectonic_region", "group"]
+    list_filter = ["tectonic_region", "group"]
+
 
 class SourceLogicTreeWeightedComponentAdmin(admin.ModelAdmin):
     fields = ["weight", "source_logic_tree", "source_logic_tree_component"]
 
+
 class LocationListAdmin(admin.ModelAdmin):
     fields = ["list_id", "notes", "length"]
 
+
 class HazardSolutionAdmin(admin.ModelAdmin):
-    fields = ["solution_id", "created", "vs30", "notes", "location_lists", "slt_components"]
+    fields = [
+        "solution_id",
+        "created",
+        "vs30",
+        "notes",
+        "location_lists",
+        "slt_components",
+    ]
     list_display = ["solution_id", "created", "vs30", "notes"]
     list_filter = ["vs30", "created"]
 
@@ -41,7 +62,9 @@ class HazardSolutionAdmin(admin.ModelAdmin):
 admin.site.register(SourceLogicTree, SourceLogicTreeAdmin)
 admin.site.register(GMCMLogicTree, GMCMLogicTreeAdmin)
 admin.site.register(SourceLogicTreeComponent, SourceLogicTreeComponentAdmin)
-admin.site.register(SourceLogicTreeWeightedComponent, SourceLogicTreeWeightedComponentAdmin)
+admin.site.register(
+    SourceLogicTreeWeightedComponent, SourceLogicTreeWeightedComponentAdmin
+)
 
 admin.site.register(LocationList, LocationListAdmin)
 admin.site.register(HazardSolution, HazardSolutionAdmin)

nshm/apps.py

@@ -2,5 +2,5 @@
 
 
 class NshmConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'nshm'
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "nshm"

nshm/migrations/0001_initial.py

@@ -7,24 +7,39 @@ class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = [
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(
-            name='SeismicHazardModel',
+            name="SeismicHazardModel",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('version', models.CharField(max_length=30)),
-                ('notes', models.TextField()),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("version", models.CharField(max_length=30)),
+                ("notes", models.TextField()),
             ],
         ),
         migrations.CreateModel(
-            name='SourceLogicTree',
+            name="SourceLogicTree",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('version', models.CharField(max_length=30)),
-                ('notes', models.TextField()),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("version", models.CharField(max_length=30)),
+                ("notes", models.TextField()),
             ],
         ),
     ]

nshm/migrations/0002_seismichazardmodel_source_logic_tree_and_more.py

@@ -1,24 +1,31 @@
 # Generated by Django 4.2.4 on 2023-08-24 00:38
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('nshm', '0001_initial'),
+        ("nshm", "0001_initial"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='seismichazardmodel',
-            name='source_logic_tree',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='nshm.sourcelogictree'),
+            model_name="seismichazardmodel",
+            name="source_logic_tree",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="nshm.sourcelogictree",
+            ),
         ),
         migrations.AlterField(
-            model_name='sourcelogictree',
-            name='notes',
-            field=models.TextField(blank=True, help_text='users can search on this so please add some useful text'),
+            model_name="sourcelogictree",
+            name="notes",
+            field=models.TextField(
+                blank=True,
+                help_text="users can search on this so please add some useful text",
+            ),
         ),
     ]

nshm/migrations/0003_sourcelogictreecomponent_and_more.py

@@ -1,33 +1,62 @@
 # Generated by Django 4.2.4 on 2023-08-24 01:21
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('nshm', '0002_seismichazardmodel_source_logic_tree_and_more'),
+        ("nshm", "0002_seismichazardmodel_source_logic_tree_and_more"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='SourceLogicTreeComponent',
+            name="SourceLogicTreeComponent",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('tag', models.CharField(max_length=50)),
-                ('notes', models.TextField()),
-                ('inversion_toshi_id', models.CharField(max_length=50)),
-                ('background_toshi_id', models.CharField(max_length=50, null=True)),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("tag", models.CharField(max_length=50)),
+                ("notes", models.TextField()),
+                ("inversion_toshi_id", models.CharField(max_length=50)),
+                ("background_toshi_id", models.CharField(max_length=50, null=True)),
             ],
         ),
         migrations.CreateModel(
-            name='SourceLogicTreeWeightedComponent',
+            name="SourceLogicTreeWeightedComponent",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('weight', models.FloatField()),
-                ('source_logic_tree', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='nshm.sourcelogictree')),
-                ('source_logic_tree_component', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='nshm.sourcelogictreecomponent')),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("weight", models.FloatField()),
+                (
+                    "source_logic_tree",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="nshm.sourcelogictree",
+                    ),
+                ),
+                (
+                    "source_logic_tree_component",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        to="nshm.sourcelogictreecomponent",
+                    ),
+                ),
             ],
         ),
     ]

nshm/migrations/0004_sourcelogictreecomponent_tectonic_region.py

@@ -6,14 +6,22 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('nshm', '0003_sourcelogictreecomponent_and_more'),
+        ("nshm", "0003_sourcelogictreecomponent_and_more"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='sourcelogictreecomponent',
-            name='tectonic_region',
-            field=models.CharField(choices=[('CRUSTAL', 'Crustal'), ('SUBDUCTION', 'Subduction'), ('INTERFACE', 'Interface')], default='CRUSTAL', max_length=10),
+            model_name="sourcelogictreecomponent",
+            name="tectonic_region",
+            field=models.CharField(
+                choices=[
+                    ("CRUSTAL", "Crustal"),
+                    ("SUBDUCTION", "Subduction"),
+                    ("INTERFACE", "Interface"),
+                ],
+                default="CRUSTAL",
+                max_length=10,
+            ),
             preserve_default=False,
         ),
     ]

nshm/migrations/0005_alter_sourcelogictreeweightedcomponent_source_logic_tree_and_more.py

@@ -1,24 +1,33 @@
 # Generated by Django 4.2.4 on 2023-08-24 02:08
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('nshm', '0004_sourcelogictreecomponent_tectonic_region'),
+        ("nshm", "0004_sourcelogictreecomponent_tectonic_region"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='sourcelogictreeweightedcomponent',
-            name='source_logic_tree',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='slt_weighted_components', to='nshm.sourcelogictree'),
+            model_name="sourcelogictreeweightedcomponent",
+            name="source_logic_tree",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="slt_weighted_components",
+                to="nshm.sourcelogictree",
+            ),
         ),
         migrations.AlterField(
-            model_name='sourcelogictreeweightedcomponent',
-            name='source_logic_tree_component',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='slt_weighted_components', to='nshm.sourcelogictreecomponent'),
+            model_name="sourcelogictreeweightedcomponent",
+            name="source_logic_tree_component",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="slt_weighted_components",
+                to="nshm.sourcelogictreecomponent",
+            ),
         ),
     ]

nshm/migrations/0006_alter_seismichazardmodel_source_logic_tree.py

@@ -1,19 +1,27 @@
 # Generated by Django 4.2.4 on 2023-08-24 02:11
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('nshm', '0005_alter_sourcelogictreeweightedcomponent_source_logic_tree_and_more'),
+        (
+            "nshm",
+            "0005_alter_sourcelogictreeweightedcomponent_source_logic_tree_and_more",
+        ),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='seismichazardmodel',
-            name='source_logic_tree',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='seismic_hazard_models', to='nshm.sourcelogictree'),
+            model_name="seismichazardmodel",
+            name="source_logic_tree",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="seismic_hazard_models",
+                to="nshm.sourcelogictree",
+            ),
         ),
     ]