Skip to content

Commit bb6acf3

Browse files
authored
Merge pull request #110 from Tieqiong/recut
Recut to align with the new release process
2 parents 5e2ff1e + 4aa57b3 commit bb6acf3

File tree

5 files changed

+90
-4
lines changed

5 files changed

+90
-4
lines changed

Diff for: .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

Diff for: .github/ISSUE_TEMPLATE/release_checklist.md

+22
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.

Diff for: .github/workflows/build-wheel-release-upload.yml

+16
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.structure
14+
secrets:
15+
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
16+
PAT_TOKEN: ${{ secrets.PAT_TOKEN }}

Diff for: README.rst

+11-4
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,16 @@ To add "conda-forge" to the conda channels, run the following in a terminal. ::
7878
We want to install our packages in a suitable conda environment.
7979
The following creates and activates a new environment named ``diffpy.structure_env`` ::
8080

81-
conda create -n diffpy.structure_env python=3
81+
conda create -n diffpy.structure_env diffpy.structure
8282
conda activate diffpy.structure_env
8383

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

86-
conda install diffpy.structure
86+
python -c "import diffpy.structure; print(diffpy.structure.__version__)"
8787

88-
Another option is to use ``pip`` to download and install the latest release from
88+
The output should print the latest version displayed on the badges above.
89+
90+
If the above does not work, you can use ``pip`` to download and install the latest release from
8991
`Python Package Index <https://pypi.python.org>`_.
9092
To install using ``pip`` into your ``diffpy.structure_env`` environment, type ::
9193

@@ -97,6 +99,11 @@ and run the following ::
9799

98100
pip install .
99101

102+
Getting Started
103+
---------------
104+
105+
You may consult our `online documentation <https://diffpy.github.io/diffpy.structure>`_ for tutorials and API references.
106+
100107
Support and Contribute
101108
----------------------
102109

Diff for: news/recut.rst

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
**Added:**
2+
3+
* Use GitHub Actions to build, release, upload to PyPI
4+
* Added issue template for PyPI/GitHub release
5+
* Include GitHub Issues templates for bug report and feature request
6+
7+
**Changed:**
8+
9+
* <news item>
10+
11+
**Deprecated:**
12+
13+
* <news item>
14+
15+
**Removed:**
16+
17+
* <news item>
18+
19+
**Fixed:**
20+
21+
* Add getting started section and re-arrange install success check instructions
22+
23+
**Security:**
24+
25+
* <news item>

0 commit comments

Comments
 (0)