Skip to content

Commit 37b76f8

Browse files
authored
Merge pull request #143 from openscm/time-axis-serialisation
Time axis serialisation
2 parents a73a239 + 136d60e commit 37b76f8

6 files changed

Lines changed: 641 additions & 459 deletions

File tree

.github/workflows/ci-cd-workflow.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
python-version: ${{ matrix.python-version }}
1919
- name: Install dev dependencies
2020
run: |
21-
pip install --upgrade pip
21+
pip install --upgrade pip wheel
2222
pip install -e .[dev]
2323
# TODO: add `pylint src`
2424
- name: Formatting and linters
@@ -61,7 +61,7 @@ jobs:
6161
python-version: ${{ matrix.python-version }}
6262
- name: Install test dependencies
6363
run: |
64-
pip install --upgrade pip
64+
pip install --upgrade pip wheel
6565
pip install -e .[tests]
6666
- name: Test with pytest
6767
env:
@@ -98,7 +98,7 @@ jobs:
9898
python-version: ${{ matrix.python-version }}
9999
- name: Install test dependencies
100100
run: |
101-
pip install --upgrade pip
101+
pip install --upgrade pip wheel
102102
pip install -e .[tests]
103103
104104
pip install pandas==${{ matrix.pandas-version }}
@@ -133,7 +133,7 @@ jobs:
133133
python-version: ${{ matrix.python-version }}
134134
- name: Install test dependencies
135135
run: |
136-
pip install --upgrade pip
136+
pip install --upgrade pip wheel
137137
pip install -e .[tests]
138138
pip uninstall -y seaborn
139139
@@ -165,7 +165,7 @@ jobs:
165165
python-version: ${{ matrix.python-version }}
166166
- name: Install notebook dependencies
167167
run: |
168-
pip install --upgrade pip
168+
pip install --upgrade pip wheel
169169
pip install -e .[tests,notebooks]
170170
- name: Test notebooks with nbval
171171
run: |
@@ -215,7 +215,7 @@ jobs:
215215
python-version: ${{ matrix.python-version }}
216216
- name: Install dependencies
217217
run: |
218-
pip install --upgrade pip
218+
pip install --upgrade pip wheel
219219
pip install -e .[dev]
220220
- name: Create package
221221
run: python setup.py sdist bdist_wheel --universal

CHANGELOG.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Changelog
44
master
55
------
66

7+
- (`#143 <https://github.com/openscm/scmdata/pull/143>`_) Alter time axis when serialising to netCDF so that time axis is easily read by other tools (e.g. xarray)
8+
79
v0.8.0
810
------
911

0 commit comments

Comments
 (0)