Create 'core' component for pupa

Author: mileswwatkins

pupa/cli/__main__.py

@@ -30,7 +30,7 @@ def main():
 
     # configure Django before model imports
     if os.environ.get("DJANGO_SETTINGS_MODULE") is None:
-        os.environ['DJANGO_SETTINGS_MODULE'] = 'pupa.settings'
+        os.environ['DJANGO_SETTINGS_MODULE'] = 'pupa.core.settings'
 
     try:
         django.setup()

pupa/cli/commands/dump.py

@@ -3,7 +3,7 @@
 import requests
 import boto
 
-from ... import settings
+from pupa.core import settings
 from .base import BaseCommand, CommandError
 
 

pupa/cli/commands/elasticsearch_push.py

@@ -2,7 +2,7 @@
 
 from .base import BaseCommand
 from pupa.utils.fulltext import bill_to_elasticsearch
-from pupa.settings import elasticsearch
+from pupa.core import elasticsearch
 
 
 class Command(BaseCommand):

pupa/cli/commands/update.py

@@ -6,7 +6,8 @@
 from django.db import transaction
 
 from .base import BaseCommand, CommandError
-from pupa import settings, utils
+from pupa import utils
+from pupa.core import settings
 from pupa.scrape import Jurisdiction, JurisdictionScraper
 
 

pupa/core/__init__.py

@@ -0,0 +1,10 @@
+import pyelasticsearch
+
+from pupa.core import settings
+
+
+elasticsearch = None
+if settings.ENABLE_ELASTICSEARCH:
+    elasticsearch = pyelasticsearch.ElasticSearch(
+        urls='http://{}'.format(settings.ELASTICSEARCH_HOST),
+        timeout=settings.ELASTICSEARCH_TIMEOUT)

pupa/settings.py renamed to pupa/core/settings.py

@@ -2,7 +2,6 @@
 import importlib
 import sys
 import dj_database_url
-import pyelasticsearch
 
 DATABASE_URL = os.environ.get('DATABASE_URL', 'postgis://pupa:pupa@localhost/opencivicdata')
 SECRET_KEY = 'non-secret'
@@ -65,18 +64,11 @@
 
 
 sys.path.insert(1, os.getcwd())
-loader = importlib.find_loader('pupa_settings')
+loader = importlib.find_loader('pupa_core_settings')
 if loader is None:
     print('no pupa_settings on path, using defaults')
 else:
     from pupa_settings import *     # NOQA
 
 
 DATABASES = {'default': dj_database_url.parse(DATABASE_URL)}
-
-
-elasticsearch = None
-if ENABLE_ELASTICSEARCH:
-    elasticsearch = pyelasticsearch.ElasticSearch(
-        urls='http://{}'.format(ELASTICSEARCH_HOST),
-        timeout=ELASTICSEARCH_TIMEOUT)

pupa/scrape/base.py

@@ -8,7 +8,8 @@
 import scrapelib
 from validictory import ValidationError
 
-from pupa import utils, settings
+from pupa import utils
+from pupa.core import settings
 
 
 class ScrapeError(Exception):

pupa/utils/fulltext.py

@@ -79,8 +79,8 @@ def bill_to_elasticsearch(bill):
     DATETIME_FORMAT = '%Y-%m-%dT%H:%M:%S'
 
     es_bill = {
-        'jurisdiction': bill.get_jurisdiction_name(),
-        'session': bill.get_session_name(),
+        'jurisdiction': bill.legislative_session.jurisdiction.name,
+        'session': bill.legislative_session.name,
         'identifier': bill.identifier,
         'subjects': bill.subject,
         'classifications': bill.classification,