Home

Feature branches

Each feature branch should have: - branch name (short, descriptive, unique) - description of the feature - person responsible for managing the feature Discuss in Slack #abc before adding a new feature

Feature development is tracked in https://github.com/HIIT/abcpy/projects

Development guidelines

Adding a new feature

• Discuss if feature should be added (in Slack #abc)
• If there are people supporting the idea, create a feature branch to main repo (from dev branch)
• Add feature data to list of feature branches

Contributing to an existing feature

• Pick a feature to work on
• Fork the main repository, checkout your version of the feature branch
• Develop code
• Push commits to your fork
• Make a pull request from your repo feature branch to main repo feature branch
• Wait until PR accepted; make changes if needed

Making a small change / bugfix (smaller than a feature)

• Fork the main repository, checkout dev branch
• Develop code
• Push commits to your fork
• Make a pull request from your repo dev branch to main repo dev branch
• Wait until PR accepted; make changes if needed

Merging a feature

• When feature is ready, announce this in Slack #abc
• Make a pull request from main repo feature branch to main repo dev branch
• Wait until PR accepted by majority vote of core developers; make changes if needed

Making a release

• When all features for release are ready, announce this in Slack #abc
• Make a pull request from main repo dev branch to main repo master
• Wait until PR accepted by all core developers; make changes if needed
• Add release version tag to main repo master branch
• Publish new version to pypi