From 692243387606137d3be1e748c3142c47ba69e161 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 26 Sep 2023 09:07:01 +0000 Subject: [PATCH 1/2] Rebuild for python312 --- .ci_support/migrations/python312.yaml | 42 +++++++++++++++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/python312.yaml diff --git a/.ci_support/migrations/python312.yaml b/.ci_support/migrations/python312.yaml new file mode 100644 index 0000000..89749ad --- /dev/null +++ b/.ci_support/migrations/python312.yaml @@ -0,0 +1,42 @@ +migrator_ts: 1695046563 +__migrator: + migration_number: 1 + operation: key_add + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.10.* *_cpython + - 3.11.* *_cpython + - 3.12.* *_cpython # new entry + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + - 3.8.* *_73_pypy + - 3.9.* *_73_pypy + paused: false + longterm: True + pr_limit: 60 + max_solver_attempts: 3 # this will make the bot retry "not solvable" stuff 12 times + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + - cross-python + - python_abi + exclude_pinned_pkgs: false + additional_zip_keys: + - channel_sources + +python: + - 3.12.* *_cpython +channel_sources: + - conda-forge/label/python_rc,conda-forge +# additional entries to add for zip_keys +numpy: + - 1.26 +python_impl: + - cpython diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 49449e9..1c660cc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -26,7 +26,7 @@ source: - patches/0004-do-not-escape-quotes-for-VERSION_INFO.patch build: - number: 2 + number: 3 script: {{ PYTHON }} -m pip install ./python_bindings -vv requirements: From 2593ed5a9fed169a9e2fedc5a9b053615c35733f Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 26 Sep 2023 09:07:15 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.26.2, and conda-forge-pinning 2023.09.26.07.13.00 --- .azure-pipelines/azure-pipelines-linux.yml | 29 ++--- .azure-pipelines/azure-pipelines-osx.yml | 22 ++-- .azure-pipelines/azure-pipelines-win.yml | 75 ++++-------- ...0python3.8.____73_pypypython_implpypy.yaml | 28 ----- ...on3.10.____cpythonpython_implcpython.yaml} | 5 +- ...hon3.8.____cpythonpython_implcpython.yaml} | 5 +- ...python3.9.____73_pypypython_implpypy.yaml} | 5 +- ...hon3.9.____cpythonpython_implcpython.yaml} | 5 +- ...hon3.11.____cpythonpython_implcpython.yaml | 3 +- ...hon3.12.____cpythonpython_implcpython.yaml | 29 +++++ .ci_support/migrations/python311.yaml | 37 ------ ...on3.10.____cpythonpython_implcpython.yaml} | 5 +- ...hon3.8.____cpythonpython_implcpython.yaml} | 5 +- ...python3.9.____73_pypypython_implpypy.yaml} | 5 +- ...hon3.9.____cpythonpython_implcpython.yaml} | 5 +- ...hon3.11.____cpythonpython_implcpython.yaml | 3 +- ...on3.12.____cpythonpython_implcpython.yaml} | 11 +- ...on3.10.____cpythonpython_implcpython.yaml} | 3 +- ...hon3.8.____cpythonpython_implcpython.yaml} | 3 +- ...python3.9.____73_pypypython_implpypy.yaml} | 3 +- ...hon3.9.____cpythonpython_implcpython.yaml} | 3 +- ...hon3.11.____cpythonpython_implcpython.yaml | 1 + ...on3.12.____cpythonpython_implcpython.yaml} | 9 +- .circleci/config.yml | 2 +- .scripts/build_steps.sh | 9 +- .scripts/logging_utils.sh | 4 +- .scripts/run_osx_build.sh | 11 +- .scripts/run_win_build.bat | 112 ++++++++++++++++++ README.md | 80 ++++++------- 29 files changed, 285 insertions(+), 232 deletions(-) delete mode 100644 .ci_support/linux_64_numpy1.20python3.8.____73_pypypython_implpypy.yaml rename .ci_support/{linux_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml => linux_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml} (91%) rename .ci_support/{linux_64_numpy1.20python3.8.____cpythonpython_implcpython.yaml => linux_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml} (91%) rename .ci_support/{linux_64_numpy1.20python3.9.____73_pypypython_implpypy.yaml => linux_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml} (91%) rename .ci_support/{linux_64_numpy1.20python3.9.____cpythonpython_implcpython.yaml => linux_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml} (91%) create mode 100644 .ci_support/linux_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml delete mode 100644 .ci_support/migrations/python311.yaml rename .ci_support/{osx_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml => osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml} (91%) rename .ci_support/{osx_64_numpy1.20python3.8.____cpythonpython_implcpython.yaml => osx_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml} (91%) rename .ci_support/{osx_64_numpy1.20python3.9.____73_pypypython_implpypy.yaml => osx_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml} (91%) rename .ci_support/{osx_64_numpy1.20python3.9.____cpythonpython_implcpython.yaml => osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml} (91%) rename .ci_support/{osx_64_numpy1.20python3.8.____73_pypypython_implpypy.yaml => osx_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml} (76%) rename .ci_support/{win_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml => win_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml} (90%) rename .ci_support/{win_64_numpy1.20python3.8.____cpythonpython_implcpython.yaml => win_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml} (90%) rename .ci_support/{win_64_numpy1.20python3.9.____73_pypypython_implpypy.yaml => win_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml} (90%) rename .ci_support/{win_64_numpy1.20python3.9.____cpythonpython_implcpython.yaml => win_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml} (90%) rename .ci_support/{win_64_numpy1.20python3.8.____73_pypypython_implpypy.yaml => win_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml} (70%) create mode 100755 .scripts/run_win_build.bat diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index c4c26d4..7fbde76 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,38 +8,33 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.20python3.8.____73_pypypython_implpypy: - CONFIG: linux_64_numpy1.20python3.8.____73_pypypython_implpypy + linux_64_numpy1.22python3.10.____cpythonpython_implcpython: + CONFIG: linux_64_numpy1.22python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.20python3.8.____cpythonpython_implcpython: - CONFIG: linux_64_numpy1.20python3.8.____cpythonpython_implcpython + linux_64_numpy1.22python3.8.____cpythonpython_implcpython: + CONFIG: linux_64_numpy1.22python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.20python3.9.____73_pypypython_implpypy: - CONFIG: linux_64_numpy1.20python3.9.____73_pypypython_implpypy + linux_64_numpy1.22python3.9.____73_pypypython_implpypy: + CONFIG: linux_64_numpy1.22python3.9.____73_pypypython_implpypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.20python3.9.____cpythonpython_implcpython: - CONFIG: linux_64_numpy1.20python3.9.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.10.____cpythonpython_implcpython: - CONFIG: linux_64_numpy1.21python3.10.____cpythonpython_implcpython + linux_64_numpy1.22python3.9.____cpythonpython_implcpython: + CONFIG: linux_64_numpy1.22python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.23python3.11.____cpythonpython_implcpython: CONFIG: linux_64_numpy1.23python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_numpy1.26python3.12.____cpythonpython_implcpython: + CONFIG: linux_64_numpy1.26python3.12.____cpythonpython_implcpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index aab04dd..aa92b90 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,24 +8,24 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_numpy1.20python3.8.____73_pypypython_implpypy: - CONFIG: osx_64_numpy1.20python3.8.____73_pypypython_implpypy + osx_64_numpy1.22python3.10.____cpythonpython_implcpython: + CONFIG: osx_64_numpy1.22python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.20python3.8.____cpythonpython_implcpython: - CONFIG: osx_64_numpy1.20python3.8.____cpythonpython_implcpython + osx_64_numpy1.22python3.8.____cpythonpython_implcpython: + CONFIG: osx_64_numpy1.22python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.20python3.9.____73_pypypython_implpypy: - CONFIG: osx_64_numpy1.20python3.9.____73_pypypython_implpypy + osx_64_numpy1.22python3.9.____73_pypypython_implpypy: + CONFIG: osx_64_numpy1.22python3.9.____73_pypypython_implpypy UPLOAD_PACKAGES: 'True' - osx_64_numpy1.20python3.9.____cpythonpython_implcpython: - CONFIG: osx_64_numpy1.20python3.9.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.10.____cpythonpython_implcpython: - CONFIG: osx_64_numpy1.21python3.10.____cpythonpython_implcpython + osx_64_numpy1.22python3.9.____cpythonpython_implcpython: + CONFIG: osx_64_numpy1.22python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' osx_64_numpy1.23python3.11.____cpythonpython_implcpython: CONFIG: osx_64_numpy1.23python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' + osx_64_numpy1.26python3.12.____cpythonpython_implcpython: + CONFIG: osx_64_numpy1.26python3.12.____cpythonpython_implcpython + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 5e3836e..fd5ba60 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,32 +5,34 @@ jobs: - job: win pool: - vmImage: windows-2019 + vmImage: windows-2022 strategy: matrix: - win_64_numpy1.20python3.8.____73_pypypython_implpypy: - CONFIG: win_64_numpy1.20python3.8.____73_pypypython_implpypy + win_64_numpy1.22python3.10.____cpythonpython_implcpython: + CONFIG: win_64_numpy1.22python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.20python3.8.____cpythonpython_implcpython: - CONFIG: win_64_numpy1.20python3.8.____cpythonpython_implcpython + win_64_numpy1.22python3.8.____cpythonpython_implcpython: + CONFIG: win_64_numpy1.22python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.20python3.9.____73_pypypython_implpypy: - CONFIG: win_64_numpy1.20python3.9.____73_pypypython_implpypy + win_64_numpy1.22python3.9.____73_pypypython_implpypy: + CONFIG: win_64_numpy1.22python3.9.____73_pypypython_implpypy UPLOAD_PACKAGES: 'True' - win_64_numpy1.20python3.9.____cpythonpython_implcpython: - CONFIG: win_64_numpy1.20python3.9.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.10.____cpythonpython_implcpython: - CONFIG: win_64_numpy1.21python3.10.____cpythonpython_implcpython + win_64_numpy1.22python3.9.____cpythonpython_implcpython: + CONFIG: win_64_numpy1.22python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' win_64_numpy1.23python3.11.____cpythonpython_implcpython: CONFIG: win_64_numpy1.23python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' + win_64_numpy1.26python3.12.____cpythonpython_implcpython: + CONFIG: win_64_numpy1.26python3.12.____cpythonpython_implcpython + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_TEMP: D:\\tmp steps: + - task: PythonScript@0 displayName: 'Download Miniforge' inputs: @@ -49,49 +51,14 @@ jobs: displayName: Add conda to PATH - script: | - call activate base - mamba.exe install 'python=3.9' 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 - displayName: Set PYTHONUNBUFFERED - - # Configure the VM - - script: | - call activate base - setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml - displayName: conda-forge CI setup - - # Configure the VM. - - script: | - set "CI=azure" - call activate base - run_conda_forge_build_setup - displayName: conda-forge build setup - - - script: | - call activate base - if EXIST LICENSE.txt ( - copy LICENSE.txt "recipe\\recipe-scripts-license.txt" - ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables - displayName: Build recipe + call ".scripts\run_win_build.bat" + displayName: Run Windows build env: PYTHONUNBUFFERED: 1 - - script: | - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - call activate base - validate_recipe_outputs "%FEEDSTOCK_NAME%" - displayName: Validate Recipe Outputs - - - script: | - set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - call activate base - upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml - displayName: Upload package - env: + CONFIG: $(CONFIG) + CI: azure + UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) + UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_numpy1.20python3.8.____73_pypypython_implpypy.yaml b/.ci_support/linux_64_numpy1.20python3.8.____73_pypypython_implpypy.yaml deleted file mode 100644 index 85ab5db..0000000 --- a/.ci_support/linux_64_numpy1.20python3.8.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,28 +0,0 @@ -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -numpy: -- '1.20' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-64 -zip_keys: -- - python - - numpy - - python_impl diff --git a/.ci_support/linux_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml similarity index 91% rename from .ci_support/linux_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml index f6f096f..06713f1 100644 --- a/.ci_support/linux_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml @@ -7,11 +7,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -26,3 +26,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/linux_64_numpy1.20python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml similarity index 91% rename from .ci_support/linux_64_numpy1.20python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml index e6451dd..4afee37 100644 --- a/.ci_support/linux_64_numpy1.20python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml @@ -7,11 +7,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -26,3 +26,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/linux_64_numpy1.20python3.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml similarity index 91% rename from .ci_support/linux_64_numpy1.20python3.9.____73_pypypython_implpypy.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml index 365e9b5..6fa1de2 100644 --- a/.ci_support/linux_64_numpy1.20python3.9.____73_pypypython_implpypy.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml @@ -7,11 +7,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -26,3 +26,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/linux_64_numpy1.20python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml similarity index 91% rename from .ci_support/linux_64_numpy1.20python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml index 3e7e3f6..813ee6d 100644 --- a/.ci_support/linux_64_numpy1.20python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml @@ -7,11 +7,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -26,3 +26,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml index 6e2227b..6a130dc 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: @@ -26,3 +26,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml new file mode 100644 index 0000000..be8d1c6 --- /dev/null +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml @@ -0,0 +1,29 @@ +cdt_name: +- cos6 +channel_sources: +- conda-forge/label/python_rc,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-64 +zip_keys: +- - python + - numpy + - python_impl + - channel_sources diff --git a/.ci_support/migrations/python311.yaml b/.ci_support/migrations/python311.yaml deleted file mode 100644 index e4c79db..0000000 --- a/.ci_support/migrations/python311.yaml +++ /dev/null @@ -1,37 +0,0 @@ -migrator_ts: 1666686085 -__migrator: - migration_number: 1 - operation: key_add - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython - - 3.11.* *_cpython # new entry - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: false - longterm: True - pr_limit: 60 - max_solver_attempts: 10 # this will make the bot retry "not solvable" stuff 10 times - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - - cross-python - - python_abi - exclude_pinned_pkgs: false - -python: - - 3.11.* *_cpython -# additional entries to add for zip_keys -numpy: - - 1.23 -python_impl: - - cpython diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml similarity index 91% rename from .ci_support/osx_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml index 3b5ff07..2b184cd 100644 --- a/.ci_support/osx_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml @@ -7,11 +7,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -26,3 +26,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/osx_64_numpy1.20python3.8.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml similarity index 91% rename from .ci_support/osx_64_numpy1.20python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml index b8c111a..abd7767 100644 --- a/.ci_support/osx_64_numpy1.20python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml @@ -7,11 +7,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -26,3 +26,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/osx_64_numpy1.20python3.9.____73_pypypython_implpypy.yaml b/.ci_support/osx_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml similarity index 91% rename from .ci_support/osx_64_numpy1.20python3.9.____73_pypypython_implpypy.yaml rename to .ci_support/osx_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml index fb002b2..c986af2 100644 --- a/.ci_support/osx_64_numpy1.20python3.9.____73_pypypython_implpypy.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml @@ -7,11 +7,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -26,3 +26,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/osx_64_numpy1.20python3.9.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml similarity index 91% rename from .ci_support/osx_64_numpy1.20python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml index e3ac943..45beabf 100644 --- a/.ci_support/osx_64_numpy1.20python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml @@ -7,11 +7,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -26,3 +26,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml index b92295f..8edf80f 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 numpy: @@ -26,3 +26,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/osx_64_numpy1.20python3.8.____73_pypypython_implpypy.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml similarity index 76% rename from .ci_support/osx_64_numpy1.20python3.8.____73_pypypython_implpypy.yaml rename to .ci_support/osx_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml index dc6e043..9ec8dfc 100644 --- a/.ci_support/osx_64_numpy1.20python3.8.____73_pypypython_implpypy.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml @@ -1,28 +1,29 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.20' +- '1.26' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_73_pypy +- 3.12.* *_cpython python_impl: -- pypy +- cpython target_platform: - osx-64 zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/win_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml similarity index 90% rename from .ci_support/win_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml index d706582..73c99eb 100644 --- a/.ci_support/win_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ channel_targets: cxx_compiler: - vs2019 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -20,3 +20,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/win_64_numpy1.20python3.8.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml similarity index 90% rename from .ci_support/win_64_numpy1.20python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml index 35167a9..48ca2e3 100644 --- a/.ci_support/win_64_numpy1.20python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ channel_targets: cxx_compiler: - vs2019 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -20,3 +20,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/win_64_numpy1.20python3.9.____73_pypypython_implpypy.yaml b/.ci_support/win_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml similarity index 90% rename from .ci_support/win_64_numpy1.20python3.9.____73_pypypython_implpypy.yaml rename to .ci_support/win_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml index bbc35a2..4f248bb 100644 --- a/.ci_support/win_64_numpy1.20python3.9.____73_pypypython_implpypy.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml @@ -5,7 +5,7 @@ channel_targets: cxx_compiler: - vs2019 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -20,3 +20,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/win_64_numpy1.20python3.9.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml similarity index 90% rename from .ci_support/win_64_numpy1.20python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml index 89eb0a4..663c816 100644 --- a/.ci_support/win_64_numpy1.20python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ channel_targets: cxx_compiler: - vs2019 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -20,3 +20,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml index d3faa4e..32a24f8 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml @@ -20,3 +20,4 @@ zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.ci_support/win_64_numpy1.20python3.8.____73_pypypython_implpypy.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml similarity index 70% rename from .ci_support/win_64_numpy1.20python3.8.____73_pypypython_implpypy.yaml rename to .ci_support/win_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml index 1165879..a78aed8 100644 --- a/.ci_support/win_64_numpy1.20python3.8.____73_pypypython_implpypy.yaml +++ b/.ci_support/win_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml @@ -1,22 +1,23 @@ channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: - vs2019 numpy: -- '1.20' +- '1.26' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_73_pypy +- 3.12.* *_cpython python_impl: -- pypy +- cpython target_platform: - win-64 zip_keys: - - python - numpy - python_impl + - channel_sources diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e61aa2..8b4ef2f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- +# -*- mode: jinja-yaml -*- version: 2 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 595f8b5..438ed2b 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,11 +31,10 @@ pkgs_dirs: CONDARC - -mamba install --update-specs --yes --quiet --channel conda-forge \ - 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 +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c..aff009f 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -12,7 +12,7 @@ function startgroup { echo "##[group]$1";; travis ) echo "$1" - echo -en 'travis_fold:start:'"${1// /}"'\\r';; + echo -en 'travis_fold:start:'"${1// /}"'\r';; github_actions ) echo "::group::$1";; * ) @@ -28,7 +28,7 @@ function endgroup { azure ) echo "##[endgroup]";; travis ) - echo -en 'travis_fold:end:'"${1// /}"'\\r';; + echo -en 'travis_fold:end:'"${1// /}"'\r';; github_actions ) echo "::endgroup::";; esac diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 07de621..0f0ee70 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,11 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling ['conda-forge-ci-setup=3'] and conda-build." -mamba install --update-specs --quiet --yes --channel conda-forge \ - 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 +mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup @@ -56,7 +55,6 @@ source run_conda_forge_build_setup echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml - if [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" fi @@ -72,6 +70,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat new file mode 100755 index 0000000..c4486d9 --- /dev/null +++ b/.scripts/run_win_build.bat @@ -0,0 +1,112 @@ +:: PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +:: will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +:: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +:: benefit from the improvement. + +:: Note: we assume a Miniforge installation is available + +:: INPUTS (required environment variables) +:: CONFIG: name of the .ci_support/*.yaml file for this job +:: CI: azure, github_actions, or unset +:: UPLOAD_PACKAGES: true or false +:: UPLOAD_ON_BRANCH: true or false + +setlocal enableextensions enabledelayedexpansion + +call :start_group "Configuring conda" + +:: Activate the base conda environment +call activate base + +:: Provision the necessary dependencies to build the recipe later +echo Installing dependencies +mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Set basic configuration +echo Setting up configuration +setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml +if !errorlevel! neq 0 exit /b !errorlevel! +echo Running build setup +CALL run_conda_forge_build_setup + + +if !errorlevel! neq 0 exit /b !errorlevel! + +if EXIST LICENSE.txt ( + echo Copying feedstock license + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" +) + +call :end_group + +:: Build the recipe +echo Building recipe +conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Prepare some environment variables for the upload step +if /i "%CI%" == "github_actions" ( + set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" + set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" + if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%RUNNER_TEMP%" +) +if /i "%CI%" == "azure" ( + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + if /i "%BUILD_REASON%" == "PullRequest" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%UPLOAD_TEMP%" +) + +:: Validate +call :start_group "Validating outputs" +validate_recipe_outputs "%FEEDSTOCK_NAME%" +if !errorlevel! neq 0 exit /b !errorlevel! +call :end_group + +if /i "%UPLOAD_PACKAGES%" == "true" ( + if /i "%IS_PR_BUILD%" == "false" ( + call :start_group "Uploading packages" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + if !errorlevel! neq 0 exit /b !errorlevel! + call :end_group + ) +) + +exit + +:: Logging subroutines + +:start_group +if /i "%CI%" == "github_actions" ( + echo ::group::%~1 + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[group]%~1 + exit /b +) +echo %~1 +exit /b + +:end_group +if /i "%CI%" == "github_actions" ( + echo ::endgroup:: + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[endgroup] + exit /b +) +exit /b \ No newline at end of file diff --git a/README.md b/README.md index ffe3066..d3646ae 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About nmslib -============ +About nmslib-feedstock +====================== + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/nmslib-feedstock/blob/main/LICENSE.txt) Home: https://github.com/searchivarius/nmslib Package license: Apache-2.0 -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/nmslib-feedstock/blob/main/LICENSE.txt) - Summary: Non-Metric Space Library (NMSLIB) Current build status @@ -27,129 +27,129 @@ Current build status
Variant | Status | |
---|---|---|
linux_64_numpy1.20python3.8.____73_pypypython_implpypy | +linux_64_numpy1.22python3.10.____cpythonpython_implcpython | - + |
linux_64_numpy1.20python3.8.____cpythonpython_implcpython | +linux_64_numpy1.22python3.8.____cpythonpython_implcpython | - + |
linux_64_numpy1.20python3.9.____73_pypypython_implpypy | +linux_64_numpy1.22python3.9.____73_pypypython_implpypy | - + |
linux_64_numpy1.20python3.9.____cpythonpython_implcpython | +linux_64_numpy1.22python3.9.____cpythonpython_implcpython | - + |
linux_64_numpy1.21python3.10.____cpythonpython_implcpython | +linux_64_numpy1.23python3.11.____cpythonpython_implcpython | - + |
linux_64_numpy1.23python3.11.____cpythonpython_implcpython | +linux_64_numpy1.26python3.12.____cpythonpython_implcpython | - + |
osx_64_numpy1.20python3.8.____73_pypypython_implpypy | +osx_64_numpy1.22python3.10.____cpythonpython_implcpython | - + |
osx_64_numpy1.20python3.8.____cpythonpython_implcpython | +osx_64_numpy1.22python3.8.____cpythonpython_implcpython | - + |
osx_64_numpy1.20python3.9.____73_pypypython_implpypy | +osx_64_numpy1.22python3.9.____73_pypypython_implpypy | - + |
osx_64_numpy1.20python3.9.____cpythonpython_implcpython | +osx_64_numpy1.22python3.9.____cpythonpython_implcpython | - + |
osx_64_numpy1.21python3.10.____cpythonpython_implcpython | +osx_64_numpy1.23python3.11.____cpythonpython_implcpython | - + |
osx_64_numpy1.23python3.11.____cpythonpython_implcpython | +osx_64_numpy1.26python3.12.____cpythonpython_implcpython | - + |
win_64_numpy1.20python3.8.____73_pypypython_implpypy | +win_64_numpy1.22python3.10.____cpythonpython_implcpython | - + |
win_64_numpy1.20python3.8.____cpythonpython_implcpython | +win_64_numpy1.22python3.8.____cpythonpython_implcpython | - + |
win_64_numpy1.20python3.9.____73_pypypython_implpypy | +win_64_numpy1.22python3.9.____73_pypypython_implpypy | - + |
win_64_numpy1.20python3.9.____cpythonpython_implcpython | +win_64_numpy1.22python3.9.____cpythonpython_implcpython | - + |
win_64_numpy1.21python3.10.____cpythonpython_implcpython | +win_64_numpy1.23python3.11.____cpythonpython_implcpython | - + |
win_64_numpy1.23python3.11.____cpythonpython_implcpython | +win_64_numpy1.26python3.12.____cpythonpython_implcpython | - + |