Skip to content

Commit 511e559

Browse files
authored
Merge pull request #112 from yucongalicechen/recut
recut
2 parents f86de7e + 356242b commit 511e559

File tree

5 files changed

+88
-4
lines changed

5 files changed

+88
-4
lines changed

.github/ISSUE_TEMPLATE/bug_feature.md

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: 16 additions & 0 deletions
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.labpdfproc
14+
secrets:
15+
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
16+
PAT_TOKEN: ${{ secrets.PAT_TOKEN }}

README.rst

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,16 @@ To add "conda-forge" to the conda channels, run the following in a terminal. ::
8383
We want to install our packages in a suitable conda environment.
8484
The following creates and activates a new environment named ``diffpy.labpdfproc_env`` ::
8585

86-
conda create -n diffpy.labpdfproc_env python=3
86+
conda create -n diffpy.labpdfproc_env diffpy.labpdfproc
8787
conda activate diffpy.labpdfproc_env
8888

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

91-
conda install diffpy.labpdfproc
91+
python -c "import diffpy.labpdfproc; print(diffpy.labpdfproc.__version__)"
9292

93-
Another option is to use ``pip`` to download and install the latest release from
93+
The output should print the latest version displayed on the badges above.
94+
95+
If the above does not work, you can use ``pip`` to download and install the latest release from
9496
`Python Package Index <https://pypi.python.org>`_.
9597
To install using ``pip`` into your ``diffpy.labpdfproc_env`` environment, type ::
9698

@@ -123,6 +125,11 @@ Please type ::
123125

124126
for more information on the available options.
125127

128+
Getting Started
129+
---------------
130+
131+
You may consult our `online documentation <https://diffpy.github.io/diffpy.labpdfproc>`_ for tutorials and API references.
132+
126133
Support and Contribute
127134
----------------------
128135

news/recut.rst

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
**Added:**
2+
3+
* redo cookiecutter to add issue templates and update readme
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+
* <news item>
20+
21+
**Security:**
22+
23+
* <news item>

0 commit comments

Comments
 (0)