Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Merge in OEPS historical data #52

Merged
merged 23 commits into from
Aug 1, 2023
Merged

Merge in OEPS historical data #52

merged 23 commits into from
Aug 1, 2023

Conversation

bucketteOfIvy
Copy link
Collaborator

Merge the OEPS historical data into the main branch.

balcaglayan and others added 23 commits July 21, 2022 17:31
@balcaglayan
Create DS01_C_2010_ACS.csv
e3d8c47 
Upload the DS01
@balcaglayan
Upload the files
07c2689
@balcaglayan
Update getDemographics_ACS_2010.R
7e3cbd9
@balcaglayan
Upload files
12073d6
@balcaglayan
Upload the file
5f757ca
@balcaglayan
Upload files
c4c8553
@balcaglayan
Upload the files
abe5fe2
@balcaglayan
Upload files
f187396
@balcaglayan
Upload files
18154b6
@balcaglayan
Upload files
62a292f
@bucketteOfIvy
removed api key from file
2d89f80
@bucketteOfIvy
transform 2010 geometry GeoDaCenter#49
bb511b5
@bucketteOfIvy
fixed typo in script generating 2010 ds04 files, fixed resultant data G…
8eccba7 
…eoDaCenter#49
@bucketteOfIvy
update tract, county ds01 for 1980, 1990, 2000 GeoDaCenter#51 GeoDaCe…
c01ce87 
…nter#49
@bucketteOfIvy
added 1980 county level ds01 data GeoDaCenter#51 GeoDaCenter#49
1688d5b
@bucketteOfIvy
added comments to file for readability, fixed row column in outputs G…
8406719 
…eoDaCenter#51 GeoDaCenter#49
@bucketteOfIvy
update acs version of 2010 ds01 tables with 2012 disbP data
91c413c
@bucketteOfIvy
fixed issue where Health03_T had unusable GEOID
9f35295
@bucketteOfIvy
added 1980 interpolated county data that was missed in prior commit G…
e14a95b 
…eoDaCenter#51 GeoDaCenter#49
@bucketteOfIvy
fixed GEOID for Health03, hopefully for realsies this time
b9ee555
@bucketteOfIvy
updated Health04_T.csv to match the formatting in the original file
51b68ab
@mradamcox
Merge pull request GeoDaCenter#50 from bucketteOfIvy/49_update_histor…
d9f6ac8 
…ical_data

49 update historical data
@bucketteOfIvy
Merge pull request #1 from GeoDaCenter/OEPS-historical-data
d15dc8f 
Oeps historical data
@mradamcox mradamcox requested a review from Makosak July 17, 2023 17:48
@bucketteOfIvy bucketteOfIvy mentioned this pull request Jul 17, 2023
Merged
@mradamcox mradamcox requested review from mradamcox and removed request for Makosak August 1, 2023 13:58
mradamcox
mradamcox approved these changes Aug 1, 2023
View reviewed changes
Copy link
Collaborator

@mradamcox mradamcox left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, going to check the merge conflicts now

@mradamcox mradamcox changed the base branch from main to main-merge-historical August 1, 2023 20:15
@mradamcox mradamcox merged commit fe03eec into GeoDaCenter:main-merge-historical Aug 1, 2023
@mradamcox
Copy link
Collaborator

Created a main-merge-historical intermediary branch to handle a conflict without needing to commit directly to the protected main branch.

@mradamcox mradamcox mentioned this pull request Aug 1, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mradamcox mradamcox mradamcox approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bucketteOfIvy @mradamcox @balcaglayan