Skip to content

Commit

Permalink
Merge pull request #140 from Sparks29032/recut
Browse files Browse the repository at this point in the history
Re-cut
  • Loading branch information
sbillinge authored Oct 25, 2024
2 parents f2bfb4f + 82b9b8a commit ae13f37
Show file tree
Hide file tree
Showing 5 changed files with 89 additions and 4 deletions.
16 changes: 16 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_feature.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
name: Bug Report or Feature Request
about: Report a bug or suggest a new feature!
title: ""
labels: ""
assignees: ""
---

### Problem

<!--
For a bug report, please copy and paste any error messages from the application or command-line here.
For a feature request, please state how the new functionality could benefit the community.
-->

### Proposed solution
22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE/release_checklist.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
name: Release
about: Checklist and communication channel for PyPI and GitHub release
title: "Ready for <version-number> PyPI/GitHub release"
labels: "release"
assignees: ""
---

### Release checklist for GitHub contributors

- [ ] All PRs/issues attached to the release are merged.
- [ ] All the badges on the README are passing.
- [ ] License information is verified as correct. If you are unsure, please comment below.
- [ ] Locally rendered documentation contains all appropriate pages, including API references (check no modules are
missing), tutorials, and other human written text is up-to-date with any changes in the code.
- [ ] Installation instructions in the README, documentation and on the website (e.g., diffpy.org) are updated and
tested
- [ ] Successfully run any tutorial examples or do functional testing in some other way.
- [ ] Grammar and writing quality have been checked (no typos).

Please mention @sbillinge when you are ready for release. Include any additional comments necessary, such as
version information and details about the pre-release.
16 changes: 16 additions & 0 deletions .github/workflows/build-wheel-release-upload.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Release (GitHub/PyPI)

on:
workflow_dispatch:
push:
tags:
- '*' # Trigger on all tags initially, but tag and release privilege are verified in _build-wheel-release-upload.yml

jobs:
release:
uses: Billingegroup/release-scripts/.github/workflows/_build-wheel-release-upload.yml@v0
with:
project: diffpy.pdfmorph
secrets:
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
PAT_TOKEN: ${{ secrets.PAT_TOKEN }}
15 changes: 11 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,16 @@ To add "conda-forge" to the conda channels, run the following in a terminal. ::
We want to install our packages in a suitable conda environment.
The following creates and activates a new environment named ``diffpy.pdfmorph_env`` ::

conda create -n diffpy.pdfmorph_env python=3
conda create -n diffpy.pdfmorph_env diffpy.pdfmorph
conda activate diffpy.pdfmorph_env

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

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

Another option is to use ``pip`` to download and install the latest release from
The output should print the latest version displayed on the badges above.

If the above does not work, you can use ``pip`` to download and install the latest release from
`Python Package Index <https://pypi.python.org>`_.
To install using ``pip`` into your ``diffpy.pdfmorph_env`` environment, we will also have to install dependencies ::

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

pip install .

Getting Started
---------------

You may consult our `online documentation <https://diffpy.github.io/diffpy.pdfmorph>`_ for tutorials and API references.

USING PDFmorph
------------------------------------------------------------------------

Expand Down
24 changes: 24 additions & 0 deletions news/re-cut.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
**Added:**

* Add GitHub action to build wheel, release, upload.
* Add issue and bug report templates.

**Changed:**

* README file installation instructions updated.

**Deprecated:**

* <news item>

**Removed:**

* <news item>

**Fixed:**

* <news item>

**Security:**

* <news item>

0 comments on commit ae13f37

Please sign in to comment.