diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 7177637..4d1fda8 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,22 +8,30 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.18python3.7.____cpython: - CONFIG: linux_64_numpy1.18python3.7.____cpython + linux_64_numpy1.19python3.7.____cpython: + CONFIG: linux_64_numpy1.19python3.7.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_numpy1.18python3.8.____cpython: - CONFIG: linux_64_numpy1.18python3.8.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_numpy1.19python3.8.____73_pypy: + CONFIG: linux_64_numpy1.19python3.8.____73_pypy UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_numpy1.19python3.8.____cpython: + CONFIG: linux_64_numpy1.19python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_numpy1.19python3.9.____73_pypy: + CONFIG: linux_64_numpy1.19python3.9.____73_pypy + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.19python3.9.____cpython: CONFIG: linux_64_numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.21python3.10.____cpython: CONFIG: linux_64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 7d1f525..48c7f34 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,14 +5,20 @@ jobs: - job: osx pool: - vmImage: macOS-10.15 + vmImage: macOS-11 strategy: matrix: - osx_64_numpy1.18python3.7.____cpython: - CONFIG: osx_64_numpy1.18python3.7.____cpython + osx_64_numpy1.19python3.7.____cpython: + CONFIG: osx_64_numpy1.19python3.7.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.18python3.8.____cpython: - CONFIG: osx_64_numpy1.18python3.8.____cpython + osx_64_numpy1.19python3.8.____73_pypy: + CONFIG: osx_64_numpy1.19python3.8.____73_pypy + UPLOAD_PACKAGES: 'True' + osx_64_numpy1.19python3.8.____cpython: + CONFIG: osx_64_numpy1.19python3.8.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_numpy1.19python3.9.____73_pypy: + CONFIG: osx_64_numpy1.19python3.9.____73_pypy UPLOAD_PACKAGES: 'True' osx_64_numpy1.19python3.9.____cpython: CONFIG: osx_64_numpy1.19python3.9.____cpython diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 7396461..799f4d5 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,14 +5,20 @@ jobs: - job: win pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 strategy: matrix: - win_64_numpy1.18python3.7.____cpython: - CONFIG: win_64_numpy1.18python3.7.____cpython + win_64_numpy1.19python3.7.____cpython: + CONFIG: win_64_numpy1.19python3.7.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.18python3.8.____cpython: - CONFIG: win_64_numpy1.18python3.8.____cpython + win_64_numpy1.19python3.8.____73_pypy: + CONFIG: win_64_numpy1.19python3.8.____73_pypy + UPLOAD_PACKAGES: 'True' + win_64_numpy1.19python3.8.____cpython: + CONFIG: win_64_numpy1.19python3.8.____cpython + UPLOAD_PACKAGES: 'True' + win_64_numpy1.19python3.9.____73_pypy: + CONFIG: win_64_numpy1.19python3.9.____73_pypy UPLOAD_PACKAGES: 'True' win_64_numpy1.19python3.9.____cpython: CONFIG: win_64_numpy1.19python3.9.____cpython @@ -25,46 +31,27 @@ jobs: CONDA_BLD_PATH: D:\\bld\\ steps: - - script: | - choco install vcpython27 -fdv -y --debug - condition: contains(variables['CONFIG'], 'vs2008') - displayName: Install vcpython27.msi (if needed) - - # Cygwin's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) - # - script: rmdir C:\cygwin /s /q - # continueOnError: true - - - powershell: | - Set-PSDebug -Trace 1 - - $batchcontent = @" - ECHO ON - SET vcpython=C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0 - - DIR "%vcpython%" - - CALL "%vcpython%\vcvarsall.bat" %* - "@ - - $batchDir = "C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0\VC" - $batchPath = "$batchDir" + "\vcvarsall.bat" - New-Item -Path $batchPath -ItemType "file" -Force - - Set-Content -Value $batchcontent -Path $batchPath - - Get-ChildItem -Path $batchDir + - task: PythonScript@0 + displayName: 'Download Miniforge' + inputs: + scriptSource: inline + script: | + import urllib.request + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" + urllib.request.urlretrieve(url, path) - Get-ChildItem -Path ($batchDir + '\..') + - script: | + start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge + displayName: Install Miniforge - condition: contains(variables['CONFIG'], 'vs2008') - displayName: Patch vs2008 (if needed) + - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" + displayName: Add conda to PATH - - task: CondaEnvironment@1 - inputs: - packageSpecs: 'python=3.9 conda-build conda "conda-forge-ci-setup=3" pip boa' # Optional - installOptions: "-c conda-forge" - updateConda: true - displayName: Install conda-build and activate environment + - 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 @@ -81,25 +68,16 @@ jobs: call activate base run_conda_forge_build_setup displayName: conda-forge build setup - - - # Special cased version setting some more things! - - script: | - call activate base - conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml - displayName: Build recipe (vs2008) - env: - VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin" - PYTHONUNBUFFERED: 1 - condition: contains(variables['CONFIG'], 'vs2008') - 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 env: PYTHONUNBUFFERED: 1 - condition: not(contains(variables['CONFIG'], 'vs2008')) - script: | set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" call activate base diff --git a/.ci_support/README b/.ci_support/README index e4e2dce..a47316b 100644 --- a/.ci_support/README +++ b/.ci_support/README @@ -1 +1,6 @@ -This file is automatically generated by conda-smithy. To change any matrix elements, you should change conda-smithy's input conda_build_config.yaml and re-render the recipe, rather than editing these files directly. \ No newline at end of file +This file is automatically generated by conda-smithy. If any +particular build configuration is expected, but it is not found, +please make sure all dependencies are satisfiable. To add/modify any +matrix elements, you should create/change conda-smithy's input +recipe/conda_build_config.yaml and re-render the recipe, rather than +editing these files directly. diff --git a/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_64_numpy1.19python3.7.____cpython.yaml similarity index 77% rename from .ci_support/linux_64_numpy1.18python3.7.____cpython.yaml rename to .ci_support/linux_64_numpy1.19python3.7.____cpython.yaml index cf08958..fda561e 100644 --- a/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.19python3.7.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -9,9 +9,9 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.18' +- '1.19' pin_run_as_build: python: min_pin: x.x @@ -21,7 +21,5 @@ python: target_platform: - linux-64 zip_keys: -- - cdt_name - - docker_image - - python - numpy diff --git a/.ci_support/linux_64_numpy1.19python3.8.____73_pypy.yaml b/.ci_support/linux_64_numpy1.19python3.8.____73_pypy.yaml new file mode 100644 index 0000000..ad507e2 --- /dev/null +++ b/.ci_support/linux_64_numpy1.19python3.8.____73_pypy.yaml @@ -0,0 +1,25 @@ +c_compiler: +- gcc +c_compiler_version: +- '10' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_73_pypy +target_platform: +- linux-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.19python3.8.____cpython.yaml similarity index 77% rename from .ci_support/linux_64_numpy1.18python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.19python3.8.____cpython.yaml index e6abd92..4b3f22c 100644 --- a/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.19python3.8.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -9,9 +9,9 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.18' +- '1.19' pin_run_as_build: python: min_pin: x.x @@ -21,7 +21,5 @@ python: target_platform: - linux-64 zip_keys: -- - cdt_name - - docker_image - - python - numpy diff --git a/.ci_support/linux_64_numpy1.19python3.9.____73_pypy.yaml b/.ci_support/linux_64_numpy1.19python3.9.____73_pypy.yaml new file mode 100644 index 0000000..331d4c4 --- /dev/null +++ b/.ci_support/linux_64_numpy1.19python3.9.____73_pypy.yaml @@ -0,0 +1,25 @@ +c_compiler: +- gcc +c_compiler_version: +- '10' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_73_pypy +target_platform: +- linux-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml index ca64498..79b12bd 100644 --- a/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: - '1.19' pin_run_as_build: @@ -21,7 +21,5 @@ python: target_platform: - linux-64 zip_keys: -- - cdt_name - - docker_image - - python - numpy diff --git a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml index 27481bf..2c7bafc 100644 --- a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: - '1.21' pin_run_as_build: @@ -21,7 +21,5 @@ python: target_platform: - linux-64 zip_keys: -- - cdt_name - - docker_image - - python - numpy diff --git a/.ci_support/migrations/pypy38.yaml b/.ci_support/migrations/pypy38.yaml new file mode 100644 index 0000000..95e0542 --- /dev/null +++ b/.ci_support/migrations/pypy38.yaml @@ -0,0 +1,53 @@ +migrator_ts: 1647123563 +__migrator: + migration_number: 1 + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.10.* *_cpython + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + - 3.8.* *_73_pypy + - 3.9.* *_73_pypy + paused: False + longterm: True + use_local: False + check_solvable: True + exclude_pinned_pkgs: False + pr_limit: 10 + bump_number: 1 + wait_for_migrators: + - python310 + commit_message: "Rebuild for PyPy3.8 and PyPy3.9" + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + +python: + - 3.7.* *_cpython # [not (osx and arm64)] + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.10.* *_cpython + - 3.8.* *_73_pypy # [not (osx and arm64)] + - 3.9.* *_73_pypy # [not (osx and arm64)] +numpy: + # part of a zip_keys: python, python_impl, numpy + - 1.19 # [not (osx and arm64)] + - 1.19 + - 1.19 + - 1.21 + - 1.19 # [not (osx and arm64)] + - 1.19 # [not (osx and arm64)] +python_impl: + - cpython # [not (osx and arm64)] + - cpython + - cpython + - cpython + - pypy # [not (osx and arm64)] + - pypy # [not (osx and arm64)] diff --git a/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/osx_64_numpy1.19python3.7.____cpython.yaml similarity index 95% rename from .ci_support/osx_64_numpy1.18python3.7.____cpython.yaml rename to .ci_support/osx_64_numpy1.19python3.7.____cpython.yaml index a2f0e21..e141ef3 100644 --- a/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.19python3.7.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '11' +- '13' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.18' +- '1.19' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.19python3.8.____73_pypy.yaml b/.ci_support/osx_64_numpy1.19python3.8.____73_pypy.yaml new file mode 100644 index 0000000..f270982 --- /dev/null +++ b/.ci_support/osx_64_numpy1.19python3.8.____73_pypy.yaml @@ -0,0 +1,25 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '13' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_73_pypy +target_platform: +- osx-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.19python3.8.____cpython.yaml similarity index 95% rename from .ci_support/osx_64_numpy1.18python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.19python3.8.____cpython.yaml index 17abcb3..3190538 100644 --- a/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.19python3.8.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '11' +- '13' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.18' +- '1.19' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.19python3.9.____73_pypy.yaml b/.ci_support/osx_64_numpy1.19python3.9.____73_pypy.yaml new file mode 100644 index 0000000..7b36a6d --- /dev/null +++ b/.ci_support/osx_64_numpy1.19python3.9.____73_pypy.yaml @@ -0,0 +1,25 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '13' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_73_pypy +target_platform: +- osx-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml index bc36e4a..35d810c 100644 --- a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '11' +- '13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml index cf3d0ee..3a9519f 100644 --- a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '11' +- '13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/win_64_numpy1.19python3.7.____cpython.yaml similarity index 96% rename from .ci_support/win_64_numpy1.18python3.7.____cpython.yaml rename to .ci_support/win_64_numpy1.19python3.7.____cpython.yaml index 319956c..c835888 100644 --- a/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/win_64_numpy1.19python3.7.____cpython.yaml @@ -5,7 +5,7 @@ channel_sources: channel_targets: - conda-forge main numpy: -- '1.18' +- '1.19' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.19python3.8.____73_pypy.yaml b/.ci_support/win_64_numpy1.19python3.8.____73_pypy.yaml new file mode 100644 index 0000000..701ae7c --- /dev/null +++ b/.ci_support/win_64_numpy1.19python3.8.____73_pypy.yaml @@ -0,0 +1,19 @@ +c_compiler: +- vs2017 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_73_pypy +target_platform: +- win-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.19python3.8.____cpython.yaml similarity index 96% rename from .ci_support/win_64_numpy1.18python3.8.____cpython.yaml rename to .ci_support/win_64_numpy1.19python3.8.____cpython.yaml index a80e35d..24f6563 100644 --- a/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.19python3.8.____cpython.yaml @@ -5,7 +5,7 @@ channel_sources: channel_targets: - conda-forge main numpy: -- '1.18' +- '1.19' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.19python3.9.____73_pypy.yaml b/.ci_support/win_64_numpy1.19python3.9.____73_pypy.yaml new file mode 100644 index 0000000..7e022ca --- /dev/null +++ b/.ci_support/win_64_numpy1.19python3.9.____73_pypy.yaml @@ -0,0 +1,19 @@ +c_compiler: +- vs2017 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_73_pypy +target_platform: +- win-64 +zip_keys: +- - python + - numpy diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ad461b..3e61aa2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,8 @@ version: 2 jobs: build: working_directory: ~/test - machine: true + machine: + image: ubuntu-2004:current steps: - run: # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish. diff --git a/.gitattributes b/.gitattributes index ce52713..7f32763 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,6 +9,7 @@ bld.bat text eol=crlf # github helper pieces to make some files not show up in diffs automatically .azure-pipelines/* linguist-generated=true .circleci/* linguist-generated=true +.ci_support/README linguist-generated=true .drone/* linguist-generated=true .drone.yml linguist-generated=true .github/* linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a85ae38..595f8b5 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -5,6 +5,8 @@ # changes to this script, consider a proposal to conda-smithy so that other feedstocks can also # benefit from the improvement. +# -*- mode: jinja-shell -*- + set -xeuo pipefail export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" source ${FEEDSTOCK_ROOT}/.scripts/logging_utils.sh @@ -22,13 +24,18 @@ export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" cat >~/.condarc < /dev/null +if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then + cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" +fi + if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" @@ -53,7 +64,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda $BUILD_CMD "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 0c6515f..9236239 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -14,7 +14,7 @@ set -xeo pipefail THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )" PROVIDER_DIR="$(basename $THISDIR)" -FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) +FEEDSTOCK_ROOT="$( cd "$( dirname "$0" )/.." >/dev/null && pwd )" RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe" if [ -z ${FEEDSTOCK_NAME} ]; then diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index d6de123..07de621 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +# -*- mode: jinja-shell -*- + source .scripts/logging_utils.sh set -xe @@ -9,7 +11,7 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" +MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} @@ -18,14 +20,14 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} ( startgroup "Configuring conda" ) 2> /dev/null -GET_BOA=boa -BUILD_CMD=mambabuild - source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build." -conda install -n base --quiet --yes "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} +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 @@ -51,21 +53,39 @@ source run_conda_forge_build_setup ( endgroup "Configuring conda" ) 2> /dev/null - echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml -conda $BUILD_CMD ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} -( startgroup "Validating outputs" ) 2> /dev/null -validate_recipe_outputs "${FEEDSTOCK_NAME}" +if [[ -f LICENSE.txt ]]; then + cp LICENSE.txt "recipe/recipe-scripts-license.txt" +fi -( endgroup "Validating outputs" ) 2> /dev/null +if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then + if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" + fi + conda debug ./recipe -m ./.ci_support/${CONFIG}.yaml \ + ${EXTRA_CB_OPTIONS:-} \ + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml -( startgroup "Uploading packages" ) 2> /dev/null + # 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 + ( startgroup "Validating outputs" ) 2> /dev/null -if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then - upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml -fi + validate_recipe_outputs "${FEEDSTOCK_NAME}" + + ( endgroup "Validating outputs" ) 2> /dev/null + + ( startgroup "Uploading packages" ) 2> /dev/null + + if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then + upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml + fi -( endgroup "Uploading packages" ) 2> /dev/null \ No newline at end of file + ( endgroup "Uploading packages" ) 2> /dev/null +fi \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt index ed3f451..2ec51d7 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,13 +1,27 @@ -BSD 3-clause license -Copyright (c) 2015-2021, conda-forge contributors +BSD-3-Clause license +Copyright (c) 2015-2022, conda-forge contributors All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. diff --git a/README.md b/README.md index e40dca2..f0dbb81 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Home: http://surpriselib.com Package license: BSD-3-Clause -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/scikit-surprise-feedstock/blob/master/LICENSE.txt) +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/scikit-surprise-feedstock/blob/main/LICENSE.txt) Summary: A Python scikit for building and analyzing recommender systems. @@ -24,94 +24,136 @@ Current build status
- - + + - + - + + + + + + + - + - + + + + + + + + + + + + + - + - + @@ -139,18 +181,43 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `scikit-surprise` can be installed with: +Once the `conda-forge` channel has been enabled, `scikit-surprise` can be installed with `conda`: ``` conda install scikit-surprise ``` -It is possible to list all of the versions of `scikit-surprise` available on your platform with: +or with `mamba`: + +``` +mamba install scikit-surprise +``` + +It is possible to list all of the versions of `scikit-surprise` available on your platform with `conda`: ``` conda search scikit-surprise --channel conda-forge ``` +or with `mamba`: + +``` +mamba search scikit-surprise --channel conda-forge +``` + +Alternatively, `mamba repoquery` may provide more information: + +``` +# Search all versions available on your platform: +mamba repoquery search scikit-surprise --channel conda-forge + +# List packages depending on `scikit-surprise`: +mamba repoquery whoneeds scikit-surprise --channel conda-forge + +# List dependencies of `scikit-surprise`: +mamba repoquery depends scikit-surprise --channel conda-forge +``` + About conda-forge ================= @@ -166,10 +233,12 @@ for each of the installable packages. Such a repository is known as a *feedstock A feedstock is made up of a conda recipe (the instructions on what and how to build the package) and the necessary configurations for automatic building using freely available continuous integration services. Thanks to the awesome service provided by -[CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/) -and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable -packages to the [conda-forge](https://anaconda.org/conda-forge) -[Anaconda-Cloud](https://anaconda.org/) channel for Linux, Windows and OSX respectively. +[Azure](https://azure.microsoft.com/en-us/services/devops/), [GitHub](https://github.com/), +[CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), +[Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) +it is possible to build and upload installable packages to the +[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance [conda-smithy](https://github.com/conda-forge/conda-smithy) has been developed. diff --git a/build-locally.py b/build-locally.py index 8b74348..3f4b7a7 100755 --- a/build-locally.py +++ b/build-locally.py @@ -22,10 +22,6 @@ def setup_environment(ns): os.environ["MINIFORGE_HOME"] = os.path.join( os.path.dirname(__file__), "miniforge3" ) - if "OSX_SDK_DIR" not in os.environ: - os.environ["OSX_SDK_DIR"] = os.path.join( - os.path.dirname(__file__), "SDKs" - ) def run_docker_build(ns): @@ -65,11 +61,12 @@ def verify_config(ns): raise ValueError( f"only Linux/macOS configs currently supported, got {ns.config}" ) - elif ns.config.startswith("osx") and platform.system() == "Darwin": + 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=/opt'" - "to download the SDK automatically to '/opt/MacOSX.sdk'" + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " + "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) @@ -89,12 +86,19 @@ def main(args=None): verify_config(ns) setup_environment(ns) - if ns.config.startswith("linux") or ( - ns.config.startswith("osx") and platform.system() == "Linux" - ): - run_docker_build(ns) - elif ns.config.startswith("osx"): - run_osx_build(ns) + try: + if ns.config.startswith("linux") or ( + ns.config.startswith("osx") and platform.system() == "Linux" + ): + run_docker_build(ns) + elif ns.config.startswith("osx"): + run_osx_build(ns) + finally: + recipe_license_file = os.path.join( + "recipe", "recipe-scripts-license.txt" + ) + if os.path.exists(recipe_license_file): + os.remove(recipe_license_file) if __name__ == "__main__": diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 80eef53..4d6f869 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: sha256: {{ sha256 }} build: - number: 2 + number: 3 script: python setup.py install --single-version-externally-managed --record record.txt requirements:
VariantStatus
linux_64_numpy1.18python3.7.____cpythonlinux_64_numpy1.19python3.7.____cpython - - variant + + variant
linux_64_numpy1.18python3.8.____cpythonlinux_64_numpy1.19python3.8.____73_pypy - - variant + + variant + +
linux_64_numpy1.19python3.8.____cpython + + variant + +
linux_64_numpy1.19python3.9.____73_pypy + + variant
linux_64_numpy1.19python3.9.____cpython - - variant + + variant
linux_64_numpy1.21python3.10.____cpython - - variant + + variant
osx_64_numpy1.18python3.7.____cpythonosx_64_numpy1.19python3.7.____cpython - - variant + + variant
osx_64_numpy1.18python3.8.____cpythonosx_64_numpy1.19python3.8.____73_pypy - - variant + + variant + +
osx_64_numpy1.19python3.8.____cpython + + variant + +
osx_64_numpy1.19python3.9.____73_pypy + + variant
osx_64_numpy1.19python3.9.____cpython - - variant + + variant
osx_64_numpy1.21python3.10.____cpython - - variant + + variant + +
win_64_numpy1.19python3.7.____cpython + + variant + +
win_64_numpy1.19python3.8.____73_pypy + + variant
win_64_numpy1.18python3.7.____cpythonwin_64_numpy1.19python3.8.____cpython - - variant + + variant
win_64_numpy1.18python3.8.____cpythonwin_64_numpy1.19python3.9.____73_pypy - - variant + + variant
win_64_numpy1.19python3.9.____cpython - - variant + + variant
win_64_numpy1.21python3.10.____cpython - - variant + + variant