From cd6e8ce7a6ae23d4a25deb2b1954394d92bbb68c Mon Sep 17 00:00:00 2001 From: Sparks29032 Date: Thu, 18 Dec 2025 14:33:46 -0800 Subject: [PATCH 1/4] 0.3.0 --- recipe/meta.yaml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d92a35e..0d6e0d6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,18 +1,18 @@ +{% set name = "diffpy.morph" %} +{% set version = "0.3.0" %} {% set python_min = "3.11" %} -{%- set name = "diffpy.morph" -%} -{%- set version = "0.2.0" -%} package: - name: {{ name }} + name: {{ name|lower }} version: {{ version }} source: - url: https://pypi.org/packages/source/d/diffpy_morph/diffpy_morph-{{ version }}.tar.gz - sha256: fe3741623877907f2d5b002b36c0bb3086493008f9e97a40509023165ab9af38 + url: https://pypi.org/packages/source/d/diffpy_morph/diffpy_morph-0.3.0.tar.gz + sha256: 8c834836f9a3072c0489e9930e3fcfc34dd2b6934f6dd9801bdfdcddb2299307 build: noarch: python - number: 2 + number: 0 script: {{ PYTHON }} -m pip install --no-deps --ignore-installed . entry_points: - diffpy.morph = diffpy.morph.morphapp:main @@ -54,9 +54,7 @@ about: license_family: BSD license_file: LICENSE.rst description: | - diffpy.morph is a Python software package designed to increase the insight researchers can obtain from comparing 1D signals/functions in a model-independent way. - The program finds the best 'morphs' (e.g. x/y-axis scaling, shifting, Gaussian smearing) to apply to transform one signal to another target signal. - The program was originally designed to help researchers determine whether a phase transition has occurred across two spectral data measured at different temperatures. + diffpy.morph is a Python software package designed to increase the insight researchers can obtain from comparing 1D signals/functions in a model-independent way. The program finds the best 'morphs' (e.g. x/y-axis scaling, shifting, Gaussian smearing) to apply to transform one signal to another target signal. The program was originally designed to help researchers determine whether a phase transition has occurred across two spectral data measured at different temperatures. doc_url: http://diffpy.github.io/diffpy.morph/ dev_url: https://github.com/diffpy/diffpy.morph/ From 49e1d87ec00d1027ab9197385a9f9dc3f88d98b5 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 18 Dec 2025 22:38:19 +0000 Subject: [PATCH 2/4] MNT: Re-rendered with conda-smithy 3.54.1 and conda-forge-pinning 2025.12.18.10.59.2 --- .ci_support/linux_64_.yaml | 2 -- README.md | 10 ++++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 853af99..04f0b1b 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,5 +1,3 @@ -cdt_name: -- conda channel_sources: - conda-forge channel_targets: diff --git a/README.md b/README.md index 5161682..f9b33df 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,7 @@ Development: https://github.com/diffpy/diffpy.morph/ Documentation: http://diffpy.github.io/diffpy.morph/ -diffpy.morph is a Python software package designed to increase the insight researchers can obtain from comparing 1D signals/functions in a model-independent way. -The program finds the best 'morphs' (e.g. x/y-axis scaling, shifting, Gaussian smearing) to apply to transform one signal to another target signal. -The program was originally designed to help researchers determine whether a phase transition has occurred across two spectral data measured at different temperatures. +diffpy.morph is a Python software package designed to increase the insight researchers can obtain from comparing 1D signals/functions in a model-independent way. The program finds the best 'morphs' (e.g. x/y-axis scaling, shifting, Gaussian smearing) to apply to transform one signal to another target signal. The program was originally designed to help researchers determine whether a phase transition has occurred across two spectral data measured at different temperatures. Current build status @@ -107,12 +105,12 @@ it is possible to build and upload installable packages to the [conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. -To manage the continuous integration and simplify feedstock maintenance +To manage the continuous integration and simplify feedstock maintenance, [conda-smithy](https://github.com/conda-forge/conda-smithy) has been developed. Using the ``conda-forge.yml`` within this repository, it is possible to re-render all of this feedstock's supporting files (e.g. the CI configuration files) with ``conda smithy rerender``. -For more information please check the [conda-forge documentation](https://conda-forge.org/docs/). +For more information, please check the [conda-forge documentation](https://conda-forge.org/docs/). Terminology =========== @@ -139,7 +137,7 @@ merged, the recipe will be re-built and uploaded automatically to the everybody to install and use from the `conda-forge` channel. Note that all branches in the conda-forge/diffpy.morph-feedstock are immediately built and any created packages are uploaded, so PRs should be based -on branches in forks and branches in the main repository should only be used to +on branches in forks, and branches in the main repository should only be used to build distinct package versions. In order to produce a uniquely identifiable distribution: From d1ccbcfd52e00e1cf036aa8c8f59162139db5fd3 Mon Sep 17 00:00:00 2001 From: Sparks29032 Date: Thu, 18 Dec 2025 17:52:22 -0800 Subject: [PATCH 3/4] Dynamic versioning --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0d6e0d6..74c8f02 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -7,7 +7,7 @@ package: version: {{ version }} source: - url: https://pypi.org/packages/source/d/diffpy_morph/diffpy_morph-0.3.0.tar.gz + url: https://pypi.org/packages/source/d/diffpy_morph/diffpy_morph-{{ version }}.tar.gz sha256: 8c834836f9a3072c0489e9930e3fcfc34dd2b6934f6dd9801bdfdcddb2299307 build: From c1e9b33c741f677bbe7d0e8eedf03c4dba608181 Mon Sep 17 00:00:00 2001 From: Sparky <59151395+Sparks29032@users.noreply.github.com> Date: Thu, 18 Dec 2025 19:42:39 -0800 Subject: [PATCH 4/4] Bump version to 0.3.1 and update SHA256 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 74c8f02..7fc3b92 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "diffpy.morph" %} -{% set version = "0.3.0" %} +{% set version = "0.3.1" %} {% set python_min = "3.11" %} package: @@ -8,7 +8,7 @@ package: source: url: https://pypi.org/packages/source/d/diffpy_morph/diffpy_morph-{{ version }}.tar.gz - sha256: 8c834836f9a3072c0489e9930e3fcfc34dd2b6934f6dd9801bdfdcddb2299307 + sha256: 91dba06071b8195e936e5fb7e17ae44b1dcd69f3229fbdb805cda2f5575c5f38 build: noarch: python