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

Scmcallib rework #158

Merged
merged 78 commits into from May 6, 2019
Merged

Scmcallib rework #158

merged 78 commits into from May 6, 2019

Conversation

znicholls
Copy link
Collaborator

@znicholls znicholls commented May 6, 2019 •
edited

The big PR to get ScmDataFrame into master. ScmDataFrame is a high-level aggregation of output and metadata from a number of model runs, on a consistent timebase. The underlying time series data is generally immutable.

  • Implementation finished
  • Tests added
  • Documentation added
  • Example added (in the documentation, to an existing notebook, or in a new notebook)
  • Description in CHANGELOG.rst added (single line such as: (`#XX <https://github.com/openclimatedata/openscm/pull/XX>`_) Added feature which does something)

New version of #153 so we can run github actions

lewisjared and others added 30 commits April 9, 2019 10:19
@lewisjared
Added tests from scmcallib branch
f315e9b
@lewisjared
Added (mostly) working implementation of ScmDataFrame
b90ce88
@lewisjared
Added missing requirements
a98d834
@lewisjared
Remove pyam as a dependency
636a8b5
@lewisjared
Added interpolate method to scmdataframe
0848903
@lewisjared
Removed xarray resampling in preference for interpolate function
d4b6df7
@lewisjared
Added tests for offsets
add6b62
@lewisjared
Updated scmdf_to_core test to new format
1b80305
@lewisjared
Added TimeIndex class for tracking both python and openscm datetimes
4515e23
@lewisjared
Updated tests to include at least 3 datapoint incase we need to cast …
d6bd340 
…to Core
@lewisjared
added to_core function
ff0fdd9
@znicholls
Address bandit issues
b4a3855
@znicholls
Remove init in tests to get conftest import working and tidy tests a …
177f561 
…touch
@znicholls
Make black
0fa93b5
@znicholls
Pass flake8 checks
48e66cb
@znicholls
Add help output to makefile
680f9bf
@znicholls
Apply isort
2ffb0e0
@znicholls
Shift functionality into scmdataframe.base
721eb81
@znicholls
Another go at function annotations
35d8c41
@znicholls
Fill out docstrings of all files except scmdataframe/base, __init__ a…
d02926a 
…nd offsets
@znicholls
Only a few docstrings left
21cfd04
@znicholls
Rest of docstrings
558bd33
@znicholls
Up to pylint complaints
26785c2
@znicholls
Remove superceded function
9d908a1
@znicholls
Address pylint comments in filter
8fb3d58
@znicholls
Address pylint comments in timeindex
da8f3e6
@znicholls
Pass timeindex pylint errors
06b13cb
@znicholls
Only base pylint errors left
40973e0
@znicholls
Address base pylint errors
700f989
@znicholls
Start increasing test coverage and start going through comments online
15bdb69
@znicholls znicholls requested a review from lewisjared May 6, 2019 06:12
@znicholls znicholls mentioned this pull request May 6, 2019
Closed
5 tasks
lewisjared
lewisjared approved these changes May 6, 2019
View reviewed changes
Copy link
Collaborator

@lewisjared lewisjared left a comment

Choose a reason for hiding this comment

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

LGTM

@znicholls znicholls merged commit 7d9310c into master May 6, 2019
@swillner swillner deleted the scmcallib-rework branch May 13, 2019 08:24
@znicholls znicholls mentioned this pull request May 31, 2019
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lewisjared lewisjared lewisjared approved these changes

@rgieseke rgieseke Awaiting requested review from rgieseke rgieseke is a code owner

@swillner swillner Awaiting requested review from swillner swillner is a code owner

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
2 participants
@znicholls @lewisjared