Skip to content

Commit bd896d9

Browse files
author
Filippo Ballerini
committed
Merge branch 'main' of https://github.com/diffpy/diffpy.snmf into doc
2 parents f2827bd + 8bc03e0 commit bd896d9

File tree

13 files changed

+110
-70
lines changed

13 files changed

+110
-70
lines changed
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
name: Bug Report or Feature Request
3+
about: Report a bug or suggest a new feature!
4+
title: ""
5+
labels: ""
6+
assignees: ""
7+
---
8+
9+
### Problem
10+
11+
<!--
12+
For a bug report, please copy and paste any error messages from the application or command-line here.
13+
For a feature request, please state how the new functionality could benefit the community.
14+
-->
15+
16+
### Proposed solution
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
name: Release
3+
about: Checklist and communication channel for PyPI and GitHub release
4+
title: "Ready for <version-number> PyPI/GitHub release"
5+
labels: "release"
6+
assignees: ""
7+
---
8+
9+
### Release checklist for GitHub contributors
10+
11+
- [ ] All PRs/issues attached to the release are merged.
12+
- [ ] All the badges on the README are passing.
13+
- [ ] License information is verified as correct. If you are unsure, please comment below.
14+
- [ ] Locally rendered documentation contains all appropriate pages, including API references (check no modules are
15+
missing), tutorials, and other human written text is up-to-date with any changes in the code.
16+
- [ ] Installation instructions in the README, documentation and on the website (e.g., diffpy.org) are updated and
17+
tested
18+
- [ ] Successfully run any tutorial examples or do functional testing in some other way.
19+
- [ ] Grammar and writing quality have been checked (no typos).
20+
21+
Please mention @sbillinge when you are ready for release. Include any additional comments necessary, such as
22+
version information and details about the pre-release.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Release (GitHub/PyPI)
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
tags:
7+
- '*' # Trigger on all tags initially, but tag and release privilege are verified in _build-wheel-release-upload.yml
8+
9+
jobs:
10+
release:
11+
permissions:
12+
contents: write
13+
uses: Billingegroup/release-scripts/.github/workflows/_build-wheel-release-upload.yml@v0
14+
with:
15+
project: diffpy.snmf
16+
secrets:
17+
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
18+
PAT_TOKEN: ${{ secrets.PAT_TOKEN }}

.github/workflows/publish-docs-on-release.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

CHANGELOG.rst

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,36 @@ Release Notes
44

55
.. current developments
66
7+
0.1.3
8+
=====
9+
10+
**Fixed:**
11+
12+
* Updated REAMDE instructions for pip and conda-forge install
13+
* Updated REAMDE instructions to check for successful installation
14+
15+
16+
0.1.2
17+
=====
18+
19+
**Added:**
20+
21+
* Use GitHub Actions to build, release, upload to PyPI
22+
* Added issue template for PyPI/GitHub release
23+
24+
**Changed:**
25+
26+
* Added tag check for release
27+
* citation from arXiv to npj Comput Mater in docs
28+
29+
**Fixed:**
30+
31+
* Python version from 3.9 to 3.12 in CI news item
32+
* tests folder at the root of the repo
33+
* re-cookiecuter repo to groupd's package standard
34+
* Add pip dependencies under pip.txt and conda dependencies under conda.txt
35+
36+
737
0.1.0
838
=====
939

README.rst

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ by citing the following paper in your publication:
6161
<https://doi.org/10.1038/s41524-024-01377-5>`__,
6262
*npj Comput Mater* **10**, 193 (2024).
6363

64-
6564
Installation
6665
------------
6766

@@ -76,14 +75,16 @@ To add "conda-forge" to the conda channels, run the following in a terminal. ::
7675
We want to install our packages in a suitable conda environment.
7776
The following creates and activates a new environment named ``diffpy.snmf_env`` ::
7877

79-
conda create -n diffpy.snmf_env python=3
78+
conda create -n diffpy.snmf_env diffpy.snmf
8079
conda activate diffpy.snmf_env
8180

82-
Then, to fully install ``diffpy.snmf`` in our active environment, run ::
81+
To confirm that the installation was successful, type ::
82+
83+
python -c "import diffpy.snmf; print(diffpy.snmf.__version__)"
8384

84-
conda install diffpy.snmf
85+
The output should print the latest version displayed on the badges above.
8586

86-
Another option is to use ``pip`` to download and install the latest release from
87+
If the above does not work, you can use ``pip`` to download and install the latest release from
8788
`Python Package Index <https://pypi.python.org>`_.
8889
To install using ``pip`` into your ``diffpy.snmf_env`` environment, type ::
8990

@@ -95,6 +96,11 @@ and run the following ::
9596

9697
pip install .
9798

99+
Getting Started
100+
---------------
101+
102+
You may consult our `online documentation <https://diffpy.github.io/diffpy.snmf>`_ for tutorials and API references.
103+
98104
Support and Contribute
99105
----------------------
100106

news/citation.rst

Lines changed: 0 additions & 23 deletions
This file was deleted.

news/recut.rst renamed to news/fix-cli.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
**Fixed:**
1818

19-
* re-cookiecuter repo to groupd's package standard
19+
* Add entry point to the application
20+
* Fix CLI bug due to typo
2021

2122
**Security:**
2223

news/folder.rst

Lines changed: 0 additions & 23 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
**Fixed:**
1818

19-
* Python version from 3.9 to 3.12 in CI news item
19+
* Include GitHub Issues templates for bug report and feature request
2020

2121
**Security:**
2222

0 commit comments

Comments
 (0)