Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: diffpy/diffpy.morph
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.1.3
Choose a base ref
...
head repository: diffpy/diffpy.morph
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Loading
Showing with 2,752 additions and 1,504 deletions.
  1. +11 −31 .codecov.yml
  2. +2 −0 .codespell/ignore_lines.txt
  3. +14 −0 .codespell/ignore_words.txt
  4. +0 −13 .coveragerc
  5. +1 −1 .flake8
  6. +0 −1 .gitattributes
  7. +20 −7 .github/ISSUE_TEMPLATE/release_checklist.md
  8. +4 −2 .github/workflows/build-wheel-release-upload.yml
  9. +2 −2 .github/workflows/check-news-item.yml
  10. +2 −2 .github/workflows/matrix-and-codecov-on-merge-to-main.yml
  11. +0 −14 .github/workflows/publish-docs-on-release.yml
  12. +4 −2 .github/workflows/tests-on-pr.yml
  13. +1 −1 .isort.cfg
  14. +6 −0 .pre-commit-config.yaml
  15. +2 −2 AUTHORS.rst
  16. +17 −0 CHANGELOG.rst
  17. +50 −50 README.rst
  18. +31 −31 TUTORIAL.rst
  19. +1 −1 doc/Makefile
  20. +1 −1 doc/manual/acknowledgements.texinfo
  21. BIN doc/manual/pdfmorph.pdf
  22. +29 −29 doc/manual/pdfmorph.texinfo
  23. +28 −0 doc/source/api/diffpy.morph.morph_helpers.rst
  24. +92 −0 doc/source/api/diffpy.morph.morphs.rst
  25. +77 −0 doc/source/api/diffpy.morph.rst
  26. +0 −28 doc/source/api/diffpy.pdfmorph.morph_helpers.rst
  27. +0 −92 doc/source/api/diffpy.pdfmorph.morphs.rst
  28. +0 −77 doc/source/api/diffpy.pdfmorph.rst
  29. +23 −9 doc/source/conf.py
  30. BIN doc/source/images/ex_tutorial_bar.png
  31. BIN doc/source/images/ex_tutorial_temp.png
  32. BIN doc/source/images/qs_tutorial_morphed.png
  33. BIN doc/source/images/qs_tutorial_scaled.png
  34. BIN doc/source/images/qs_tutorial_unmorphed.png
  35. +16 −17 doc/source/index.rst
  36. +200 −94 doc/source/quickstart.rst
  37. +1 −1 environment.yml
  38. +3 −3 news/{re-cut.rst → codecov.rst}
  39. +23 −0 news/data_temperature.rst
  40. +23 −0 news/diffpy_morph.rst
  41. +23 −0 news/explicit_paths.rst
  42. +1 −1 news/{error_fixes.rst → line79.rst}
  43. +23 −0 news/morphshift.rst
  44. +23 −0 news/morphsqueeze.rst
  45. +23 −0 news/multiple_morphs.rst
  46. +23 −0 news/new_parser_api.rst
  47. +23 −0 news/py313.rst
  48. +23 −0 news/rm_texinfo.rst
  49. +14 −9 pyproject.toml
  50. +0 −11 requirements/README.txt
  51. +1 −1 src/diffpy/__init__.py
  52. +2 −2 src/diffpy/{pdfmorph → morph}/__init__.py
  53. +3 −3 src/diffpy/{pdfmorph → morph}/log.py
  54. +32 −20 src/diffpy/{pdfmorph/pdfmorph_api.py → morph/morph_api.py}
  55. +5 −4 src/diffpy/{pdfmorph → morph}/morph_helpers/__init__.py
  56. +5 −3 src/diffpy/{pdfmorph → morph}/morph_helpers/transformpdftordf.py
  57. +8 −4 src/diffpy/{pdfmorph → morph}/morph_helpers/transformrdftopdf.py
  58. +107 −40 src/diffpy/{pdfmorph/pdfmorph_io.py → morph/morph_io.py}
  59. +1,016 −0 src/diffpy/morph/morphapp.py
  60. +11 −11 src/diffpy/{pdfmorph → morph}/morphs/__init__.py
  61. +15 −8 src/diffpy/{pdfmorph → morph}/morphs/morph.py
  62. +51 −19 src/diffpy/{pdfmorph → morph}/morphs/morphchain.py
  63. +3 −3 src/diffpy/{pdfmorph → morph}/morphs/morphishape.py
  64. +2 −2 src/diffpy/{pdfmorph → morph}/morphs/morphresolution.py
  65. +19 −9 src/diffpy/{pdfmorph → morph}/morphs/morphrgrid.py
  66. +2 −2 src/diffpy/{pdfmorph → morph}/morphs/morphscale.py
  67. +11 −23 src/diffpy/{pdfmorph → morph}/morphs/morphshape.py
  68. +13 −4 src/diffpy/{pdfmorph → morph}/morphs/morphshift.py
  69. +2 −2 src/diffpy/{pdfmorph → morph}/morphs/morphsmear.py
  70. +74 −0 src/diffpy/morph/morphs/morphsqueeze.py
  71. +2 −2 src/diffpy/{pdfmorph → morph}/morphs/morphstretch.py
  72. +39 −20 src/diffpy/{pdfmorph → morph}/pdfplot.py
  73. +14 −7 src/diffpy/{pdfmorph → morph}/refine.py
  74. +42 −23 src/diffpy/{pdfmorph → morph}/tools.py
  75. +1 −1 src/diffpy/{pdfmorph → morph}/version.py
  76. +0 −643 src/diffpy/pdfmorph/pdfmorphapp.py
  77. +1 −1 tests/debug.py
  78. +2 −2 tests/run.py
  79. +6 −6 tests/test_morph_func.py
  80. +88 −26 tests/{test_pdfmorphapp.py → test_morphapp.py}
  81. +6 −4 tests/test_morphchain.py
  82. +12 −6 tests/{test_pdfmorphio.py → test_morphio.py}
  83. +12 −4 tests/test_morphpdftordf.py
  84. +4 −2 tests/test_morphrdftopdf.py
  85. +4 −2 tests/test_morphresolution.py
  86. +13 −5 tests/test_morphrgrid.py
  87. +4 −2 tests/test_morphscale.py
  88. +20 −8 tests/test_morphshape.py
  89. +54 −0 tests/test_morphshift.py
  90. +7 −3 tests/test_morphsmear.py
  91. +86 −0 tests/test_morphsqueeze.py
  92. +7 −3 tests/test_morphstretch.py
  93. +2 −2 tests/test_pdfplot.py
  94. +22 −12 tests/test_refine.py
  95. +23 −8 tests/test_tools.py
  96. +5 −4 tests/test_version.py
  97. +3 −1 tests/testdata/testsaving/succinct/Morph_Reference_Table.txt
  98. +1 −1 tests/testdata/testsaving/succinct/Morphs/mwt_a.cgr
  99. +1 −1 tests/testdata/testsaving/succinct/Morphs/mwt_b.cgr
  100. +1 −1 tests/testdata/testsaving/succinct/Morphs/mwt_c.cgr
  101. +1 −1 tests/testdata/testsaving/succinct/Morphs/mwt_d.cgr
  102. +1 −1 tests/testdata/testsaving/succinct/Morphs/mwt_e.cgr
  103. +1 −1 tests/testdata/testsaving/succinct/Morphs/mwt_f.cgr
  104. +1 −1 tests/testdata/testsaving/succinct/single_succinct_morph.cgr
  105. +3 −1 tests/testdata/testsaving/verbose/Morph_Reference_Table.txt
  106. +3 −1 tests/testdata/testsaving/verbose/Morphs/mwt_a.cgr
  107. +3 −1 tests/testdata/testsaving/verbose/Morphs/mwt_b.cgr
  108. +3 −1 tests/testdata/testsaving/verbose/Morphs/mwt_c.cgr
  109. +3 −1 tests/testdata/testsaving/verbose/Morphs/mwt_d.cgr
  110. +3 −1 tests/testdata/testsaving/verbose/Morphs/mwt_e.cgr
  111. +3 −1 tests/testdata/testsaving/verbose/Morphs/mwt_f.cgr
  112. +3 −1 tests/testdata/testsaving/verbose/single_verbose_morph.cgr
  113. BIN tutorial/PDFmorph_manual.pdf
  114. BIN tutorial/additionalData.zip
  115. BIN tutorial/diffpy.morph_manual.pdf
42 changes: 11 additions & 31 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,14 @@
# codecov can find this file anywhere in the repo, so we don't need to clutter
# the root folder.
#comment: false

codecov:
notify:
require_ci_to_pass: no

coverage:
status:
patch:
project: # more options at https://docs.codecov.com/docs/commit-status
default:
target: '70'
if_no_uploads: error
if_not_found: success
if_ci_failed: failure
project:
default: false
library:
target: auto
if_no_uploads: error
if_not_found: success
if_ci_failed: error
paths: '!*/tests/.*'

tests:
target: 97.9%
paths: '*/tests/.*'
if_not_found: success

flags:
tests:
paths:
- tests/
target: auto # use the coverage from the base commit, fail if coverage is lower
threshold: 0% # allow the coverage to drop by

comment:
layout: " diff, flags, files"
behavior: default
require_changes: false
require_base: false # [true :: must have a base report to post]
require_head: false # [true :: must have a head report to post]
hide_project_coverage: false # [true :: only show coverage on the git diff aka patch coverage]
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.
14 changes: 14 additions & 0 deletions .codespell/ignore_words.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
;; 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

;; library used for Python package release, no longer used
rever
13 changes: 0 additions & 13 deletions .coveragerc

This file was deleted.

2 changes: 1 addition & 1 deletion .flake8
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ exclude =
build,
dist,
doc/source/conf.py
max-line-length = 115
max-line-length = 79
# 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
1 change: 0 additions & 1 deletion .gitattributes

This file was deleted.

27 changes: 20 additions & 7 deletions .github/ISSUE_TEMPLATE/release_checklist.md
Original file line number Diff line number Diff line change
@@ -6,17 +6,30 @@ labels: "release"
assignees: ""
---

### Release checklist for GitHub contributors
### PyPI/GitHub release checklist:

- [ ] 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).
- [ ] Installation instructions in the README, documentation and on the website (e.g., diffpy.org) are updated.
- [ ] Successfully run any tutorial examples or do functional testing with the latest Python version.
- [ ] Grammar and writing quality are 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.
Please mention @sbillinge here when you are ready for PyPI/GitHub release. Include any additional comments necessary, such as
version information and details about the pre-release here:

### conda-forge release checklist:

<!-- After @sbillinge releases the PyPI package, please check the following when creating a PR for conda-forge release.-->

- [ ] New package dependencies listed in `conda.txt` and `test.txt` are added to `meta.yaml` in the feedstock.
- [ ] All relevant issues in the feedstock are addressed in the release PR.

### Post-release checklist

<!-- Before closing this issue, please complete the following: -->

- [ ] Run tutorial examples and conduct functional testing using the installation guide in the README. Attach screenshots/results as comments.
- [ ] Documentation (README, tutorials, API references, and websites) is deployed without broken links or missing figures.
6 changes: 4 additions & 2 deletions .github/workflows/build-wheel-release-upload.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Release (GitHub/PyPI)
name: Release (GitHub/PyPI) and Deploy Docs

on:
workflow_dispatch:
@@ -10,7 +10,9 @@ jobs:
release:
uses: Billingegroup/release-scripts/.github/workflows/_build-wheel-release-upload.yml@v0
with:
project: diffpy.pdfmorph
project: diffpy.morph
github_admin_username: sbillinge

secrets:
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
PAT_TOKEN: ${{ secrets.PAT_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/check-news-item.yml
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ on:
- main

jobs:
build:
check-news-item:
uses: Billingegroup/release-scripts/.github/workflows/_check-news-item.yml@v0
with:
project: diffpy.pdfmorph
project: diffpy.morph
4 changes: 2 additions & 2 deletions .github/workflows/matrix-and-codecov-on-merge-to-main.yml
Original file line number Diff line number Diff line change
@@ -11,10 +11,10 @@ on:
workflow_dispatch:

jobs:
coverage:
matrix-coverage:
uses: Billingegroup/release-scripts/.github/workflows/_matrix-and-codecov-on-merge-to-main.yml@v0
with:
project: diffpy.pdfmorph
project: diffpy.morph
c_extension: false
headless: false
secrets:
14 changes: 0 additions & 14 deletions .github/workflows/publish-docs-on-release.yml

This file was deleted.

6 changes: 4 additions & 2 deletions .github/workflows/tests-on-pr.yml
Original file line number Diff line number Diff line change
@@ -8,9 +8,11 @@ on:
workflow_dispatch:

jobs:
validate:
tests-on-pr:
uses: Billingegroup/release-scripts/.github/workflows/_tests-on-pr.yml@v0
with:
project: diffpy.pdfmorph
project: diffpy.morph
c_extension: false
headless: false
secrets:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
2 changes: 1 addition & 1 deletion .isort.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[settings]
line_length = 115
line_length = 79
multi_line_output = 3
include_trailing_comma = True
6 changes: 6 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -44,3 +44,9 @@ repos:
name: Prevent Commit to Main Branch
args: ["--branch", "main"]
stages: [pre-commit]
- repo: https://github.com/codespell-project/codespell
rev: v2.3.0
hooks:
- id: codespell
additional_dependencies:
- tomli
4 changes: 2 additions & 2 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Authors
=======
========

Billinge Group and community contributors.

Contributors
------------

For a list of contributors, visit
https://github.com/diffpy/diffpy.pdfmorph/graphs/contributors
https://github.com/diffpy/diffpy.morph/graphs/contributors
17 changes: 17 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -4,6 +4,23 @@ Release Notes

.. current developments
0.1.3
=====

**Added:**

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

**Changed:**

* README file installation instructions updated.

**Fixed:**

* Mathematical error in manual


0.1.2
=====

Loading