From a2e27c38258569011aa703304a63bd4104a4fa8d Mon Sep 17 00:00:00 2001 From: jaimergp Date: Wed, 29 Mar 2023 09:47:34 +0200 Subject: [PATCH 1/5] avoid bootstrapping issues with different location in SRC_DIR --- conda-forge.yml | 1 - recipe/build.sh | 2 ++ recipe/meta.yaml | 7 ++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index de46f35..c371034 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -12,4 +12,3 @@ provider: test_on_native_only: true conda_build: pkg_format: '2' -remote_ci_setup: ["conda-forge-ci-setup=3", "libsolv<0.7.23"] # https://github.com/conda/conda-build/issues/4750 diff --git a/recipe/build.sh b/recipe/build.sh index 2abfa25..ad97792 100755 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -1,5 +1,7 @@ #!/bin/bash +cd conda-src/ + if [[ "$build_platform" != "$target_platform" && -z "$PYTHONPATH" ]]; then # conda-build special cases conda and doesn't activate it # See https://github.com/conda/conda-build/blob/1010e8309a20e144c51b1d86b2daebd146be923e/conda_build/metadata.py#L2273 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 79e132d..3a05c8c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,11 +14,12 @@ source: fn: conda-{{ version }}.tar.gz url: https://github.com/conda/{{ name }}/archive/{{ version }}.tar.gz sha256: {{ sha256 }} + folder: conda-src # avoid bootstrapping issues patches: - patches/01-deprecations-version-fallback.patch build: - number: 0 + number: 1 # These are present when the new environment is created # so we have to exempt them from the list of initial files # for conda-build to realize they should be included. @@ -73,8 +74,8 @@ requirements: test: {% if run_pytest == 'yes' %} source_files: - - tests - - setup.cfg + - conda-src/tests + - conda-src/setup.cfg {% endif %} requires: - mock From c62953e96264b15dd2f4a1a00935cd2fd7934704 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 29 Mar 2023 07:50:19 +0000 Subject: [PATCH 2/5] MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.03.28.22.53.26 --- .azure-pipelines/azure-pipelines-win.yml | 2 +- .github/CODEOWNERS | 2 +- .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 4 ++-- README.md | 2 ++ 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index f8b6d7c..0253afc 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -51,7 +51,7 @@ jobs: - script: | call activate base - mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 "libsolv<0.7.23" -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/.github/CODEOWNERS b/.github/CODEOWNERS index 51fd476..939b3af 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @isuruf @jakirkham @jezdez @mbargull @ocefpaf \ No newline at end of file +* @dbast @isuruf @jakirkham @jezdez @kenodegard @mbargull @ocefpaf \ No newline at end of file diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 1c39993..a6b09f6 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 "libsolv<0.7.23" + 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 "libsolv<0.7.23" + 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 025708f..bb00584 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 "libsolv<0.7.23" + 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 "libsolv<0.7.23" + conda-build pip boa conda-forge-ci-setup=3 diff --git a/README.md b/README.md index 17e7727..bc70e3a 100644 --- a/README.md +++ b/README.md @@ -400,9 +400,11 @@ In order to produce a uniquely identifiable distribution: Feedstock Maintainers ===================== +* [@dbast](https://github.com/dbast/) * [@isuruf](https://github.com/isuruf/) * [@jakirkham](https://github.com/jakirkham/) * [@jezdez](https://github.com/jezdez/) +* [@kenodegard](https://github.com/kenodegard/) * [@mbargull](https://github.com/mbargull/) * [@ocefpaf](https://github.com/ocefpaf/) From 0096d5adcd2c05cb64e7dbb9d98bb191d93b8f34 Mon Sep 17 00:00:00 2001 From: jaimergp Date: Wed, 29 Mar 2023 09:57:05 +0200 Subject: [PATCH 3/5] fix license path --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3a05c8c..bc09fc8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -104,7 +104,7 @@ test: about: home: https://conda.io license: BSD-3-Clause - license_file: LICENSE.txt + license_file: conda-src/LICENSE.txt summary: OS-agnostic, system-level binary package and environment manager. description: > Conda is an open source package management system and environment management system for installing multiple versions of software packages and their dependencies and switching easily between them. It works on Linux, OS X and Windows, and was created for Python programs but can package and distribute any software. From d73d2d85e7e5213f2df0de349b338137bb66cbbf Mon Sep 17 00:00:00 2001 From: jaimergp Date: Wed, 29 Mar 2023 10:08:11 +0200 Subject: [PATCH 4/5] pin libsolv again --- conda-forge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-forge.yml b/conda-forge.yml index c371034..de46f35 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -12,3 +12,4 @@ provider: test_on_native_only: true conda_build: pkg_format: '2' +remote_ci_setup: ["conda-forge-ci-setup=3", "libsolv<0.7.23"] # https://github.com/conda/conda-build/issues/4750 From ad73550ab78d5520f9e1593985081ba8dbc0d3b2 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 29 Mar 2023 08:10:17 +0000 Subject: [PATCH 5/5] MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.03.28.22.53.26 --- .azure-pipelines/azure-pipelines-win.yml | 2 +- .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 0253afc..f8b6d7c 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -51,7 +51,7 @@ jobs: - script: | call activate base - mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 "libsolv<0.7.23" -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 a6b09f6..1c39993 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 + conda-build pip boa conda-forge-ci-setup=3 "libsolv<0.7.23" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "libsolv<0.7.23" # 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 bb00584..025708f 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 + conda-build pip boa conda-forge-ci-setup=3 "libsolv<0.7.23" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "libsolv<0.7.23"