diff --git a/.github/workflows/run-tests.yml.jinja b/.github/workflows/run-tests.yml.jinja index edea9e6..b0defed 100644 --- a/.github/workflows/run-tests.yml.jinja +++ b/.github/workflows/run-tests.yml.jinja @@ -21,10 +21,6 @@ jobs: python-version: "3.11" - name: Install the latest version of uv uses: astral-sh/setup-uv@v6 - - name: Display configuration for Ubuntu - uses: pyvista/setup-headless-display-action@v4 - with: - qt: true - uses: pre-commit/action@v3.0.1 # run pre-commit ci lite for automated fixes - uses: pre-commit-ci/lite-action@v1.1.0 diff --git a/.github/workflows/test-template.yml b/.github/workflows/test-template.yml index 9f61fdf..f9a1d29 100644 --- a/.github/workflows/test-template.yml +++ b/.github/workflows/test-template.yml @@ -21,10 +21,6 @@ jobs: python-version: "3.11" - name: Install the latest version of uv uses: astral-sh/setup-uv@v6 - - name: Display configuration for Ubuntu - uses: pyvista/setup-headless-display-action@v4 - with: - qt: true - uses: pre-commit/action@v3.0.1 # run pre-commit ci lite for automated fixes - uses: pre-commit-ci/lite-action@v1.1.0 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8ed3b2c..eae37d0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -42,7 +42,7 @@ repos: rev: "v0.11.11" hooks: - id: ruff-format - - id: ruff + - id: ruff-check - repo: https://github.com/rhysd/actionlint rev: v1.7.7 hooks: diff --git a/.pre-commit-config.yaml.jinja b/.pre-commit-config.yaml.jinja new file mode 100644 index 0000000..7d46cd1 --- /dev/null +++ b/.pre-commit-config.yaml.jinja @@ -0,0 +1,58 @@ +# See https://pre-commit.com for more information +# See https://pre-commit.com/hooks.html for more hooks +repos: +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v5.0.0 + hooks: + - id: trailing-whitespace + - id: end-of-file-fixer + - id: check-yaml + - id: detect-private-key +- repo: https://github.com/tox-dev/pyproject-fmt + rev: "v2.6.0" + hooks: + - id: pyproject-fmt +- repo: https://github.com/citation-file-format/cffconvert + rev: 5295f87c0e261da61a7b919fc754e3a77edd98a7 + hooks: + - id: validate-cff +- repo: https://github.com/codespell-project/codespell + rev: v2.4.1 + hooks: + - id: codespell + exclude: | + (?x)^( + .*\.lock | + .*\.csv | + .*\.cff | + .*\.ipynb + )$ +- repo: https://github.com/executablebooks/mdformat + rev: 0.7.21 + hooks: + - id: mdformat + additional_dependencies: + - mdformat-gfm +- repo: https://github.com/adrienverge/yamllint + rev: v1.37.1 + hooks: + - id: yamllint + exclude: pre-commit-config.yaml +- repo: https://github.com/astral-sh/ruff-pre-commit + rev: "v0.11.11" + hooks: + - id: ruff-format + - id: ruff-check +- repo: https://github.com/rhysd/actionlint + rev: v1.7.7 + hooks: + - id: actionlint +- repo: https://gitlab.com/vojko.pribudic.foss/pre-commit-update + rev: v0.6.0 + hooks: + - id: pre-commit-update + args: ["--keep", "mdformat", "--keep", "pre-commit-update", "--keep", "cffconvert"] +- repo: https://github.com/jendrikseipp/vulture + rev: 'v2.14' + hooks: + - id: vulture diff --git a/CITATION.cff b/CITATION.cff index 8bfd590..93fac9c 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -20,3 +20,6 @@ keywords: - research-software - template license: BSD-3-Clause +identifiers: + - type: doi + value: "10.5281/zenodo.15518401" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4f987b9..68aa978 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,7 +11,7 @@ If you are stuck, please feel free to ask any questions or ask for help. This project is governed by our [code of conduct](code_of_conduct.md). By participating, you are expected to uphold this code. Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to community leaders responsible for enforcement. -Please open a \[new security advisory notice\](/security/advisories/new) (using defaults or "n/a" where unable to fill in the form) to privately notify us of any incidents of this nature. +Please open a [new security advisory notice](https://github.com/CU-DBMI/template-uv-python-research-software/security/advisories/new) (using defaults or "n/a" where unable to fill in the form) to privately notify us of any incidents of this nature. ## Development @@ -57,7 +57,7 @@ We welcome anyone to use [GitHub issues](https://docs.github.com/en/issues/track Specifically, there are several ways to suggest or make changes to this repository: -1. Open a GitHub issue: /issues +1. Open a GitHub issue: https://github.com/CU-DBMI/template-uv-python-research-software/issues 1. Create a pull request from a forked branch of the repository ### Creating a pull request @@ -72,7 +72,7 @@ Once you make the necessary changes on this branch, you should file a pull reque The content and description of your pull request are directly related to the speed at which we are able to review, approve, and merge your contribution. To ensure an efficient review process please perform the following steps: -1. Follow all instructions in the \[pull request template\](/blob/main/.github/PULL_REQUEST_TEMPLATE.md) +1. Follow all instructions in the [pull request template](https://github.com/CU-DBMI/template-uv-python-research-software/blob/main/.github/PULL_REQUEST_TEMPLATE.md) 1. Triple check that your pull request is adding _one_ specific feature or additional group of content. Small, bite-sized pull requests move so much faster than large pull requests. 1. After submitting your pull request, ensure that your contribution passes all status checks (e.g. passes all tests) @@ -93,7 +93,7 @@ Versioning for the project is intended to align with GitHub Releases which provi ### Releases -We publish source code by using [GitHub Releases](https://docs.github.com/en/repositories/releasing-projects-on-github/about-releases) available \[here\](/releases). +We publish source code by using [GitHub Releases](https://docs.github.com/en/repositories/releasing-projects-on-github/about-releases) available [here](https://github.com/CU-DBMI/template-uv-python-research-software/releases). #### Release Publishing Process diff --git a/CONTRIBUTING.md.jinja b/CONTRIBUTING.md.jinja new file mode 100644 index 0000000..e5dde36 --- /dev/null +++ b/CONTRIBUTING.md.jinja @@ -0,0 +1,129 @@ +# Contributing + +First of all, thank you so much for contributing! 🎉 💯 + +This document contains guidelines on how to most effectively contribute within this repository. + +If you are stuck, please feel free to ask any questions or ask for help. + +## Code of conduct + +This project is governed by our [code of conduct](code_of_conduct.md). By participating, you are expected to uphold this code. +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported to community leaders responsible for enforcement. +Please open a [new security advisory notice]({{ github_url }}/security/advisories/new) (using defaults or "n/a" where unable to fill in the form) to privately notify us of any incidents of this nature. + +## Development + +This project leverages development environments managed by [uv](https://docs.astral.sh/uv/). +We use [pytest](https://docs.pytest.org/) for testing and [GitHub actions](https://docs.github.com/en/actions) for automated tests. + +### Development setup + +Perform the following steps to setup a Python development environment. + +1. [Install Python](https://www.python.org/downloads/) (we recommend using [`pyenv`](https://github.com/pyenv/pyenv) or similar) +1. [Install uv](https://docs.astral.sh/uv/getting-started/installation/) + +### Linting + +Work added to this project is automatically checked using [pre-commit](https://pre-commit.com/) via [GitHub Actions](https://docs.github.com/en/actions). +Pre-commit can work alongside your local [git with git-hooks](https://pre-commit.com/index.html#3-install-the-git-hook-scripts) + +After [installing pre-commit](https://pre-commit.com/#installation) within your development environment, the following command also can perform the same checks within your local development environment: + +```sh +% pre-commit run --all-files +``` + +We use these same checks within our automated tests which are managed by [GitHub Actions workflows](https://docs.github.com/en/actions/using-workflows). +These automated tests generally must pass in order to merge work into this repository. + +### Testing + +Work added to this project is automatically tested using [pytest](https://docs.pytest.org/) via [GitHub Actions](https://docs.github.com/en/actions). +Pytest is installed through the uv environment for this project. +We recommend testing your work before opening pull requests with proposed changes. + +You can run pytest on your work using the following example: + +```sh +% uv run pytest +``` + +## Making changes to this repository + +We welcome anyone to use [GitHub issues](https://docs.github.com/en/issues/tracking-your-work-with-issues/about-issues) (requires a GitHub login) or create [pull requests](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests) (to directly make changes within this repository) to modify content found within this repository. + +Specifically, there are several ways to suggest or make changes to this repository: + +1. Open a GitHub issue: {{ github_url }}/issues +1. Create a pull request from a forked branch of the repository + +### Creating a pull request + +### Pull requests + +After you’ve decided to contribute code and have written it up, please file a pull request. +We specifically follow a [forked pull request model](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork). +Please create a fork of this repository, clone the fork, and then create a new, feature-specific branch. +Once you make the necessary changes on this branch, you should file a pull request to incorporate your changes into this (fork upstream) repository. + +The content and description of your pull request are directly related to the speed at which we are able to review, approve, and merge your contribution. +To ensure an efficient review process please perform the following steps: + +1. Follow all instructions in the [pull request template]({{ github_url }}/blob/main/.github/PULL_REQUEST_TEMPLATE.md) +1. Triple check that your pull request is adding _one_ specific feature or additional group of content. + Small, bite-sized pull requests move so much faster than large pull requests. +1. After submitting your pull request, ensure that your contribution passes all status checks (e.g. passes all tests) + +Pull request review and approval is required by at least one project maintainer to merge. +We will do our best to review the code addition in a timely fashion. +Ensuring that you follow all steps above will increase our speed and ability to review. +We will check for accuracy, style, code coverage, and scope. + +## Versioning + +We use [`setuptools-scm`](https://github.com/pypa/setuptools-scm) to help version this software through [`PEP 440`](https://peps.python.org/pep-0440/) standards and [semver.org](https://semver.org/) standards. +Configuration for versioning is found within the `pyproject.toml` file. +All builds for packages include dynamic version data to help label distinct versions of the software. +`setuptools-scm` uses `git` tags to help distinguish version data. +We also use the `_version.py` file as a place to persist the version data for occaissions where the `git` history is unavailable or unwanted (this file is only present in package builds). +Versioning for the project is intended to align with GitHub Releases which provide `git` tag capabilities. + +### Releases + +We publish source code by using [GitHub Releases](https://docs.github.com/en/repositories/releasing-projects-on-github/about-releases) available [here]({{ github_url }}/releases). + +#### Release Publishing Process + +Several manual and automated steps are involved with publishing releases. +See below for an overview of how this works. + +Notes about [semantic version](https://en.wikipedia.org/wiki/Software_versioning#Semantic_versioning) (semver) specifications: version specifications are controlled through [`setuptools-scm`](https://github.com/pypa/setuptools-scm) to create version data based on [git tags](https://git-scm.com/book/en/v2/Git-Basics-Tagging) and commits. +Release git tags are automatically applied through [GitHub Releases](https://docs.github.com/en/repositories/releasing-projects-on-github/about-releases) and related inferred changes from [`release-drafter`](https://github.com/release-drafter/release-drafter). + +1. Open a pull request and use a repository label for `release-` to label the pull request for visibility with [`release-drafter`](https://github.com/release-drafter/release-drafter). +1. On merging the pull request for the release, a [GitHub Actions workflow](https://docs.github.com/en/actions/using-workflows) defined in `draft-release.yml` leveraging [`release-drafter`](https://github.com/release-drafter/release-drafter) will draft a release for maintainers. +1. The draft GitHub release will include a version tag based on the GitHub PR label applied and `release-drafter`. +1. Make modifications as necessary to the draft GitHub release, then publish the release (the draft release does not normally need additional modifications). +1. On publishing the release, another GitHub Actions workflow defined in `publish-pypi.yml` will run to build and deploy the Python package to PyPI (utilizing the earlier modified `pyproject.toml` semantic version reference for labeling the release). + +## Documentation + +Documentation for this project is published using [Sphinx](https://www.sphinx-doc.org) with markdown and Jupyter notebook file compatibility provided by [myst-parser](https://myst-parser.readthedocs.io/en/latest/) and [myst-nb](https://myst-nb.readthedocs.io/en/latest/) to create a "documentation website" (also known as "docsite"). +The docsite is hosted through [GitHub Pages](https://pages.github.com/) and deployed through automated [GitHub Actions](https://docs.github.com/en/actions) jobs which trigger on pushes to the main branch or the publishing of a new release on GitHub. +Documentation is versioned as outlined earlier sections covering versioning details to help ensure users are able to understand each release independently of one another. + +It can sometimes be useful to test documentation builds locally before proposing changes within a pull request. +See below for some examples of how to build documentation locally. + +```shell +# build single-version sphinx documentation +# (useful for troubleshooting potential issues) +uv run sphinx-build docs/src docs/build + +# build multi-version sphinx documentation +# (used in production) +uv run sphinx-multiversion docs/src docs/build +```