Skip to content

Commit ad43104

Browse files
authored
Merge pull request #36 from sbillinge/srxconfutils
srxconfutils
2 parents db1b76c + d278a95 commit ad43104

File tree

17 files changed

+40
-1119
lines changed

17 files changed

+40
-1119
lines changed

.github/workflows/build-wheel-release-upload.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ jobs:
1313
project: diffpy.srxplanar
1414
c_extension: false
1515
maintainer_GITHUB_username: sbillinge
16+
run: |
17+
pip install diffpy.srxconfutils
18+
1619
secrets:
1720
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
1821
PAT_TOKEN: ${{ secrets.PAT_TOKEN }}

.github/workflows/matrix-and-codecov-on-merge-to-main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,8 @@ jobs:
1717
project: diffpy.srxplanar
1818
c_extension: false
1919
headless: false
20+
run: |
21+
pip install diffpy.srxconfutils
22+
2023
secrets:
2124
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/tests-on-pr.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@ jobs:
1212
c_extension: false
1313
headless: false
1414
python_version: 3.13
15+
run: |
16+
pip install diffpy.srxconfutils
1517
secrets:
1618
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

docs/source/api/diffpy.confutils.rst

Lines changed: 0 additions & 34 deletions
This file was deleted.

docs/source/api/diffpy.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ diffpy Package
33

44
.. toctree::
55

6-
diffpy.confutils
76
diffpy.srxplanar

news/srxconfutils.rst

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
**Added:**
2+
3+
* <news item>
4+
5+
**Changed:**
6+
7+
* <news item>
8+
9+
**Deprecated:**
10+
11+
* <news item>
12+
13+
**Removed:**
14+
15+
* Remove local clone of srxconfutils and replace with package from pypi
16+
17+
**Fixed:**
18+
19+
* <news item>
20+
21+
**Security:**
22+
23+
* <news item>

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ authors = [
1111
maintainers = [
1212
{ name="Simon Billinge", email="[email protected]" },
1313
]
14-
description = "Distance Printer, calculate the inter atomic distances. Part of xPDFsuite"
14+
description = "Srxplanar processes data from 2D detectors before propagating it to PDFgetX3"
1515
keywords = ['diffpy', 'pdf', 'data interpretation']
1616
readme = "README.rst"
1717
requires-python = ">=3.11, <3.14"

requirements/pip.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ scipy
33
fabio
44
tifffile
55
configparser
6+
diffpy.srxconfutils

src/diffpy/confutils/__init__.py

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)