Skip to content

Commit

Permalink
Merge branch 'release/0.2.2'
Browse files Browse the repository at this point in the history
* release/0.2.2:
  Bump version: 0.2.2-dev -> 0.2.2
  Bump version: 0.2.1 -> 0.2.2-dev
  Fix missing codes and views.csv in dist
  update release notes instructions.
  Add update documentation.
  • Loading branch information
zgypa committed Aug 31, 2023
2 parents 4e8aabd + 62124dc commit 9d48480
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
commit = True
tag = True
tag_name = v{new_version}
current_version = 0.2.1
current_version = 0.2.2
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
message = Bump version: {current_version} -> {new_version}
serialize =
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ build
*.pyc
*.egg-info
*.dcm
modules/dicom3tools
modules/dicom3tools
docs/.buildinfo
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<img src="https://raw.githubusercontent.com/open-ortho/dicom4ortho/master/images/open-ortho.png" alt="Logo" width="80" height="80">
</a>

<h3 align="center">dicom4ortho 0.2.1</h3>
<h3 align="center">dicom4ortho 0.2.2</h3>

<p align="center">
A Python library to create fully defined orthodontic photographs in DICOM.
Expand Down
2 changes: 1 addition & 1 deletion dicom4ortho/defaults.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from pathlib import Path
import importlib.resources as importlib_resources

VERSION = '0.2.1'
VERSION = '0.2.2'
__url__ = 'https://github.com/open-ortho/dicom4ortho'
__author__ = 'Toni Magni'
__email__ = 'open-ortho@panio.info'
Expand Down
3 changes: 3 additions & 0 deletions docs/RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@
3. Bump the version with major, minor or patch and then `bumpversion release` as required.
4. `make clean`
4. `git merge master`: merge master into here, and fix merge errors.
5. Update release notes in `gh-pages` with major changes of this release. You might want to compare this release branch agains master to see logs.
6. Check that README.md is still current.
5. Delete pipenv environment and Pipfile.lock and rebuild, to make sure there are no `Pipfile` errors or lock errors.
6. `make install-dev`: make sure `dicom3tools` target works as expected.
5. `make test`: make sure all tests pass.
7. `make build`
8. Make sure proper token for pypi is in `$HOME/.pypirc`. See https://pypi.org/manage/account/token/?selected_project=dicom4ortho
9. `make deploy`
10. If all goes well, then merge branch into master: `git flor release finish`.
11. Update documentation in `gh-pages` branch.

If there is a mistake in the uploaded version, and you need to re-upload, you will have to bump the patch version. PyPi will not allow to re-use the same version number, even if the package has been deleted via the Web GUI.
6 changes: 4 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

setup(
name='dicom4ortho', # Required
version='0.2.1', # Required
version='0.2.2', # Required
description=metadata['doc'], # Required
long_description=long_description, # Optional
long_description_content_type='text/markdown', # Optional (see note above)
Expand Down Expand Up @@ -74,7 +74,9 @@
package_data={
'': [
'LICENSE',
'resources/image_types.csv'
'resources/image_types.csv',
'resources/codes.csv',
'resources/views.csv',
]
},
)

0 comments on commit 9d48480

Please sign in to comment.