Skip to content

Commit d1e533b

Browse files
committed
Prepare for release of v0.3.1
1 parent 3185fee commit d1e533b

File tree

3 files changed

+60
-10
lines changed

3 files changed

+60
-10
lines changed

CHANGELOG.rst

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

7+
8+
v0.3.1
9+
------
10+
711
- (`#17 <https://github.com/znicholls/netcdf-scm/pull/17>`_) Update to crunch global and hemispheric means even if land-surface fraction data is missing
812
- (`#16 <https://github.com/znicholls/netcdf-scm/pull/16>`_) Tidy up experimental crunching script
913
- (`#15 <https://github.com/znicholls/netcdf-scm/pull/15>`_) Add ability to load from a directory with data that is saved in multiple timeslice files, also adds:

Makefile

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,11 @@ black:
7878

7979
.PHONY: new_release
8080
new_release:
81-
@echo 'For a new release on PyPI:'
82-
@echo 'git tag vX.Y.Z'
83-
@echo 'make publish-on-pypi'
81+
@echo 'See instructions in the Releasing sub-section of the Development section of the docs'
8482

8583
.PHONY: release-on-conda
8684
release-on-conda:
87-
@echo 'For now, this is all very manual'
88-
@echo 'Checklist:'
89-
@echo '- version number'
90-
@echo '- sha'
91-
@echo '- README.rst badge'
92-
@echo '- CHANGELOG.rst up to date'
85+
@echo 'See instructions in the Releasing sub-section of the Development section of the docs'
9386

9487
# first time setup, follow this https://blog.jetbrains.com/pycharm/2017/05/how-to-publish-your-package-on-pypi/
9588
# then this works

docs/source/development.rst

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Development
44
If you're interested in contributing to NetCDF-SCM, we'd love to have you on board!
55
This section of the docs details how to get setup to contribute and how best to communicate.
66

7+
.. contents:: :local:
78

89
Contributing
910
------------
@@ -133,7 +134,59 @@ For more information on these, `here is the full guide <https://numpydoc.readthe
133134
Releasing
134135
---------
135136

136-
[To be written, once I've done it]
137+
The steps to release a new version of NetCDF-SCM are shown below.
138+
Please do all the steps below and all the steps for both release platforms.
139+
140+
#. Update ``CHANGELOG.rst``:
141+
142+
- add a header for the new version between ``master`` and the latest bullet point
143+
- this should leave the section underneath the master header empty
144+
145+
#. ``git add .``
146+
#. ``git commit -m "Prepare for release of vX.Y.Z"``
147+
#. ``git push``
148+
#. ``git tag vX.Y.Z``
149+
#. ``git push --tags``
150+
151+
PyPI
152+
~~~~
153+
154+
#. ``make publish-on-testpypi``
155+
#. Go to `test PyPI <https://test.pypi.org/project/netcdf-scm/>`_ and check that the new release is as intended. If it isn't, stop and debug.
156+
#. ``make publish-on-pypi``
157+
#. Go to `PyPI <https://pypi.org/project/netcdf-scm/>`_ and check that the new release is as intended.
158+
159+
160+
Conda
161+
~~~~~
162+
163+
#. If you haven't already, fork the `NetCDF-SCM conda feedstock`_.
164+
#. Create a new branch in the feedstock for the version you want to bump to.
165+
#. Edit ``recipe/meta.yaml`` and update:
166+
167+
- version number in line 1 (don't include the 'v' in the version tag)
168+
- the build number to zero (you should only be here if releasing a new version)
169+
170+
#. Make a PR into the `NetCDF-SCM conda feedstock`_
171+
#. If the PR passes, merge
172+
#. Check https://anaconda.org/conda-forge/netcdf-scm to double check that the version has increased
173+
174+
.. _`NetCDF-SCM conda feedstock`: https://github.com/conda-forge/netcdf-scm-feedstock
175+
176+
177+
@echo 'Checklist:'
178+
@echo '- version number'
179+
@echo '- sha'
180+
@echo '- README.rst badge'
181+
@echo '- CHANGELOG.rst up to date'
182+
183+
Last steps
184+
~~~~~~~~~~
185+
186+
#. Update any badges in ``README.rst`` that don't update automatically
187+
#. ``git add .``
188+
#. ``git commit -m "Update README badges"``
189+
#. ``git push``
137190

138191

139192
Why is there a ``Makefile`` in a pure Python repository?

0 commit comments

Comments
 (0)