Separate enums from codeable concepts (PR #25)

CHANGELOG.md

@@ -7,22 +7,43 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Releases](https://github.com/cancerDHC/sheet2linkml/releases)
 
-## [v1.0.0](https://github.com/cancerDHC/sheet2linkml/releases/tag/v1.0.0)
+## [Unreleased]
 
-* First working release of `sheet2linkml`
-* Package deployed to PyPI
-* In its current state, it is meant to be used only as a dependency for ccdhmodel
-* It is compatible with Python version 3.9 and higher
+## [v1.2.0] - 2021-11-29
 
+* Separate enums from codeable concepts
 
-## [v1.0.1](https://github.com/cancerDHC/sheet2linkml/releases/tag/v1.0.1)
+## [v1.1.1] - 2021-11-11
 
-* Added `python-dotenv` to list of core dependencies
+* Updated minimum Python version from 3.9 to 3.7, thanks to changes from v1.1.0
 
-## [Unreleased]
+## [v1.1.0] - 2021-10-28
+
+* Retroactive code style formatting of the entire codebase using Black
+* Added a Github Action that checks if checked in code is Black formatted
+* Modified the code to be compatible with Python versions 3.7 and 3.8 by using `typing.List` and `typing.Dict`
+* Added this CHANGELOG
+
+## [v1.0.1] - 2021-10-04
 
-## [v1.0.2]
+* Improved README
+* Moved `python-dotenv` to list of core dependencies
+
+## [v1.0.0] - 2021-09-30
+
+* Added CONTRIBUTING documentation
+* Package deployed to PyPI
+* In its current state, it is meant to be used only as a dependency for ccdhmodel
+* It is compatible with Python version 3.9 and higher
+
+## [v0.0.1] - 2021-09-29
+
+* First working release of `sheet2linkml`
 
-* Retroactive black formatting of entire codebase
-* Github Action that checks if checked in code is black formatted
-* Compatible with Python versions 3.7 and 3.8
+[Unreleased]: https://github.com/cancerDHC/sheet2linkml/compare/v1.2.0...HEAD
+[v1.2.0]: https://github.com/cancerDHC/sheet2linkml/compare/v1.1.1...v1.2.0
+[v1.1.1]: https://github.com/cancerDHC/sheet2linkml/compare/v1.1.0...v1.1.1
+[v1.1.0]: https://github.com/cancerDHC/sheet2linkml/compare/v1.0.1...v1.1.0
+[v1.0.1]: https://github.com/cancerDHC/sheet2linkml/compare/v1.0.0...v1.0.1
+[v1.0.0]: https://github.com/cancerDHC/sheet2linkml/compare/v0.0.1...v1.0.0
+[v0.0.1]: https://github.com/cancerDHC/sheet2linkml/releases/tag/v0.0.1

CONTRIBUTING.md

@@ -57,6 +57,30 @@ poetry run black ~/path/to/directory
 
 ## Release process
 
+The branch names follow the convention described by the [git flow](https://nvie.com/posts/a-successful-git-branching-model/) 
+branching model. Release branches are created to support the preparation of a new production release.
+
+Steps to follow when issuing a new release:
+
+```
+git checkout -b release-1.2 develop # Switched to a new branch "release-1.2"
+
+# minor bug fixes and preparing metadata for a release
+# e.g., version number, build dates
+# commit changes
+
+# merge changes into "main"
+git checkout main # switched to branch "main"
+git merge --no-ff release-1.2 # merge into "main" with summary of changes
+
+# merge changes into "develop"
+git checkout develop # switched to branch "develop"
+git merge --no-ff release-1.2 # merge into "develop" with summary of changes
+
+# remove release branch
+git branch -d release-1.2  # deleted branch release-1.2
+```
+
 Once the code has been merged into the `main` branch on this repo, there are two processes that need to be completed 
 to ensure a release is complete.