Skip to content

Commit 79ceabb

Browse files
authored
Merge pull request #30 from cadenmyers13/recut
Recut with release workflow
2 parents ff9b5a5 + 8e43568 commit 79ceabb

File tree

5 files changed

+89
-9
lines changed

5 files changed

+89
-9
lines changed

.github/ISSUE_TEMPLATE/bug_feature.md

+16
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
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.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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+
uses: Billingegroup/release-scripts/.github/workflows/_build-wheel-release-upload.yml@v0
12+
with:
13+
project: diffpy.fourigui
14+
secrets:
15+
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
16+
PAT_TOKEN: ${{ secrets.PAT_TOKEN }}

README.rst

+12-9
Original file line numberDiff line numberDiff line change
@@ -71,20 +71,18 @@ To add "conda-forge" to the conda channels, run the following in a terminal. ::
7171
We want to install our packages in a suitable conda environment.
7272
The following creates and activates a new environment named ``diffpy.fourigui_env`` ::
7373

74-
conda create -n diffpy.fourigui_env python=3
74+
conda create -n diffpy.fourigui_env diffpy.fourigui
7575
conda activate diffpy.fourigui_env
7676

77-
Then, to fully install ``diffpy.fourigui`` in our active environment, run ::
77+
To confirm that the installation was successful, type ::
7878

79-
conda install diffpy.fourigui
79+
python -c "import diffpy.fourigui; print(diffpy.fourigui.__version__)"
8080

81-
Another option is to use ``pip`` to download and install the latest release from
82-
`Python Package Index <https://pypi.python.org>`_.
83-
To install using ``pip`` into your ``diffpy.fourigui_env`` environment, we will also have to install dependencies ::
84-
85-
pip install -r https://raw.githubusercontent.com/diffpy/diffpy.fourigui/main/requirements/run.txt
81+
The output should print the latest version displayed on the badges above.
8682

87-
and then install the package ::
83+
If the above does not work, you can use ``pip`` to download and install the latest release from
84+
`Python Package Index <https://pypi.python.org>`_.
85+
To install using ``pip`` into your ``diffpy.fourigui_env`` environment, type ::
8886

8987
pip install diffpy.fourigui
9088

@@ -94,6 +92,11 @@ and run the following ::
9492

9593
pip install .
9694

95+
Getting Started
96+
---------------
97+
98+
You may consult our `online documentation <https://diffpy.github.io/diffpy.fourigui>`_ for tutorials and API references.
99+
97100
Support and Contribute
98101
----------------------
99102

news/recutv2.rst

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
**Added:**
2+
3+
* Add GitHub release workflow
4+
5+
**Changed:**
6+
7+
* <news item>
8+
9+
**Deprecated:**
10+
11+
* <news item>
12+
13+
**Removed:**
14+
15+
* <news item>
16+
17+
**Fixed:**
18+
19+
* Recut to group's package standard, fix installation
20+
21+
**Security:**
22+
23+
* <news item>

0 commit comments

Comments
 (0)