Development guide¶
This tutorial will guide you through on how to set up a working environment for developing pynxtools-xas.
What should you know before this tutorial?¶
- You should read the guide on getting started with
pynxtools. - You should read the installation tutorial.
What you will know at the end of this tutorial?¶
You will know
- how to setup your environment for developing
pynxtools-xas - which branch to use for which kind of change
- how to make changes to the software
- how to test the software
- how to contribute on GitHub
- how a new version is released
- how to use
pynxtools-xasas a NOMAD plugin
Contributing¶
Structure of the pynxtools-xas repository
The software tools are located inside src/pynxtools_xas. They are shipped with unit tests located in tests.
Branching model¶
pynxtools-xas follows the same branching model as the core NOMAD packages.
| Branch | Role |
|---|---|
develop |
Default branch. All regular development PRs target this branch. |
main |
Released versions only. Only release/* branches are merged here, so its history is the release history. |
release/vX.Y.Z |
Temporary release branch, created from develop and merged into main. The version may carry a pre-release suffix, e.g. release/vX.Y.Z-beta or release/vX.Y.Z-rc1. |
| Activity | Branch |
|---|---|
| Feature development | develop |
| PR review and integration | develop |
| Selecting changes for a release | release/vX.Y.Z |
| Release-specific bug fixes | release/vX.Y.Z |
| Published release history | main |
| Porting release fixes back to ongoing development | Merge release/vX.Y.Z back into develop |
The Check if source is release/* workflow
(.github/workflows/check-source-is-release.yml)
allows PRs into main only from release/* branches. PRs from any other branch, including develop,
fail this check. It is enforced by marking it as a required status check in the branch protection rule
for main.
Setup¶
It is recommended to use python 3.12 with a dedicated virtual environment for this package. Learn how to manage python versions and virtual environments. We recommend using uv, an extremely fast Python package and project manager. In this tutorial, you will find parallel descriptions, using either uv or a more classical approach using venv and pip.
Start by creating a virtual environment:
That command creates a new virtual environment in a directory called .venv.
Development installation¶
We start by cloning the repository:
git clone https://github.com/FAIRmat-NFDI/pynxtools-xas.git \\
--branch develop \\
--recursive pynxtools-xas
cd pynxtools-xas
Next, we install the package in editable mode (together with its dependencies):
Linting and formatting¶
We are using ruff and mypy for linting, formatting, and type checking. It is recommended to use the pre-commit hook available for ruff which formats the code and checks the linting before making a Git commit.
Install the precommit by running
from the root of this repository.
Testing¶
There exist unit tests for the software written in pytest which can be used as follows:
Editing the documentation¶
We are using `mkdocs for the documentation. If you edit the documentation, you can build it locally. For this, you need to install an additional set of dependencies:
You can then serve the documentation locally by running
Contributing to the package on GitHub¶
Once you are happy with the changes, commit them on a separate branch created from develop and open a pull request against develop:
git switch develop && git pull
git switch -c <short-descriptive-name>
# commit your changes, then
git push -u origin <short-descriptive-name>
Never open a pull request against main: it receives only release/* branches. We run a number of GitHub actions that check the correct linting, run the tests in an isolated environment, and build the documentation. Once these pass and a peer review of the code has occurred, your code will be accepted.
Release workflow¶
-
Create the release branch from
develop: -
Commit only release-specific changes on this branch (version bumps, changelog, last-minute bug fixes). New features keep going into
develop. - Bump
versioninCITATION.cfftoX.Y.Z, including any pre-release suffix (e.g.0.1.2-rc1for the tagv0.1.2-rc1). The publish workflow fails if it differs from the tag. - Open a PR from
release/vX.Y.Zintomain. Do not merge yet! - Create a GitHub release with the tag
vX.Y.Zand selectrelease/vX.Y.Zas its target branch. The publish workflow refuses to upload to PyPI if the release does not targetrelease/vX.Y.Zor if the tagged commit is not on that branch. - Once CI passes and the release is published to PyPI, merge the PR.
- If you fixed anything directly on the release branch, open a PR from
release/vX.Y.Zintodevelopso the fixes are not lost in ongoing development. - Delete the
release/vX.Y.Zbranch.
Developing pynxtools-xas as a NOMAD plugin¶
If you plan to contribute to the NOMAD plugin functionality of pynxtools-xas, it often makes sense to use the NOMAD development environment called nomad-distro-dev. You can learn more in the NOMAD documentation.
Troubleshooting¶
If you face any issues with the tool or when setting up the development environment, please create a new Github Issue.