Skip to content

Commit ff374ee

Browse files
committed
Merge remote-tracking branch 'origin/quantiles'
* origin/quantiles: Ignore cell Format notebooks Add example notebook Format CHANGELOG Test TypeError Pass test Add failing test
2 parents f87b418 + fa9dbb7 commit ff374ee

5 files changed

Lines changed: 2504 additions & 10 deletions

File tree

CHANGELOG.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Changelog
44
master
55
------
66

7+
- (`#138 <https://github.com/openscm/scmdata/pull/138>`_) Add :meth:`ScmRun.quantiles_over`
78
- (`#137 <https://github.com/openscm/scmdata/pull/137>`_) Fix :meth:`scmdata.ScmRun.to_csv` so that writing and reading is circular (i.e. you end up where you started if you write a file and then read it straight back into a new :obj:`scmdata.ScmRun` instance)
89

910
v0.7.6

notebooks/netcdf.ipynb

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"source": [
77
"# NetCDF handling\n",
88
"\n",
9-
"NetCDF formatted files are much faster to read and write for large datasets. In order to make the most of this, both the `ScmDataFrame` and `ScmRun` objects have the ability to read and write netCDF files."
9+
"NetCDF formatted files are much faster to read and write for large datasets. In order to make the most of this, the `ScmRun` objects have the ability to read and write netCDF files."
1010
]
1111
},
1212
{
@@ -2951,13 +2951,6 @@
29512951
" kind=\"line\",\n",
29522952
")"
29532953
]
2954-
},
2955-
{
2956-
"cell_type": "code",
2957-
"execution_count": null,
2958-
"metadata": {},
2959-
"outputs": [],
2960-
"source": []
29612954
}
29622955
],
29632956
"metadata": {
@@ -2976,7 +2969,7 @@
29762969
"name": "python",
29772970
"nbconvert_exporter": "python",
29782971
"pygments_lexer": "ipython3",
2979-
"version": "3.8.5"
2972+
"version": "3.7.9"
29802973
}
29812974
},
29822975
"nbformat": 4,

0 commit comments

Comments
 (0)