New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Export and merge functions #17
Open
ajparsons
wants to merge
24
commits into
everypolitician:master
Choose a base branch
from
ajparsons:export_merge_function
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
2dbc7cf
Amending project attributes for use in eclipse development enviroment
ajparsons 2014840
Split collections and item classes into separate files and out of bas…
ajparsons 16373b7
Changed Collection subclassing to use class attribute
ajparsons b12f3c6
Collection objects are permanent parts of Popolo object
ajparsons c7f0caf
Amend PopoloObject to prepare for read/write data objects
ajparsons bc36884
PopoloObject subclasses moved to new attribute system
ajparsons 2cbccd5
Created 'twitter' setter for Person object.
ajparsons 82a95a5
Changed defaults for date properties to use .PAST or .FUTURE
ajparsons 240d637
Added export functionality
ajparsons 72c2801
Added 'merge' function
ajparsons d6c7d73
Amended handling of default settings.
ajparsons d5366c5
Date attributes will now accept datetime objects being 'set'
ajparsons 400691f
Add safeguards to prevent objects sharing attributes.
ajparsons 7b6166a
Added test suite with tests for property setting and file saving.
ajparsons 2520cfd
Assigning a null contact_detail will now delete the row rather than a…
ajparsons 461cedf
Removed unused ability to specify which field is used to match Relate…
ajparsons 63a87e9
Added processing for handling of saving vague-dates and date ranges.
ajparsons 270f68a
Python 3 Compatibility changes.
ajparsons 04a8729
Created effective_start_date and effective_end_date properties
ajparsons c4a39a5
Add get_identfier function
ajparsons ba755f7
Updated hash id system for memberships
ajparsons 6df1ea7
Fix to merge function
ajparsons 7db9f3c
Allowed source as an attribute of membership
ajparsons ccbd20d
changed default loading to uft-8 encoding
ajparsons File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| *.py text eol=lf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,3 +7,6 @@ | |
| /htmlcov | ||
| /everypolitician_popolo.egg-info | ||
| /dist | ||
| .project | ||
| .pydevproject | ||
| .settings/* | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think generally I'd expect people to put ignore rules that are specific to a particular IDE into
.git/info/exclude(or to have them in a per-user gitignore configured with:git config --global core.excludesfile $HOME/.gitignore. (I'm happy with adding the.gitattributesline-endings configuration, though.)