Skip to content

Commit cd71934

Browse files
committed
pr test workaround + add news
1 parent 16cc1d0 commit cd71934

File tree

12 files changed

+56
-10
lines changed

12 files changed

+56
-10
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,8 @@ jobs:
1111
project: diffpy.cmi
1212
c_extension: false
1313
headless: false
14+
run: |
15+
echo "Running tests for diffpy.cmi"
16+
cmi install _tests
1417
secrets:
1518
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

news/cmi.rst

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
**Added:**
2+
3+
* Add modules ``cli``, ``conda``, ``installer``, ``log``, ``packsmanager``, ``profilesmanager``.
4+
* Add cmi cli commands for managing/installing profiles and packs; example and manual commands.
5+
* Add `diffpy-srreal` script for script installation demonstration.
6+
* Add `all.yml` for profile installation demonstration.
7+
* Add `_tests.yml` profile for profile post-steps demonstration.
8+
9+
**Changed:**
10+
11+
* Update names to skpkg standard.
12+
* Change requirements dir for packs and profiles management.
13+
14+
**Deprecated:**
15+
16+
* <news item>
17+
18+
**Removed:**
19+
20+
* <news item>
21+
22+
**Fixed:**
23+
24+
* <news item>
25+
26+
**Security:**
27+
28+
* <news item>

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ exclude = [] # exclude packages matching these glob patterns (empty by default)
4949
namespaces = false # to disable scanning PEP 420 namespaces (true by default)
5050

5151
[project.scripts]
52-
# diffpy-cmi = "diffpy.cmi.apps.cmi:main"
5352
cmi = "diffpy.cmi.cli:main"
5453

5554
[tool.setuptools.dynamic]

requirements/conda.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# temporary before updating skpkg release-scripts
2+
packaging
3+
PyYAML
4+
diffpy.utils
5+
diffpy.srfit
6+
diffpy.structure

requirements/packs/scripts/_pytest.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
# Usage:
3-
# ./run-remote-tests.sh urls.txt
4-
# ./run-remote-tests.sh https://host/a.tar.gz https://host/b.tgz
3+
# ./_pytest.sh urls.txt
4+
# ./_pytest.sh https://host/a.tar.gz https://host/b.tgz
55
# From ChatGPT
66

77
set -euo pipefail
@@ -26,7 +26,7 @@ cd "$TMPROOT"
2626
overall_ec=0
2727
i=0
2828
for url in "${URLS[@]}"; do
29-
((i++))
29+
((++i))
3030
echo -e "\n==> [$i] $url"
3131

3232
tarball="$(mktemp -p "$TMPROOT" "dl_${i}.XXXXXX.tar.gz")"

requirements/tests.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# temporary before updating skpkg release-scripts
2+
flake8
3+
pytest
4+
codecov
5+
coverage
6+
pytest-cov
7+
pytest-env
8+
pytest-mock
9+
freezegun
10+
DeepDiff

src/diffpy/cmi/cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# (c) 2025 The Trustees of Columbia University in the City of New York.
55
# All rights reserved.
66
#
7-
# File coded by: Simon Billinge and members of the Billinge Group.
7+
# File coded by: Tieqiong Zhang and members of the Billinge Group.
88
#
99
# See GitHub contributions for a more detailed list of contributors.
1010
# https://github.com/diffpy/diffpy.cmi/graphs/contributors

src/diffpy/cmi/conda.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# (c) 2025 The Trustees of Columbia University in the City of New York.
55
# All rights reserved.
66
#
7-
# File coded by: Simon Billinge and members of the Billinge Group.
7+
# File coded by: Tieqiong Zhang and members of the Billinge Group.
88
#
99
# See GitHub contributions for a more detailed list of contributors.
1010
# https://github.com/diffpy/diffpy.cmi/graphs/contributors

src/diffpy/cmi/installer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# (c) 2025 The Trustees of Columbia University in the City of New York.
55
# All rights reserved.
66
#
7-
# File coded by: Simon Billinge and members of the Billinge Group.
7+
# File coded by: Tieqiong Zhang and members of the Billinge Group.
88
#
99
# See GitHub contributions for a more detailed list of contributors.
1010
# https://github.com/diffpy/diffpy.cmi/graphs/contributors

src/diffpy/cmi/log.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# (c) 2025 The Trustees of Columbia University in the City of New York.
55
# All rights reserved.
66
#
7-
# File coded by: Simon Billinge and members of the Billinge Group.
7+
# File coded by: Tieqiong Zhang and members of the Billinge Group.
88
#
99
# See GitHub contributions for a more detailed list of contributors.
1010
# https://github.com/diffpy/diffpy.cmi/graphs/contributors

0 commit comments

Comments
 (0)