Skip to content

Commit ae13f37

Browse files
authored
Merge pull request #140 from Sparks29032/recut
Re-cut
2 parents f2bfb4f + 82b9b8a commit ae13f37

File tree

5 files changed

+89
-4
lines changed

5 files changed

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

README.rst

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

107-
conda create -n diffpy.pdfmorph_env python=3
107+
conda create -n diffpy.pdfmorph_env diffpy.pdfmorph
108108
conda activate diffpy.pdfmorph_env
109109

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

112-
conda install diffpy.pdfmorph
112+
python -c "import diffpy.pdfmorph; print(diffpy.pdfmorph.__version__)"
113113

114-
Another option is to use ``pip`` to download and install the latest release from
114+
The output should print the latest version displayed on the badges above.
115+
116+
If the above does not work, you can use ``pip`` to download and install the latest release from
115117
`Python Package Index <https://pypi.python.org>`_.
116118
To install using ``pip`` into your ``diffpy.pdfmorph_env`` environment, we will also have to install dependencies ::
117119

@@ -127,6 +129,11 @@ and run the following ::
127129

128130
pip install .
129131

132+
Getting Started
133+
---------------
134+
135+
You may consult our `online documentation <https://diffpy.github.io/diffpy.pdfmorph>`_ for tutorials and API references.
136+
130137
USING PDFmorph
131138
------------------------------------------------------------------------
132139

news/re-cut.rst

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
**Added:**
2+
3+
* Add GitHub action to build wheel, release, upload.
4+
* Add issue and bug report templates.
5+
6+
**Changed:**
7+
8+
* README file installation instructions updated.
9+
10+
**Deprecated:**
11+
12+
* <news item>
13+
14+
**Removed:**
15+
16+
* <news item>
17+
18+
**Fixed:**
19+
20+
* <news item>
21+
22+
**Security:**
23+
24+
* <news item>

0 commit comments

Comments
 (0)