Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docs and release workflow #36

Merged
merged 8 commits into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,13 @@ jobs:
release_branch: ${{ env.PUBLISH_UPDATE_BRANCH }}
exclude_labels: "duplicate,question,invalid,wontfix,dependency_updates,skip_changelog"

- name: Update '${{ env.PUBLISH_UPDATE_BRANCH }}'
- name: Configure git and commit CHANGELOG
run: |
git config --global user.email "${GIT_USER_EMAIL}"
git config --global user.name "${GIT_USER_NAME}"
git commit CHANGELOG.md -m "Release ${GITHUB_REF#refs/tags/}"

- name: Update '${{ env.PUBLISH_UPDATE_BRANCH }}' with automated changes
uses: CasperWA/push-protected@v2
with:
token: ${{ secrets.RELEASE_PAT_BOT }}
Expand Down
16 changes: 8 additions & 8 deletions INSTALL.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
# Installation

Clone this repository and then install with `pip` in the virtual environment of your choice.
QToolKit is available on [PyPI](https://pypi.org/project/qtoolkit) and can be installed with `pip`:

```
git clone git@https://github.com:matgenix/qtoolkit
cd qtoolkit
pip install .
```shell
pip install qtoolkit
```

## Development installation

You can use
Clone this repository and then install with `pip` in the virtual environment of your choice.

```
```shell
git clone git@https://github.com:matgenix/qtoolkit
cd qtoolkit
pip install -e .[dev,tests]
```

to perform an editable installation with additional development and test dependencies.
This will perform an editable installation with additional development and test dependencies.
You can then activate `pre-commit` in your local repository with `pre-commit install`.
3 changes: 3 additions & 0 deletions doc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,14 @@ html: api-doc html-build
html-build: generate
pandoc --from=markdown --to=rst --output=./source/dev/index.rst ../CONTRIBUTING.md
pandoc --from=markdown --to=rst --output=./source/user/install.rst ../INSTALL.md
pandoc --from=markdown --to=rst --output=./source/changelog.rst ../CHANGELOG.md
# Re-add rst links from pydata template
sed -i -e "1i .. _install:\n" ./source/user/install.rst
sed -i -e "1i ..\n THIS FILE IS AUTOMATICALLY GENERATED FROM INSTALL.md\n" ./source/user/install.rst
sed -i -e "1i .. _devindex:\n" ./source/dev/index.rst
sed -i -e "1i ..\n THIS FILE IS AUTOMATICALLY GENERATED FROM CONTRIBUTING.md\n" ./source/dev/index.rst
sed -i -e "1i .. _changelog:\n" ./source/changelog.rst
sed -i -e "1i ..\n THIS FILE IS AUTOMATICALLY GENERATED FROM CHANGELOG.md\n" ./source/changelog.rst
mkdir -p build/html build/doctrees
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) build/html $(FILES)
@echo
Expand Down
10,334 changes: 10,334 additions & 0 deletions doc/img/qtoolkit_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
#
# html_theme = 'sphinx_book_theme'
html_theme = 'pydata_sphinx_theme'
# html_favicon = '_static/favicon/favicon.ico'
html_favicon = '../img/qtoolkit_icon.svg'

# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
Expand Down
8 changes: 2 additions & 6 deletions doc/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,12 @@ QToolKit documentation
User Guide <user/index>
API reference <api/index>
Development <dev/index>
Changelog <changelog>


**Version**: |version|

**Useful links**:
TO BE ADDED

QToolKit is an interface to most Distributed Resource Management systems, e.g.
SLURM, PBS, ...

QToolKit is an interface to Distributed Resource Management (DRM) systems, e.g. SLURM and PBS, with the aim to enable programmatic control of queuing systems.


.. grid:: 1 2 2 2
Expand Down
7 changes: 0 additions & 7 deletions doc/source/user/building.rst

This file was deleted.

7 changes: 0 additions & 7 deletions doc/source/user/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,6 @@ details are found in :ref:`api`.
install
quickstart

.. toctree::
:caption: Advanced usage and interoperability
:maxdepth: 1

building


.. toctree::
:hidden:
:caption: Extras
Expand Down
12 changes: 1 addition & 11 deletions doc/source/user/quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,4 @@
QToolKit quickstart
===================

Prerequisites
=============
You need python

The Basics
==========

Create an easy script

ADD OTHER TOPICS:
remote submission, resources, ...
To be added.
3 changes: 1 addition & 2 deletions doc/source/user/whatisqtoolkit.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@
What is QToolKit?
=================

QToolKit is ...
TODO: add the features that it has.
To be added.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ msonable = ["monty>=2022.9.9",]
homepage = "https://matgenix.github.io/qtoolkit/"
repository = "https://github.com/matgenix/qtoolkit"
documentation = "https://matgenix.github.io/qtoolkit/"
changelog = "https://github.com/matgenix/qtoolkit/CHANGELOG.md"
changelog = "https://matgenix.github.io/qtoolkit/changelog"

[tool.setuptools.package-data]
qtoolkit = ["py.typed"]
Expand Down
Loading