Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
37b32db
Move tests dir to top level
bobleesj Sep 7, 2024
fa20e3d
Implement test helper as fixture
bobleesj Sep 7, 2024
a36af71
Remove unittest run files
bobleesj Sep 7, 2024
ccce7f2
Remove content of pytest.ini
bobleesj Sep 7, 2024
cc5305d
Run init files for unittest
bobleesj Sep 7, 2024
2d5e571
Use conftest within unittesT
bobleesj Sep 7, 2024
19a7da8
[pre-commit.ci] auto fixes from pre-commit hooks
pre-commit-ci[bot] Sep 7, 2024
6b441ad
Merge pull request #96 from bobleesj/move-folder
sbillinge Sep 8, 2024
e0aaad1
Include latest CI files from cookiecutter
bobleesj Sep 8, 2024
567429e
Include empty pip.txt file to satisfy GH CI
bobleesj Sep 8, 2024
163f509
Remove gitarchive, gitattributes
bobleesj Sep 8, 2024
3882fdf
Remove rever, run_tests
bobleesj Sep 8, 2024
e176a37
Apply pre-commit
bobleesj Sep 8, 2024
b1966f1
Use unmodified MANIFEST, pyproject files
bobleesj Sep 8, 2024
f5904fd
[pre-commit.ci] auto fixes from pre-commit hooks
pre-commit-ci[bot] Sep 8, 2024
8db3d9d
Remove unused testhelper.py
bobleesj Sep 8, 2024
775cb4f
Merge
bobleesj Sep 8, 2024
d09a0bd
Merge pull request #97 from bobleesj/CI
sbillinge Sep 12, 2024
bf26372
Trigger CI
bobleesj Sep 12, 2024
b5be453
Merge pull request #98 from bobleesj/remove-old-files
sbillinge Sep 13, 2024
17b1c8b
new workflow files
sbillinge Sep 16, 2024
834736a
adding authors, code of conduct etc.
sbillinge Sep 16, 2024
581d1a8
adding _static
sbillinge Sep 16, 2024
d9afddf
removing deleted files from git
sbillinge Sep 16, 2024
8a29941
[pre-commit.ci] auto fixes from pre-commit hooks
pre-commit-ci[bot] Sep 16, 2024
153f843
finishing the recut
sbillinge Sep 16, 2024
af47408
force a build with readme tweak
sbillinge Sep 16, 2024
b8d458b
fix conftest.py and news
sbillinge Sep 16, 2024
0722b55
Merge pull request #101 from sbillinge/recut
sbillinge Sep 16, 2024
6131f9f
fix matrix-workflow
sbillinge Sep 16, 2024
3a2f520
Merge pull request #102 from sbillinge/workflow
sbillinge Sep 16, 2024
34261a1
Include api doc
bobleesj Sep 16, 2024
c115f18
[pre-commit.ci] auto fixes from pre-commit hooks
pre-commit-ci[bot] Sep 16, 2024
54e8fd8
Merge pull request #103 from bobleesj/doc
sbillinge Sep 16, 2024
49c873e
fix badge name, take 1
sbillinge Sep 16, 2024
983b16b
Merge pull request #104 from sbillinge/ci_badge
sbillinge Sep 16, 2024
655e43e
Change name to CI
bobleesj Sep 16, 2024
9d1f9f1
Merge pull request #105 from bobleesj/patch-1
sbillinge Sep 16, 2024
a995a61
Update CHANGELOG.rst
sbillinge Sep 16, 2024
5a5aa0c
add secrets inherit
Tieqiong Sep 17, 2024
25470fc
Merge pull request #107 from Tieqiong/secrets
sbillinge Sep 17, 2024
0c5f9c5
Add pytest-cov test test.txt dependencies
bobleesj Sep 17, 2024
d4133d8
Merge pull request #108 from bobleesj/patch-1
sbillinge Sep 17, 2024
95dc0f5
Update and rename LICENSE.rst to LICENSE.txt
bobleesj Sep 17, 2024
4c30cc9
Create LICENSE_DANSE.txt
bobleesj Sep 17, 2024
2003404
Update pyproject.toml
bobleesj Sep 17, 2024
d7ea35d
Create cookie.rst news for 3.4.2
bobleesj Sep 17, 2024
053a22d
Remove CHANGELOG 3.4.1 content
bobleesj Sep 17, 2024
a20ee87
Delete LICENSE.txt
bobleesj Sep 17, 2024
291a1bf
Add LICENSE.rst
bobleesj Sep 17, 2024
1195065
[pre-commit.ci] auto fixes from pre-commit hooks
pre-commit-ci[bot] Sep 17, 2024
05a73a0
Update pyproject.toml to free to use but with restrictions
bobleesj Sep 17, 2024
688669a
Merge pull request #109 from bobleesj/patch-2
sbillinge Sep 17, 2024
c0ffe30
Empty build.txt file which is used for C++/C
bobleesj Sep 18, 2024
3e8dd23
Fix arb value to fix warning
bobleesj Sep 18, 2024
b62fddb
Remove patch warning
bobleesj Sep 18, 2024
6e2ed38
Add news
bobleesj Sep 18, 2024
9908bea
adding doc link to readme
sbillinge Sep 18, 2024
7bd6f8d
fix typo in url
sbillinge Sep 18, 2024
e081b10
Merge pull request #113 from sbillinge/doclink
sbillinge Sep 18, 2024
6696c5c
explicitly pass codecov secrets
Tieqiong Sep 18, 2024
12935f8
trim trailing whitespace
sbillinge Sep 18, 2024
1778a98
Merge pull request #114 from Tieqiong/codc
sbillinge Sep 18, 2024
bc1a782
remove mention of installing dependencies from readme
sbillinge Sep 18, 2024
eb131ec
news
sbillinge Sep 18, 2024
ce5da20
Merge pull request #115 from sbillinge/install
sbillinge Sep 18, 2024
20751c8
Update CHANGELOG.rst
sbillinge Sep 18, 2024
5f2d56c
added mention of DO's in README
sbillinge Sep 18, 2024
b6d1ffe
Fix contributors typo
bobleesj Sep 18, 2024
e1c9f85
Merge pull request #117 from bobleesj/patch-2
sbillinge Sep 19, 2024
e763990
Merge pull request #116 from sbillinge/sos
sbillinge Sep 19, 2024
889fac3
Capture the warning behavior
bobleesj Sep 19, 2024
de82a77
Clean up tests for catching error
bobleesj Sep 19, 2024
d65aa57
[pre-commit.ci] auto fixes from pre-commit hooks
pre-commit-ci[bot] Sep 19, 2024
b9b05a5
Shorten comments for test_diffraction_objects
bobleesj Sep 19, 2024
8038e9d
Update setuptools-git-versioning >= 2.0
bobleesj Sep 21, 2024
20d54ab
Create git-version.rst
bobleesj Sep 21, 2024
6dac2fe
Merge pull request #118 from bobleesj/patch-2
sbillinge Sep 21, 2024
53480fa
Add citation to readme
bobleesj Oct 1, 2024
c0fdf28
Merge pull request #119 from bobleesj/patch-2
sbillinge Oct 1, 2024
ccad465
Add pip packages under pip.txt
Oct 4, 2024
6528940
Merge pull request #124 from alisnwu/pip.txt
sbillinge Oct 5, 2024
3aec5a3
Update README
Oct 23, 2024
2fdf24d
Add .github/ISSUE_TEMPLATE
Oct 23, 2024
b2bad36
Add build-wheel-release-upload.yml
Oct 23, 2024
d04a029
Add example_package.rst in api
Oct 23, 2024
27b5737
Add README for requirements
Oct 23, 2024
c241c9c
Add test_version.py
Oct 23, 2024
54170fe
Add news for recut
Oct 23, 2024
3b67d83
Added newline to README
Oct 23, 2024
a9fd906
deleted README.txt
Oct 23, 2024
86813a5
deleted new line
Oct 23, 2024
ce8cdef
deleted example_package.rst in api
Oct 23, 2024
d5d6f17
Merge pull request #127 from alisnwu/recut-release
sbillinge Oct 23, 2024
31f3c03
Setup requirements
bobleesj Oct 25, 2024
e69255a
Set valid q range for test dump function
bobleesj Oct 25, 2024
7b12baf
[pre-commit.ci] auto fixes from pre-commit hooks
pre-commit-ci[bot] Oct 25, 2024
0cb34e2
Pre-commit
bobleesj Oct 25, 2024
859755e
Apply pre-commit
bobleesj Oct 25, 2024
a3c5ea7
Merge branch 'codecov' of https://github.com/bobleesj/diffpy.utils in…
bobleesj Oct 25, 2024
5eedb0d
Merge pull request #112 from bobleesj/codecov
sbillinge Oct 25, 2024
f17b979
update pyproject.toml for python 3.13
Oct 25, 2024
4834db1
update changelog
sbillinge Oct 26, 2024
9f8269c
Merge pull request #135 from alisnwu/python313
sbillinge Oct 26, 2024
ebbb644
update changelog
sbillinge Oct 27, 2024
f3cd7b4
Add commas in keywords in pyproject.toml
bobleesj Oct 27, 2024
fae4cd6
Merge pull request #142 from bobleesj/patch-2
sbillinge Oct 27, 2024
611d219
add xtype=d in dump function
yucongalicechen Nov 4, 2024
e5a6c38
configure codespell at pyproject.toml and pre-commit
Nov 6, 2024
73eb3c2
Merge pull request #152 from alisnwu/codespell
sbillinge Nov 6, 2024
7e25316
add news
yucongalicechen Nov 6, 2024
19d7cc5
Merge pull request #153 from yucongalicechen/dump
sbillinge Nov 6, 2024
fb5cb73
Expect to run PR
bobleesj Nov 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ coverage:
target: auto
if_no_uploads: error
if_not_found: success
if_ci_failed: failure
if_ci_failed: error
paths: '!*/tests/.*'

tests:
Expand Down
2 changes: 2 additions & 0 deletions .codespell/ignore_lines.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
;; Please include filenames and explanations for each ignored line.
;; See https://docs.openverse.org/meta/codespell.html for docs.
11 changes: 11 additions & 0 deletions .codespell/ignore_words.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
;; Please include explanations for each ignored word (lowercase).
;; See https://docs.openverse.org/meta/codespell.html for docs.

;; abbreviation for "materials" often used in a journal title
mater

;; alternative use of socioeconomic
socio-economic

;; Frobenius norm used in np.linalg.norm
fro
29 changes: 5 additions & 24 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -1,32 +1,13 @@
# Configuration of the coverage.py tool for reporting test coverage.

[run]
source =
diffpy.utils
[report]
# RE patterns for lines to be excluded from consideration.
exclude_lines =
## Have to re-enable the standard pragma
pragma: no cover
## Don't complain if tests don't hit defensive assertion code:
raise AssertionError
raise NotImplementedError
^[ ]*assert False

## Don't complain if non-runnable code isn't run:
^[ ]*@unittest.skip\b
^[ ]{4}unittest.main()
if __name__ == .__main__.:
omit =
*/python?.?/*
*/site-packages/nose/*
# ignore _version.py and versioneer.py
.*version.*
*_version.py
# ignore wx directory
*/wx/*


[run]
source =
src/diffpy/utils/
omit =
## exclude debug.py from codecov report
*/tests/debug.py
exclude_lines =
if __name__ == '__main__':
5 changes: 2 additions & 3 deletions .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ exclude =
__pycache__,
build,
dist,
versioneer.py,
doc/manual/source/conf.py
doc/source/conf.py
max-line-length = 115
# Ignore some style 'errors' produced while formatting by 'black' (see link below)
# Ignore some style 'errors' produced while formatting by 'black'
# https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html#labels-why-pycodestyle-warnings
extend-ignore = E203
5 changes: 0 additions & 5 deletions .gitarchive.cfg

This file was deleted.

8 changes: 0 additions & 8 deletions .gitattributes

This file was deleted.

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.utils
secrets:
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
PAT_TOKEN: ${{ secrets.PAT_TOKEN }}
12 changes: 12 additions & 0 deletions .github/workflows/check-news-item.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: Check for News

on:
pull_request_target:
branches:
- main

jobs:
check-news-item:
uses: Billingegroup/release-scripts/.github/workflows/_check-news-item.yml@v0
with:
project: diffpy.utils
43 changes: 0 additions & 43 deletions .github/workflows/docs.yml

This file was deleted.

55 changes: 0 additions & 55 deletions .github/workflows/main.yml

This file was deleted.

21 changes: 21 additions & 0 deletions .github/workflows/matrix-and-codecov-on-merge-to-main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: CI

on:
push:
branches:
- main
release:
types:
- prereleased
- published
workflow_dispatch:

jobs:
CI:
uses: Billingegroup/release-scripts/.github/workflows/_matrix-and-codecov-on-merge-to-main.yml@v0
with:
project: diffpy.utils
c_extension: false
headless: false
secrets:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
14 changes: 14 additions & 0 deletions .github/workflows/publish-docs-on-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Build and Deploy Docs

on:
release:
types:
- published
workflow_dispatch:

jobs:
publish-docs-on-release:
uses: Billingegroup/release-scripts/.github/workflows/_publish-docs-on-release.yml@v0
with:
project: diffpy.utils
c_extension: false
16 changes: 16 additions & 0 deletions .github/workflows/tests-on-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Tests on PR

on:
push:
branches:
- main
pull_request:
workflow_dispatch:

jobs:
tests-on-pr:
uses: Billingegroup/release-scripts/.github/workflows/_tests-on-pr.yml@v0
with:
project: diffpy.utils
c_extension: false
headless: false
Loading