From 910e5a6786406e88859bcb492e9a616da740d6ef Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Wed, 10 Jul 2024 12:45:53 -0500 Subject: [PATCH 1/7] update to 24.1.2, drop Python 3.7 support --- recipe/meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1bdd56b..4b099d3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,12 +1,12 @@ -{% set version = "24.0" %} +{% set version = "24.1.2" %} package: name: pip version: {{ version }} source: - url: https://pypi.io/packages/source/p/pip/pip-{{ version }}.tar.gz - sha256: ea9bd1a847e8c5774a5777bb398c19e80bcd4e2aa16a4b301b718fe6f593aba2 + url: https://pypi.io/packages/source/p/pip/pip-{{ version }}.tar.gz + sha256: e5458a0b89f2755e0ee8c0c77613fe5273e05f337907874d64f13171a898a7ff build: noarch: python @@ -18,10 +18,10 @@ build: requirements: host: - - python >=3.7 + - python >=3.8 - setuptools run: - - python >=3.7 + - python >=3.8 - setuptools - wheel From 0f5b1e281774c64d77a1f0b1da4338f7401b7107 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Wed, 10 Jul 2024 12:46:17 -0500 Subject: [PATCH 2/7] use pip to install itself --- recipe/bld.bat | 3 ++- recipe/build.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 9d32a8c..4c13d50 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,4 +1,5 @@ -%PYTHON% setup.py install --single-version-externally-managed --record record.txt +set PYTHONPATH=".\src" +%PYTHON% -m pip install . --no-deps --no-build-isolation -vv if errorlevel 1 exit 1 cd %SCRIPTS% diff --git a/recipe/build.sh b/recipe/build.sh index c47f478..174dd3c 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -1,6 +1,7 @@ #!/bin/bash -$PYTHON setup.py install --single-version-externally-managed --record record.txt +# use the pip source to install itself +PYTHONPATH="./src" $PYTHON -m pip install . --no-deps --no-build-isolation -vv cd $PREFIX/bin rm -f pip2* pip3* From 81f1c137f1d794961d05cb022e4df11f642c724d Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Wed, 10 Jul 2024 12:49:39 -0500 Subject: [PATCH 3/7] add wheel as build dependency --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4b099d3..c2939a7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -20,6 +20,7 @@ requirements: host: - python >=3.8 - setuptools + - wheel run: - python >=3.8 - setuptools From 4bd378cab3051cbd4b96b48ec141afe9266f0af0 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Wed, 10 Jul 2024 12:51:01 -0500 Subject: [PATCH 4/7] remove setuptools and wheel from run requirements setuptools and wheel are only required to build the package, not at run time. --- recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c2939a7..343daae 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,8 +23,6 @@ requirements: - wheel run: - python >=3.8 - - setuptools - - wheel test: commands: From ff6ce49317da8eb986fddb82ffda8d0daf693e2a Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 18:00:58 +0000 Subject: [PATCH 5/7] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.07.10.17.49.47 --- .azure-pipelines/azure-pipelines-linux.yml | 1 + .ci_support/linux_64_.yaml | 2 +- .gitattributes | 4 ++-- .scripts/build_steps.sh | 13 ++++++++++--- build-locally.py | 5 +++-- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index abcbeb9..875d996 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -13,6 +13,7 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 6c59082..82f2873 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,5 +1,5 @@ cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index f017291..97dc8d9 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -65,10 +65,17 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/build-locally.py b/build-locally.py index 3f4b7a7..e0d408d 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From 847b68d6669e6b7609babd36bff2204e6f54d95f Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Tue, 30 Jul 2024 17:11:43 -0500 Subject: [PATCH 6/7] align tabs --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 343daae..32a394c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -5,8 +5,8 @@ package: version: {{ version }} source: - url: https://pypi.io/packages/source/p/pip/pip-{{ version }}.tar.gz - sha256: e5458a0b89f2755e0ee8c0c77613fe5273e05f337907874d64f13171a898a7ff + url: https://pypi.io/packages/source/p/pip/pip-{{ version }}.tar.gz + sha256: e5458a0b89f2755e0ee8c0c77613fe5273e05f337907874d64f13171a898a7ff build: noarch: python From d3395c3103f49d748d4ec79ab4bb2aa793a3d947 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 31 Jul 2024 00:04:14 -0700 Subject: [PATCH 7/7] Drop `pip` flags (as conda-build sets these) --- recipe/bld.bat | 2 +- recipe/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 4c13d50..c84fefe 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,5 +1,5 @@ set PYTHONPATH=".\src" -%PYTHON% -m pip install . --no-deps --no-build-isolation -vv +%PYTHON% -m pip install . -vv if errorlevel 1 exit 1 cd %SCRIPTS% diff --git a/recipe/build.sh b/recipe/build.sh index 174dd3c..d3094d2 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -1,7 +1,7 @@ #!/bin/bash # use the pip source to install itself -PYTHONPATH="./src" $PYTHON -m pip install . --no-deps --no-build-isolation -vv +PYTHONPATH="./src" $PYTHON -m pip install . -vv cd $PREFIX/bin rm -f pip2* pip3*