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 accumulated dev changes from sprint ending 2021-07-05 #1068

Merged
merged 83 commits into from
Jul 6, 2021
Merged

Merge accumulated dev changes from sprint ending 2021-07-05 #1068

merged 83 commits into from
Jul 6, 2021

Conversation

zaneselvans
Copy link
Member

No description provided.

yashkumar1803 and others added 30 commits September 2, 2020 00:44
@yashkumar1803
Simplified demand allocation algorithm, changed format structure of i…
90e992c 
…nput and output
@zaneselvans
Update to newest pre-commit hooks
c066642
@yashkumar1803
Create class object for demand mapping
9bddf65
@yashkumar1803
Merge branch 'sprint22' into demand_mapping
05d75d9
@yashkumar1803
Fix codacy issues
52bf798
@zaneselvans
Merge branch 'demand_mapping' of github.com:catalyst-cooperative/pudl…
0903482 
… into demand_mapping
@zaneselvans
Merge branch 'sprint24' into demand_mapping
a7b543d
@yashkumar1803
Changed structure of demand allocation class to incorporate dictionaries
8371801
@yashkumar1803
Merge branch 'demand_mapping' of https://github.com/catalyst-cooperat…
82e936d 
…ive/pudl into demand_mapping
@yashkumar1803
Update Pre-commit YAML File
517ab18
@yashkumar1803
Merge branch 'sprint24' into demand_mapping
d0ea366
@zaneselvans
Add seaborn to install_requires since it's used in demand_mapping.py
7a0df61
@yashkumar1803
Migrate electricity-demand-mapping repo notebooks to PUDL repo
a3220ba
@zaneselvans
Merge branch 'sprint25' into demand_mapping
5e9e9c8
@ezwelty
Add draft API for core spatial operations
156e67e 
All but self_union() are implemented.
@ezwelty
Fix typos to ensure all doctests pass
b2e7b1e
@ezwelty
Remove unecessary imports from doctests
3ab642b
@ezwelty
Check that geometries are non-zero-area polygons
905a129
@ezwelty
Implement self_union()
8977973
@ezwelty
Increase speed of self_union() 10x
2576305 
Inspired by the algorithm described in
https://gis.stackexchange.com/questions/326316/getting-unique-intersections-of-multiple-polygons-efficiently-in-python/326583#326583
https://nbviewer.jupyter.org/gist/jorisvandenbossche/3a55a16fda9b3c37e0fb48b1d4019e65
@ezwelty
Add function to explode MultiPolygon to Polygon
cec58cd
@ezwelty
Note that self_union does not (yet) support MultiPolygon
ff30341
@ezwelty
Fix merge conflicts with sprint29
0461216
@ezwelty
Unflag all flags by default
3c88826
@ezwelty
Add method to create dataframe from array
4ef0df8
@ezwelty
Prevent modifying timeseries when imputing
66fb702
@ezwelty
Merge sprint29 branch
618d3e3
@ezwelty
Merge remote-tracking branch 'origin/sprint30' into demand_mapping
d824a9d
@ezwelty
Add additional fixes to FERC 714 respondent geometries
851d429
@ezwelty
Add module for predicting state demand
1ae36b9
zaneselvans and others added 25 commits June 1, 2021 19:25
@zaneselvans
Add missing comma separating strings to clean in ferc1
1e7d412
@zaneselvans
Update pre-commit hooks
1c02264
final review of release documentation for grammar, punctuation, spell…
9caa196 
…ing, and clarity issues
forgot to save some of the files I edited in the last commit
4cc9fce
forgot one last file
ea71854
Merge branch 'dev' into release-docs
b9eb839
@zaneselvans
Convert spatial doctests into unit tests
aaecd9e
@zaneselvans
Merge branch 'dev' into demand_mapping
65f66d8
@zaneselvans
Add shells of other test functions for spatial module
2e5e8d4
@zaneselvans
Merge pull request #1019 from catalyst-cooperative/release-docs
a0f8a16 
final review of release documentation for grammar, punctuation, spelling, and clarity issues
@zaneselvans
Improve documentation and error messages related to use of EIA API keys.
85e970a
@zaneselvans
Convert polygonize and check_gdf doctests to unit tests
62390a5
@zaneselvans
Update EIA Extract-Transform notebook to work with current datastore
2c8da0b
@zaneselvans
Merge branch 'dev' into demand_mapping
e718ea7
@zaneselvans
Covert overlay doctest to unit test.
35f8d07
@zaneselvans
Log the fact that we've got a null test for one function here.
a72647a
@TrentonBush
fixed out-of-date filepath to test config file
053baf6
@TrentonBush
add EIA API key registration to dev setup docs
166f930
@zaneselvans
Merge branch 'dev' into dev-docs
97ecbfe
@zaneselvans
Merge branch 'dev' into demand_mapping
14a015f
@zaneselvans
Merge pull request #1030 from catalyst-cooperative/dev-docs
009de5b 
Improve documentation and error messages related to use of EIA API keys.
@zaneselvans
Merge branch 'dev' into demand_mapping
a851b1e
@zaneselvans
Merge pull request #1021 from catalyst-cooperative/demand_mapping
903c8c8 
Convert spatial module doctests to unit tests
@cmgosnell
tiny deletion from allocate net get
bc0d0ae
@zaneselvans
Pin pandas to v1.2.4 to avoid build failures.
ca7a6ba
@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.

Powered by ReviewNB

@zaneselvans zaneselvans changed the title Merge accumulated dev changes from srpint ending 2021-07-05 Merge accumulated dev changes from sprint ending 2021-07-05 Jul 6, 2021
@codecov
Copy link

codecov bot commented Jul 6, 2021 •
edited

Codecov Report

Merging #1068 (76aecae) into main (0a32f62) will decrease coverage by 2.57%.
The diff coverage is 52.90%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1068      +/-   ##
==========================================
- Coverage   83.53%   80.96%   -2.57%     
==========================================
  Files          47       49       +2     
  Lines        5573     5981     +408     
==========================================
+ Hits         4655     4842     +187     
- Misses        918     1139     +221
Impacted Files Coverage Δ
src/pudl/analysis/allocate_net_gen.py 96.94% <ø> (-0.06%) ⬇️
src/pudl/constants.py 100.00% <ø> (ø)
src/pudl/extract/excel.py 97.22% <ø> (ø)
src/pudl/transform/epacems.py 70.59% <ø> (ø)
src/pudl/validate.py 35.19% <ø> (ø)
src/pudl/workspace/datastore.py 68.83% <0.00%> (-1.91%) ⬇️
src/pudl/workspace/setup.py 79.71% <ø> (-1.37%) ⬇️
src/pudl/analysis/state_demand.py 19.83% <19.83%> (ø)
src/pudl/analysis/timeseries_cleaning.py 85.78% <44.44%> (-2.55%) ⬇️
src/pudl/convert/datapkg_to_rst.py 55.56% <63.64%> (+1.98%) ⬆️
... and 24 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ad51b04...76aecae. Read the comment docs.

@zaneselvans zaneselvans merged commit 6d510bd into main Jul 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@zaneselvans @yashkumar1803 @ezwelty @cmgosnell @TrentonBush