From 9b1dc73ff8abfd81e28baaae3dd721e49d94cf5e Mon Sep 17 00:00:00 2001
From: Aly Ibrahim <bruinaly@gmail.com>
Date: Sun, 19 Dec 2021 11:31:13 -0500
Subject: [PATCH] change classifications

---
 local.env                                      |  2 ++
 openstates/data/common.py                      |  1 +
 .../0045_alter_organization_classification.py  | 18 ++++++++++++++++++
 .../migrations/0046_alter_bill_citations.py    | 18 ++++++++++++++++++
 .../migrations/0047_alter_bill_citations.py    | 18 ++++++++++++++++++
 openstates/scrape/base.py                      |  4 ++--
 6 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 local.env
 create mode 100644 openstates/data/migrations/0045_alter_organization_classification.py
 create mode 100644 openstates/data/migrations/0046_alter_bill_citations.py
 create mode 100644 openstates/data/migrations/0047_alter_bill_citations.py

diff --git a/local.env b/local.env
new file mode 100644
index 000000000..0044acafb
--- /dev/null
+++ b/local.env
@@ -0,0 +1,2 @@
+OS_PEOPLE_DIRECTORY=/Users/alyibrahim/projects/civiqa/backend/openstates/people
+DATABASE_URL=postgres://alyibrahim:42571allahis1@localhost:5432/civiqa-db
diff --git a/openstates/data/common.py b/openstates/data/common.py
index 8e81d745c..a0513ed7a 100644
--- a/openstates/data/common.py
+++ b/openstates/data/common.py
@@ -44,6 +44,7 @@
     ("party", "Party"),
     ("committee", "Committee"),
     ("government", "Government"),
+    ("subcommittee", "Subcommittee"),
 )
 ORGANIZATION_CLASSIFICATIONS = _keys(ORGANIZATION_CLASSIFICATION_CHOICES)
 
diff --git a/openstates/data/migrations/0045_alter_organization_classification.py b/openstates/data/migrations/0045_alter_organization_classification.py
new file mode 100644
index 000000000..3db733544
--- /dev/null
+++ b/openstates/data/migrations/0045_alter_organization_classification.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.8 on 2021-11-19 11:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('data', '0044_bill_citations'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='organization',
+            name='classification',
+            field=models.CharField(blank=True, choices=[('legislature', 'Legislature'), ('executive', 'Executive'), ('upper', 'Upper Chamber'), ('lower', 'Lower Chamber'), ('party', 'Party'), ('committee', 'Committee'), ('government', 'Government'), ('subcommittee', 'Subcommittee')], help_text='The type of Organization being defined.', max_length=100),
+        ),
+    ]
diff --git a/openstates/data/migrations/0046_alter_bill_citations.py b/openstates/data/migrations/0046_alter_bill_citations.py
new file mode 100644
index 000000000..9c307af6e
--- /dev/null
+++ b/openstates/data/migrations/0046_alter_bill_citations.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.8 on 2021-11-26 18:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('data', '0045_alter_organization_classification'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='bill',
+            name='citations',
+            field=models.JSONField(blank=True, default=dict, null=True),
+        ),
+    ]
diff --git a/openstates/data/migrations/0047_alter_bill_citations.py b/openstates/data/migrations/0047_alter_bill_citations.py
new file mode 100644
index 000000000..b2e90f79b
--- /dev/null
+++ b/openstates/data/migrations/0047_alter_bill_citations.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.8 on 2021-12-07 14:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('data', '0046_alter_bill_citations'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='bill',
+            name='citations',
+            field=models.JSONField(blank=True, default=dict),
+        ),
+    ]
diff --git a/openstates/scrape/base.py b/openstates/scrape/base.py
index 60a3d5d40..73d57c33a 100644
--- a/openstates/scrape/base.py
+++ b/openstates/scrape/base.py
@@ -111,7 +111,7 @@ def __init__(
         if modname is None:
             self.scrape_output_handler = None
         else:
-            handler = importlib.import_module(modname)
+            handler = importlib.import_module(modname) 
             self.scrape_output_handler = handler.Handler(self)
 
     def save_object(self, obj):
@@ -125,7 +125,7 @@ def save_object(self, obj):
 
         filename = "{0}_{1}.json".format(obj._type, obj._id).replace("/", "-")
 
-        self.info("save %s %s as %s", obj._type, obj, filename)
+        # self.info("save %s %s as %s", obj._type, obj, filename)
         self.debug(
             json.dumps(
                 OrderedDict(sorted(obj.as_dict().items())),