Implementation of Elections spec #82

gordonje · 2017-05-10T21:34:07Z

coveralls · 2017-05-10T21:37:19Z

Coverage decreased (-1.3%) to 98.286% when pulling c952cde on california-civic-data-coalition:master into 8e3abb0 on opencivicdata:master.

gordonje · 2017-05-19T18:44:53Z

@jamesturk given the movement toward separate apps, should spike this PR and submit another after PR #85 is merged?

Or I could also make a PR on the split-apps branch, and this could all go up together.

jamesturk · 2017-05-20T00:10:54Z

let's keep these in separate PRs, but yeah I think we should wait to merge until we've decided one way or another on #83- I'll ping the relevant parties to see if they're OK with the plan

coveralls · 2017-06-01T22:46:57Z

Coverage decreased (-28.4%) to 70.358% when pulling 8e3fd0e on california-civic-data-coalition:master into 4d0c164 on opencivicdata:master.

…civicdata-django

coveralls · 2017-06-05T14:09:54Z

Coverage decreased (-26.5%) to 72.254% when pulling acf5503 on california-civic-data-coalition:master into 5f97a77 on opencivicdata:master.

coveralls · 2017-06-05T17:20:19Z

Coverage decreased (-26.5%) to 72.231% when pulling 3bf12ef on california-civic-data-coalition:master into 5f97a77 on opencivicdata:master.

coveralls · 2017-06-05T18:46:16Z

Coverage decreased (-26.8%) to 71.938% when pulling 9e95522 on california-civic-data-coalition:master into 5f97a77 on opencivicdata:master.

coveralls · 2017-06-05T20:50:23Z

Coverage decreased (-11.9%) to 86.838% when pulling 3e1e045 on california-civic-data-coalition:master into 5f97a77 on opencivicdata:master.

coveralls · 2017-06-05T21:16:01Z

Coverage decreased (-1.5%) to 97.27% when pulling 4cd41a4 on california-civic-data-coalition:master into 5f97a77 on opencivicdata:master.

coveralls · 2017-06-22T00:48:20Z

Coverage decreased (-1.5%) to 97.27% when pulling bba89e4 on california-civic-data-coalition:master into 5f97a77 on opencivicdata:master.

coveralls · 2017-06-22T00:48:20Z

Coverage decreased (-1.5%) to 97.27% when pulling bba89e4 on california-civic-data-coalition:master into 5f97a77 on opencivicdata:master.

coveralls · 2017-06-22T00:48:20Z

Coverage decreased (-1.5%) to 97.27% when pulling bba89e4 on california-civic-data-coalition:master into 5f97a77 on opencivicdata:master.

coveralls · 2017-06-22T00:48:20Z

Coverage decreased (-1.5%) to 97.27% when pulling bba89e4 on california-civic-data-coalition:master into 5f97a77 on opencivicdata:master.

coveralls · 2017-06-23T02:06:39Z

Coverage decreased (-1.5%) to 97.27% when pulling b348cf6 on california-civic-data-coalition:master into 5f97a77 on opencivicdata:master.

coveralls · 2017-06-23T02:06:39Z

Coverage decreased (-1.5%) to 97.27% when pulling b348cf6 on california-civic-data-coalition:master into 5f97a77 on opencivicdata:master.

coveralls · 2017-06-23T15:26:42Z

Coverage decreased (-1.5%) to 97.27% when pulling 8b4bdf3 on california-civic-data-coalition:master into 5f97a77 on opencivicdata:master.

…civicdata

coveralls · 2017-06-23T20:38:32Z

Coverage increased (+0.3%) to 98.999% when pulling 2de4af2 on california-civic-data-coalition:master into b38b6dd on opencivicdata:master.

coveralls · 2017-06-23T20:47:17Z

Coverage increased (+0.3%) to 98.999% when pulling 2a133f1 on california-civic-data-coalition:master into b38b6dd on opencivicdata:master.

gordonje · 2017-06-23T20:47:30Z

@jamesturk This one is ready for review again. Below are some notes on differences since I first put in the PR.

Removed inheritance from non-abstract models

Election no longer subclasses Event. There's been some discussion, though, about adding an abstract EventBase in opencivicdata.core someday.
- In the mean time, I'm not clear on the proper format for Election.id. I currently have it as ocd-election/..., but should it be ocd-event/...?
ContestBase is now an abstract model from which all the contest models inherit.
RetentionContest no longer inherits from BallotMeasureContest but remains under the contests.ballot_measure namespace.

Added models

ElectionSource, which mirrors the EventSource model. I don't think any of the other event-related models have any relevance to elections.
RetentionContestOption, which mirrors BallotMeasureContestOption.
Split up ContestIdentifier into four contest-class specific models.
Same as above for ContestSource.

Removed models

Replaced Party model with references to Organization from core (per issue #89 from the specs repo). These foreign key relationships (e.g., Candidacy.party) are limited to only organizations with the classification "party", though I believe that's only forced on Django forms, not by the ORM or db.

jamesturk

looks pretty good to me, I wasn't as involved in the OCDEP process so apologies if any of my questions were already covered

jamesturk · 2017-07-07T03:15:49Z

.coveragerc

-        opencivicdata/legislative/migrations/*
-        opencivicdata/legislative/admin/*
+        opencivicdata/*/migrations/*
+        opencivicdata/*/admin/*


jamesturk · 2017-07-07T03:16:46Z

opencivicdata/elections/admin/candidacy.py

+        'updated_at',
+    )
+    # date_hierarchy across relations was added to django 1.11
+    if django_version[0] >= 1 and django_version[1] >= 11:


I'm curious if you have a need for Django < 1.11 support? technically this supports 1.10 right now, but since 1.11 is LTS I'm OK w/ new stuff requiring 1.11

Our package that will depend on python-opencivicdata currently supports Django>=1.9, but this particular feature isn't super important. Just adds a nicer filter option to this admin for users who are at least at Django 1.11.

jamesturk · 2017-07-07T03:20:07Z

opencivicdata/legislative/models/__init__.py

@@ -6,4 +6,4 @@
 from .vote import (VoteEvent, VoteCount, PersonVote, VoteSource)
 from .event import (Event, EventLocation, EventMedia, EventMediaLink, EventDocument, EventLink,
                    EventSource, EventParticipant, EventAgendaItem, EventRelatedEntity,
-                    EventAgendaMedia, EventAgendaMediaLink, EventDocumentLink)
+                    EventAgendaMedia, EventAgendaMediaLink, EventDocumentLink)


this might be a mistake?

Yeah, I'm not sure what happened exactly, as I would not have had any reason to change this file. Looks like the newline at the end of the file was deleted. I just added it back.

jamesturk · 2017-07-07T03:21:39Z

opencivicdata/elections/models/candidacy.py

+        max_length=300,
+        help_text="For preserving the candidate's name as it was of the candidacy."
+    )
+    filed_date = models.DateField(


should this be a fuzzy date or will we always require Y-m-d

In our case, all of these dates are exact. I think the source for this data in most states will be a form the candidate files with an election authority. I think you'll either have the full date or no date at all.

But maybe we want to allow users to put in their best guess for the date? Or if the default for OCD is to use fuzzy dates unless there's a good reason to be exact, we would be fine with that.

jamesturk · 2017-07-07T03:24:08Z

opencivicdata/elections/models/election.py

+        max_length=300,
+        help_text='Name of the Election.',
+    )
+    date = models.DateField(


this being an exact date makes sense to me

I think we agreed to sideline questions about multi-day elections (e.g. vote-by-mail)

IMO even vote by mail elections will want to be tied to a specific date on which the votes are expected to be counted and the results will be published. But, yeah, a convo for another time when we know users will need to track when ballots can be cast.

coveralls · 2017-07-07T15:53:42Z

Coverage increased (+0.3%) to 98.999% when pulling 4ed4d34 on california-civic-data-coalition:master into b38b6dd on opencivicdata:master.

gordonje · 2017-07-10T14:44:35Z

@jamesturk so I think the proposed changes are:

Drop the election date hierarchy filter on CandidacyAdmin so as not to introduce a Django >= 1.11 feature just yet.
Make Candidacy.filed_date a fuzzy date field, rather inheriting from DateField in django.db.models.

Should I go ahead and make either or both of these?

jamesturk · 2017-07-10T15:43:32Z

no need to drop the date hierarchy filter, definitely want to support Django >= 1.11
I'll defer to you on the filed_date issue, I don't know the data well enough to know if a fuzzy date is necessary, but if you think it'd be useful I'd switch it to that

I don't think I have any further changes, I think we could go ahead and accept this & consider it provisional (so a bit less strict on backwards incompatible changes until it stabilizes)

gordonje · 2017-07-14T16:16:07Z

Cool! Let's do this.

palewire · 2017-07-14T16:16:54Z

This is excellent news. Thrilled to see this merged and released.

gordonje added 6 commits March 16, 2017 17:07

Add models #2

c4042d0

Merge branch 'master' of https://github.com/opencivicdata/python-open…

bedc5d5

…civicdata-django into elections

Draft implementation of elections OCDEP

fd14e67

Add Candidacy.registration_status

81e6f37

Fix search fields

846c26f

Merging from upstream

c952cde

jamesturk mentioned this pull request May 11, 2017

should we split this package into multiple apps? #83

Closed

gordonje added 4 commits May 30, 2017 09:11

Merge from upstream

bb39195

Move elections stuff into its own app

7de5bfd

Re-arrange models, specify db_table

c19a528

Re-arrange admins

8e3fd0e

gordonje changed the title ~~Implementation of Elections spec~~ WIP: Implementation of Elections spec Jun 1, 2017

gordonje added 4 commits June 4, 2017 23:23

Merge branch 'master' of https://github.com/opencivicdata/python-open…

d658c05

…civicdata-django

Fix imports

9a43194

Fix circular import

e448598

Add elections app to test settings

acf5503

gordonje added 2 commits June 5, 2017 12:15

Fix file name

3bf12ef

Add import of RetentionContestOption

ddbefe2

gordonje added 3 commits June 5, 2017 13:41

Fix order by field for Election

4e5f50e

Add dynamic related_name on base class FK fields

74e9563

Add method for getting Candidacy.party_name

9e95522

gordonje added 2 commits June 5, 2017 15:30

Add initial elections migration

02ee722

Ignore all migrations dirs

3e1e045

Ignore all migrations/ and admin/ dirs in test coverage

4cd41a4

More concise related names, update initial migration

bba89e4

Fix regex validation flag

b348cf6

Fix table name on Candidacy model

8b4bdf3

gordonje added 3 commits June 23, 2017 15:30

Fix PartyContestOption str method

a35e9d6

Add election model tests

af54713

Merge branch 'master' of https://github.com/opencivicdata/python-open…

2de4af2

…civicdata

gordonje added 2 commits June 23, 2017 15:41

Limit Candidacy.party options to orgs with 'party' classification

b8e292e

Set classification on party fixture

2a133f1

gordonje changed the title ~~WIP: Implementation of Elections spec~~ Implementation of Elections spec Jun 23, 2017

jamesturk reviewed Jul 7, 2017

View reviewed changes

Add new line at end of file.

4ed4d34

jamesturk merged commit 63953bf into opencivicdata:master Jul 17, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implementation of Elections spec #82

Implementation of Elections spec #82

gordonje commented May 10, 2017

coveralls commented May 10, 2017 •

edited

Loading

gordonje commented May 19, 2017

jamesturk commented May 20, 2017

coveralls commented Jun 1, 2017 •

edited

Loading

coveralls commented Jun 5, 2017 •

edited

Loading

coveralls commented Jun 5, 2017 •

edited

Loading

coveralls commented Jun 5, 2017 •

edited

Loading

coveralls commented Jun 5, 2017 •

edited

Loading

coveralls commented Jun 5, 2017 •

edited

Loading

coveralls commented Jun 22, 2017 •

edited

Loading

coveralls commented Jun 22, 2017

coveralls commented Jun 22, 2017

coveralls commented Jun 22, 2017 •

edited

Loading

coveralls commented Jun 23, 2017

coveralls commented Jun 23, 2017 •

edited

Loading

coveralls commented Jun 23, 2017 •

edited

Loading

coveralls commented Jun 23, 2017 •

edited

Loading

coveralls commented Jun 23, 2017 •

edited

Loading

gordonje commented Jun 23, 2017

jamesturk left a comment

jamesturk Jul 7, 2017

jamesturk Jul 7, 2017

gordonje Jul 7, 2017

jamesturk Jul 7, 2017

gordonje Jul 7, 2017

jamesturk Jul 7, 2017

gordonje Jul 7, 2017

jamesturk Jul 7, 2017

gordonje Jul 7, 2017

coveralls commented Jul 7, 2017 •

edited

Loading

gordonje commented Jul 10, 2017

jamesturk commented Jul 10, 2017

gordonje commented Jul 14, 2017

palewire commented Jul 14, 2017

Implementation of Elections spec #82

Implementation of Elections spec #82

Conversation

gordonje commented May 10, 2017

coveralls commented May 10, 2017 • edited Loading

gordonje commented May 19, 2017

jamesturk commented May 20, 2017

coveralls commented Jun 1, 2017 • edited Loading

coveralls commented Jun 5, 2017 • edited Loading

coveralls commented Jun 5, 2017 • edited Loading

coveralls commented Jun 5, 2017 • edited Loading

coveralls commented Jun 5, 2017 • edited Loading

coveralls commented Jun 5, 2017 • edited Loading

coveralls commented Jun 22, 2017 • edited Loading

coveralls commented Jun 22, 2017

coveralls commented Jun 22, 2017

coveralls commented Jun 22, 2017 • edited Loading

coveralls commented Jun 23, 2017

coveralls commented Jun 23, 2017 • edited Loading

coveralls commented Jun 23, 2017 • edited Loading

coveralls commented Jun 23, 2017 • edited Loading

coveralls commented Jun 23, 2017 • edited Loading

gordonje commented Jun 23, 2017

Removed inheritance from non-abstract models

Added models

Removed models

jamesturk left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

coveralls commented Jul 7, 2017 • edited Loading

gordonje commented Jul 10, 2017

jamesturk commented Jul 10, 2017

gordonje commented Jul 14, 2017

palewire commented Jul 14, 2017

coveralls commented May 10, 2017 •

edited

Loading

coveralls commented Jun 1, 2017 •

edited

Loading

coveralls commented Jun 5, 2017 •

edited

Loading

coveralls commented Jun 5, 2017 •

edited

Loading

coveralls commented Jun 5, 2017 •

edited

Loading

coveralls commented Jun 5, 2017 •

edited

Loading

coveralls commented Jun 5, 2017 •

edited

Loading

coveralls commented Jun 22, 2017 •

edited

Loading

coveralls commented Jun 22, 2017 •

edited

Loading

coveralls commented Jun 23, 2017 •

edited

Loading

coveralls commented Jun 23, 2017 •

edited

Loading

coveralls commented Jun 23, 2017 •

edited

Loading

coveralls commented Jun 23, 2017 •

edited

Loading

coveralls commented Jul 7, 2017 •

edited

Loading