Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Install dependencies
run: |
sudo apt update
sudo apt install -y gdal-bin
sudo apt install -y gdal-bin graphviz libgraphviz-dev pkg-config
python -m pip install --upgrade pip setuptools
pip install -r requirements.txt
- name: Test with pytest
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ LABEL maintainer "DataMade <info@datamade.us>"
# https://docs.docker.com/develop/develop-images/dockerfile_best-practices
RUN apt-get update && \
apt-get install -y --no-install-recommends \
gettext binutils libproj-dev gdal-bin postgresql-client osm2pgsql make
gettext binutils libproj-dev gdal-bin postgresql-client osm2pgsql make \
graphviz libgraphviz-dev pkg-config

# Inside the container, create an app directory and switch into it
RUN mkdir /app
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ recreate_db : import_directory flush_db import_docket_import
clean :
rm auth_models.json *errors.csv

include docket.mk
include docket.mk docs/erd.mk
File renamed without changes.
File renamed without changes.
Binary file added docs/diagrams/location_diagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/diagrams/organization_diagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/diagrams/person_diagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/diagrams/violation_diagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions docs/erd.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
person_models=Person,PersonName,PersonAlias,PersonDivisionId,MembershipPerson,MembershipPersonMember,MembershipPersonOrganization,MembershipPersonRole,MembershipPersonTitle,MembershipPersonRank,MembershipPersonFirstCitedDate,MembershipPersonLastCitedDate,Source
organization_models=Organization,OrganizationName,OrganizationAlias,OrganizationDivisionId,OrganizationClassification,OrganizationFirstCitedDate,OrganizationLastCitedDate,MembershipOrganization,MembershipOrganizationMember,MembershipOrganizationOrganization,MembershipOrganizationFirstCitedDate,MembershipOrganizationLastCitedDate,Composition,CompositionParent,CompositionChild,CompositionClassification,CompositionStartDate,CompositionEndDate,Source
location_models=Location,Organization,Association,AssociationArea,AssociationOrganization,AssociationTenure,AssociationStartDate,AssociationEndDate,Emplacement,EmplacementTenure,EmplacementOrganization,EmplacementSite,EmplacementStartDate,EmplacementEndDate,Source
violation_models=Violation,Person,Organization,Location,ViolationPerpetrator,ViolationPerpetratorOrganization,ViolationType,ViolationAdminLevel2,ViolationDivisionId,ViolationStartDate,ViolationEndDate,Source


.PHONY : diagrams clean_diagrams

diagrams : $(patsubst %,docs/diagrams/%_diagram.png,person organization location violation)

clean_diagrams :
rm docs/diagrams/*

docs/diagrams/%_diagram.png :
python manage.py graph_models -a -I $($*_models) -o $@
6 changes: 6 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,9 @@ django-debug-toolbar<2.0
pysolr==3.6.0
pytest-django==3.5.1
pytest-mock==1.10

# Entity relational mapping
django-extensions==3.1.0
pygraphviz==1.5
pyparsing==2.4.7
pydot==1.4.2
5 changes: 5 additions & 0 deletions sfm_pc/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
'django.contrib.humanize',
'django.contrib.sitemaps',
'haystack',
'django_extensions',
'django_date_extensions',
'rosetta',
'languages_plus',
Expand Down Expand Up @@ -362,3 +363,7 @@
'DJANGO_HAYSTACK_SIGNAL_PROCESSOR',
'haystack.signals.RealtimeSignalProcessor'
)

GRAPH_MODELS = {
'group_models': True,
}