Contributor Guidelines¶
This document will go through best practices for contributing to this project. We welcome and appreciate contributions or ideas for improvement.
Bug Reports and Feature Requests¶
Before creating a pull request, we ask contributors to please open a bug report or feature request first: issues
We will do our best to monitor and maintain the backlog of issues.
Local Installation and Development¶
For development,
For new features or non-urgent bug fixes, create a branch off of
devFor an urgent hotfix to our production environment, create a branch off of
main
Consult the Branches and Pull Requests and Release Cycles sections for more details.
From the root directory, run:
pip install -e .[dev]
to install the relevant code for development.
Running indexer jobs locally¶
The jobs are intended to be run as scheduled AWS ECS tasks. The job settings are stored in AWS Parameter Store.
If you wish to run the jobs locally, follow these steps:
Ensure the correct
AWS_PROFILEis exported. This profile will be used to read/write from S3 buckets and DocumentDB (through the API Gateway).For the IndexAindBucketsJob, you will need to set the
PARAM_STORE_NAME. Then, run the following:
from aind_data_asset_indexer.index_aind_buckets import IndexAindBucketsJob
from aind_data_asset_indexer.models import AindIndexBucketsJobSettings
if __name__ == "__main__":
main_job_settings = AindIndexBucketsJobSettings.from_param_store(param_store_name=PARAM_STORE_NAME)
main_job = IndexAindBucketsJob(job_settings=main_job_settings)
main_job.run_job()
For the CodeOceanIndexBucketJob, you will need to set the
PARAM_STORE_NAME_CO_JOB. Then, run the following:
from aind_data_asset_indexer.models import CodeOceanIndexBucketJobSettings
from aind_data_asset_indexer.codeocean_bucket_indexer import CodeOceanIndexBucketJob
if __name__ == "__main__":
main_job_settings = CodeOceanIndexBucketJobSettings.from_param_store(param_store_name=PARAM_STORE_NAME_CO_JOB)
main_job = CodeOceanIndexBucketJob(job_settings=main_job_settings)
main_job.run_job()
Alternatively, run both jobs by running the script at
/scripts/run.sh.
Branches and Pull Requests¶
Branch naming conventions¶
Name your branch using the following format:
<type>-<issue_number>-<short_summary>
where:
<type>is one of:build: Changes that affect the build system or external dependencies (e.g., pyproject.toml, setup.py)
ci: Changes to our CI configuration files and scripts (examples: .github/workflows/ci.yml)
docs: Changes to our documentation
feat: A new feature
fix: A bug fix
perf: A code change that improves performance
refactor: A code change that neither fixes a bug nor adds a feature, but will make the codebase easier to maintain
test: Adding missing tests or correcting existing tests
hotfix: An urgent bug fix to our production code
<issue_number>references the GitHub issue this branch will close<short_summary>is a brief description that shouldn’t be more than 3 words.
Some examples:
feat-12-adds-email-fieldfix-27-corrects-endpointtest-43-updates-server-test
We ask that a separate issue and branch are created if code is added outside the scope of the reference issue.
Commit messages¶
Please format your commit messages as <type>: <short summary> where
<type> is from the list above and the short summary is one or two
sentences.
Testing and docstrings¶
We strive for complete code coverage and docstrings, and we also run code format checks.
To run the code format check:
flake8 .
There are some helpful libraries that will automatically format the code and import statements:
black .
and
isort .
Strings that exceed the maximum line length may still need to be formatted manually.
To run the docstring coverage check and report:
interrogate -v .
This project uses NumPy’s docstring format: Numpy docstring standards
Many IDEs can be configured to automatically format docstrings in the NumPy convention.
To run the unit test coverage check and report:
coverage run -m unittest discover && coverage report
To view a more detailed html version of the report, run:
coverage run -m unittest discover && coverage report
coverage html
and then open htmlcov/index.html in a browser.
Pull requests¶
Pull requests and reviews are required before merging code into this
project. You may open a Draft pull request and ask for a preliminary
review on code that is currently a work-in-progress.
Before requesting a review on a finalized pull request, please verify that the automated checks have passed first.
Release Cycles¶
For this project, we have adopted the Git Flow system. We will strive to release new features and bug fixes on a two week cycle. The rough workflow is:
Hotfixes¶
A
hotfixbranch is created off ofmainA Pull Request into
mainis opened, reviewed, and merged intomainA new
tagwith a patch bump is created, and a newreleaseis deployedThe
mainbranch is merged into all other branches
Feature branches and bug fixes¶
A new branch is created off of
devA Pull Request into
devis opened, reviewed, and merged
Release branch¶
A new branch
release-v{new_tag}is createdDocumentation updates and bug fixes are created off of the
release-v{new_tag}branch.Commits added to the
release-v{new_tag}are also merged intodevOnce ready for release, a Pull Request from
release-v{new_tag}intomainis opened for final reviewA new tag will automatically be generated
Once merged, a new GitHub Release is created manually
Pre-release checklist¶
☐ Increment
__version__inaind_data_asset_indexer/__init__.pyfile☐ Run linters, unit tests, and integration tests
☐ Verify code is deployed and tested in test environment
☐ Update examples
☐ Update documentation
Run:
sphinx-apidoc -o docs/source/ src sphinx-build -b html docs/source/ docs/build/html
☐ Update and build UML diagrams
To build UML diagrams locally using a docker container:
docker pull plantuml/plantuml-server docker run -d -p 8080:8080 plantuml/plantuml-server:jetty
Post-release checklist¶
☐ Merge
mainintodevand feature branches☐ Edit release notes if needed
☐ Post announcement