From df53754780e4cca101a34fd565503b270ecd8c27 Mon Sep 17 00:00:00 2001 From: Wojciech Potrzebowski Date: Mon, 27 Mar 2023 15:23:24 +0200 Subject: [PATCH 1/6] Update meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8ae602e..48432f0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -43,7 +43,7 @@ requirements: - pyqt >=5.12,<6.0 - qt5reactor - qtconsole - - sasmodels >=1.0.6 + - sasmodels >=1.0.7 - scipy - twisted - uncertainties From 130ce9e785aa71dee979ea1afffdbb39299488b5 Mon Sep 17 00:00:00 2001 From: Wojciech Potrzebowski Date: Mon, 27 Mar 2023 15:29:44 +0200 Subject: [PATCH 2/6] Update meta.yaml --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 48432f0..76fb69a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "sasview" %} -{% set version = "5.0.5" %} +{% set version = "5.0.6" %} package: name: {{ name|lower }} @@ -7,7 +7,7 @@ package: source: url: https://github.com/SasView/{{ name }}/archive/refs/tags/v{{ version }}.tar.gz - sha256: 8c92ecc113cf861f675a4ff5024920e036b58d178fd6e7afb77bd2fac41d5077 + sha256: 69a86982bca8a0430b1defeae751a82185847fda build: number: 4 From 1938ba2dcd39ed6676828eccdc54ef5a9e458369 Mon Sep 17 00:00:00 2001 From: Wojciech Potrzebowski Date: Mon, 27 Mar 2023 20:29:25 +0200 Subject: [PATCH 3/6] Update meta.yaml --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 76fb69a..af2a0a0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -7,10 +7,10 @@ package: source: url: https://github.com/SasView/{{ name }}/archive/refs/tags/v{{ version }}.tar.gz - sha256: 69a86982bca8a0430b1defeae751a82185847fda + sha256: eedf884afaea5e6b9547aee8f4c10bae846a0f0b08e83a9b50cd71da6b02faa3 build: - number: 4 + number: 0 skip: true # [py<36] entry_points: - sasview = sas.qtgui.MainWindow.MainWindow:run_sasview From 76f8153c7f6e9859d6071767125cfee74760abfd Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Mon, 27 Mar 2023 19:20:49 +0000 Subject: [PATCH 4/6] MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.03.27.13.29.23 --- .azure-pipelines/azure-pipelines-win.yml | 4 ++-- .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 4 ++-- README.md | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 81af0f7..045cb04 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: windows-2019 + vmImage: windows-2022 strategy: matrix: win_64_python3.10.____cpython: @@ -42,7 +42,7 @@ jobs: - script: | call activate base - mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 6e39953..0c3e29a 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index caa788e..f169576 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -24,9 +24,9 @@ source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 diff --git a/README.md b/README.md index ee4893d..e8c2760 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About sasview -============= +About sasview-feedstock +======================= + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/sasview-feedstock/blob/main/LICENSE.txt) Home: https://github.com/SasView/sasview Package license: BSD-3-Clause -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/sasview-feedstock/blob/main/LICENSE.txt) - Summary: SasView is a Small Angle Scattering (SAS) analysis package Current build status From 65d99ce56b6a49a120ef367316f36e1a9411af1d Mon Sep 17 00:00:00 2001 From: Peter Beaucage Date: Mon, 3 Apr 2023 12:27:21 -0400 Subject: [PATCH 5/6] Edit version to match git tag for rc1 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index af2a0a0..2f8d40e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "sasview" %} -{% set version = "5.0.6" %} +{% set version = "5.0.6rc1" %} package: name: {{ name|lower }} From ec1c722281b7cda4e5de36d94e153b46864be930 Mon Sep 17 00:00:00 2001 From: Peter Beaucage Date: Mon, 3 Apr 2023 12:28:30 -0400 Subject: [PATCH 6/6] Remove numpy version pin for 5.0.6 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2f8d40e..d0ed962 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -48,7 +48,7 @@ requirements: - twisted - uncertainties - xhtml2pdf - - {{ pin_compatible('numpy <1.24') }} # Maintainer note: remove this numpy pin when sasview 5.0.6 is released, 5.0.6 and newer patch this issue. + - {{ pin_compatible('numpy') }} test: