diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 8f4fe7a3..cca3b540 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,10 +8,18 @@ jobs: vmImage: ubuntu-latest strategy: matrix: + linux_64_numpy1.19python3.8.____73_pypypython_implpypy: + CONFIG: linux_64_numpy1.19python3.8.____73_pypypython_implpypy + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.19python3.8.____cpythonpython_implcpython: CONFIG: linux_64_numpy1.19python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_numpy1.19python3.9.____73_pypypython_implpypy: + CONFIG: linux_64_numpy1.19python3.9.____73_pypypython_implpypy + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.19python3.9.____cpythonpython_implcpython: CONFIG: linux_64_numpy1.19python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' @@ -20,10 +28,18 @@ jobs: CONFIG: linux_64_numpy1.21python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy1.19python3.8.____73_pypypython_implpypy: + CONFIG: linux_aarch64_numpy1.19python3.8.____73_pypypython_implpypy + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_numpy1.19python3.8.____cpythonpython_implcpython: CONFIG: linux_aarch64_numpy1.19python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy1.19python3.9.____73_pypypython_implpypy: + CONFIG: linux_aarch64_numpy1.19python3.9.____73_pypypython_implpypy + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_numpy1.19python3.9.____cpythonpython_implcpython: CONFIG: linux_aarch64_numpy1.19python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' @@ -32,10 +48,18 @@ jobs: CONFIG: linux_aarch64_numpy1.21python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy1.19python3.8.____73_pypypython_implpypy: + CONFIG: linux_ppc64le_numpy1.19python3.8.____73_pypypython_implpypy + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_numpy1.19python3.8.____cpythonpython_implcpython: CONFIG: linux_ppc64le_numpy1.19python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy1.19python3.9.____73_pypypython_implpypy: + CONFIG: linux_ppc64le_numpy1.19python3.9.____73_pypypython_implpypy + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_numpy1.19python3.9.____cpythonpython_implcpython: CONFIG: linux_ppc64le_numpy1.19python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index c8915a74..39e8584e 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,9 +8,15 @@ jobs: vmImage: macOS-10.15 strategy: matrix: + osx_64_numpy1.19python3.8.____73_pypypython_implpypy: + CONFIG: osx_64_numpy1.19python3.8.____73_pypypython_implpypy + UPLOAD_PACKAGES: 'True' osx_64_numpy1.19python3.8.____cpythonpython_implcpython: CONFIG: osx_64_numpy1.19python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' + osx_64_numpy1.19python3.9.____73_pypypython_implpypy: + CONFIG: osx_64_numpy1.19python3.9.____73_pypypython_implpypy + UPLOAD_PACKAGES: 'True' osx_64_numpy1.19python3.9.____cpythonpython_implcpython: CONFIG: osx_64_numpy1.19python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index ffee81cf..c5122c02 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,9 +8,15 @@ jobs: vmImage: windows-2019 strategy: matrix: + win_64_numpy1.19python3.8.____73_pypypython_implpypy: + CONFIG: win_64_numpy1.19python3.8.____73_pypypython_implpypy + UPLOAD_PACKAGES: 'True' win_64_numpy1.19python3.8.____cpythonpython_implcpython: CONFIG: win_64_numpy1.19python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' + win_64_numpy1.19python3.9.____73_pypypython_implpypy: + CONFIG: win_64_numpy1.19python3.9.____73_pypypython_implpypy + UPLOAD_PACKAGES: 'True' win_64_numpy1.19python3.9.____cpythonpython_implcpython: CONFIG: win_64_numpy1.19python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' @@ -22,45 +28,27 @@ jobs: CONDA_BLD_PATH: C:\\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 + - 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 - Get-ChildItem -Path ($batchDir + '\..') + - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" + displayName: Add conda to PATH - condition: contains(variables['CONFIG'], 'vs2008') - displayName: Patch vs2008 (if needed) - - task: CondaEnvironment@1 - inputs: - packageSpecs: 'python=3.9 conda-build conda pip boa conda-forge-ci-setup=3' # 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 @@ -77,25 +65,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/linux_64_numpy1.19python3.8.____73_pypypython_implpypy.yaml b/.ci_support/linux_64_numpy1.19python3.8.____73_pypypython_implpypy.yaml new file mode 100644 index 00000000..79fd561f --- /dev/null +++ b/.ci_support/linux_64_numpy1.19python3.8.____73_pypypython_implpypy.yaml @@ -0,0 +1,45 @@ +c_compiler: +- gcc +c_compiler_version: +- '10' +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 +fortran_compiler: +- gfortran +fortran_compiler_version: +- '10' +libblas: +- 3.9 *netlib +libcblas: +- 3.9 *netlib +liblapack: +- 3.9 *netlib +numpy: +- '1.19' +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: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/linux_64_numpy1.19python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.19python3.8.____cpythonpython_implcpython.yaml index fd2ba803..78c561da 100644 --- a/.ci_support/linux_64_numpy1.19python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy1.19python3.8.____cpythonpython_implcpython.yaml @@ -19,11 +19,11 @@ fortran_compiler: fortran_compiler_version: - '10' libblas: -- 3.8 *netlib +- 3.9 *netlib libcblas: -- 3.8 *netlib +- 3.9 *netlib liblapack: -- 3.8 *netlib +- 3.9 *netlib numpy: - '1.19' pin_run_as_build: diff --git a/.ci_support/linux_64_numpy1.19python3.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_64_numpy1.19python3.9.____73_pypypython_implpypy.yaml new file mode 100644 index 00000000..9358cd4b --- /dev/null +++ b/.ci_support/linux_64_numpy1.19python3.9.____73_pypypython_implpypy.yaml @@ -0,0 +1,45 @@ +c_compiler: +- gcc +c_compiler_version: +- '10' +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 +fortran_compiler: +- gfortran +fortran_compiler_version: +- '10' +libblas: +- 3.9 *netlib +libcblas: +- 3.9 *netlib +liblapack: +- 3.9 *netlib +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_73_pypy +python_impl: +- pypy +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/linux_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml index 0275306f..dfb75d56 100644 --- a/.ci_support/linux_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml @@ -19,11 +19,11 @@ fortran_compiler: fortran_compiler_version: - '10' libblas: -- 3.8 *netlib +- 3.9 *netlib libcblas: -- 3.8 *netlib +- 3.9 *netlib liblapack: -- 3.8 *netlib +- 3.9 *netlib numpy: - '1.19' pin_run_as_build: diff --git a/.ci_support/linux_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml index 3c355e10..386488fa 100644 --- a/.ci_support/linux_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml @@ -19,11 +19,11 @@ fortran_compiler: fortran_compiler_version: - '10' libblas: -- 3.8 *netlib +- 3.9 *netlib libcblas: -- 3.8 *netlib +- 3.9 *netlib liblapack: -- 3.8 *netlib +- 3.9 *netlib numpy: - '1.21' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy1.19python3.8.____73_pypypython_implpypy.yaml b/.ci_support/linux_aarch64_numpy1.19python3.8.____73_pypypython_implpypy.yaml new file mode 100644 index 00000000..fadb23a5 --- /dev/null +++ b/.ci_support/linux_aarch64_numpy1.19python3.8.____73_pypypython_implpypy.yaml @@ -0,0 +1,49 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '10' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +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 +fortran_compiler: +- gfortran +fortran_compiler_version: +- '10' +libblas: +- 3.9 *netlib +libcblas: +- 3.9 *netlib +liblapack: +- 3.9 *netlib +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_73_pypy +python_impl: +- pypy +target_platform: +- linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.19python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy1.19python3.8.____cpythonpython_implcpython.yaml index bd2d70be..38600167 100644 --- a/.ci_support/linux_aarch64_numpy1.19python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.19python3.8.____cpythonpython_implcpython.yaml @@ -23,11 +23,11 @@ fortran_compiler: fortran_compiler_version: - '10' libblas: -- 3.8 *netlib +- 3.9 *netlib libcblas: -- 3.8 *netlib +- 3.9 *netlib liblapack: -- 3.8 *netlib +- 3.9 *netlib numpy: - '1.19' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy1.19python3.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_aarch64_numpy1.19python3.9.____73_pypypython_implpypy.yaml new file mode 100644 index 00000000..e4a17254 --- /dev/null +++ b/.ci_support/linux_aarch64_numpy1.19python3.9.____73_pypypython_implpypy.yaml @@ -0,0 +1,49 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '10' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +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 +fortran_compiler: +- gfortran +fortran_compiler_version: +- '10' +libblas: +- 3.9 *netlib +libcblas: +- 3.9 *netlib +liblapack: +- 3.9 *netlib +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_73_pypy +python_impl: +- pypy +target_platform: +- linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.19python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy1.19python3.9.____cpythonpython_implcpython.yaml index 2c45dce6..694f7b22 100644 --- a/.ci_support/linux_aarch64_numpy1.19python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.19python3.9.____cpythonpython_implcpython.yaml @@ -23,11 +23,11 @@ fortran_compiler: fortran_compiler_version: - '10' libblas: -- 3.8 *netlib +- 3.9 *netlib libcblas: -- 3.8 *netlib +- 3.9 *netlib liblapack: -- 3.8 *netlib +- 3.9 *netlib numpy: - '1.19' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy1.21python3.10.____cpythonpython_implcpython.yaml index 30c899a9..25531ba5 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.21python3.10.____cpythonpython_implcpython.yaml @@ -23,11 +23,11 @@ fortran_compiler: fortran_compiler_version: - '10' libblas: -- 3.8 *netlib +- 3.9 *netlib libcblas: -- 3.8 *netlib +- 3.9 *netlib liblapack: -- 3.8 *netlib +- 3.9 *netlib numpy: - '1.21' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy1.19python3.8.____73_pypypython_implpypy.yaml b/.ci_support/linux_ppc64le_numpy1.19python3.8.____73_pypypython_implpypy.yaml new file mode 100644 index 00000000..d29f7c6b --- /dev/null +++ b/.ci_support/linux_ppc64le_numpy1.19python3.8.____73_pypypython_implpypy.yaml @@ -0,0 +1,45 @@ +c_compiler: +- gcc +c_compiler_version: +- '10' +cdt_name: +- cos7 +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 +fortran_compiler: +- gfortran +fortran_compiler_version: +- '10' +libblas: +- 3.9 *netlib +libcblas: +- 3.9 *netlib +liblapack: +- 3.9 *netlib +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_73_pypy +python_impl: +- pypy +target_platform: +- linux-ppc64le +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.19python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.19python3.8.____cpythonpython_implcpython.yaml index 44f008fa..720b15af 100644 --- a/.ci_support/linux_ppc64le_numpy1.19python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.19python3.8.____cpythonpython_implcpython.yaml @@ -19,11 +19,11 @@ fortran_compiler: fortran_compiler_version: - '10' libblas: -- 3.8 *netlib +- 3.9 *netlib libcblas: -- 3.8 *netlib +- 3.9 *netlib liblapack: -- 3.8 *netlib +- 3.9 *netlib numpy: - '1.19' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy1.19python3.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_ppc64le_numpy1.19python3.9.____73_pypypython_implpypy.yaml new file mode 100644 index 00000000..3bc2ee98 --- /dev/null +++ b/.ci_support/linux_ppc64le_numpy1.19python3.9.____73_pypypython_implpypy.yaml @@ -0,0 +1,45 @@ +c_compiler: +- gcc +c_compiler_version: +- '10' +cdt_name: +- cos7 +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 +fortran_compiler: +- gfortran +fortran_compiler_version: +- '10' +libblas: +- 3.9 *netlib +libcblas: +- 3.9 *netlib +liblapack: +- 3.9 *netlib +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_73_pypy +python_impl: +- pypy +target_platform: +- linux-ppc64le +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpythonpython_implcpython.yaml index d7a2db24..3e48f842 100644 --- a/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpythonpython_implcpython.yaml @@ -19,11 +19,11 @@ fortran_compiler: fortran_compiler_version: - '10' libblas: -- 3.8 *netlib +- 3.9 *netlib libcblas: -- 3.8 *netlib +- 3.9 *netlib liblapack: -- 3.8 *netlib +- 3.9 *netlib numpy: - '1.19' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpythonpython_implcpython.yaml index a9d276d6..ca2649c9 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpythonpython_implcpython.yaml @@ -19,11 +19,11 @@ fortran_compiler: fortran_compiler_version: - '10' libblas: -- 3.8 *netlib +- 3.9 *netlib libcblas: -- 3.8 *netlib +- 3.9 *netlib liblapack: -- 3.8 *netlib +- 3.9 *netlib numpy: - '1.21' pin_run_as_build: diff --git a/.ci_support/migrations/pypy38.yaml b/.ci_support/migrations/pypy38.yaml new file mode 100644 index 00000000..95e05426 --- /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.19python3.8.____73_pypypython_implpypy.yaml b/.ci_support/osx_64_numpy1.19python3.8.____73_pypypython_implpypy.yaml new file mode 100644 index 00000000..cb773696 --- /dev/null +++ b/.ci_support/osx_64_numpy1.19python3.8.____73_pypypython_implpypy.yaml @@ -0,0 +1,45 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '13' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '13' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '9' +libblas: +- 3.9 *netlib +libcblas: +- 3.9 *netlib +liblapack: +- 3.9 *netlib +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 +python_impl: +- pypy +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/osx_64_numpy1.19python3.8.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.19python3.8.____cpythonpython_implcpython.yaml index 0fd70ca4..689929f8 100644 --- a/.ci_support/osx_64_numpy1.19python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.19python3.8.____cpythonpython_implcpython.yaml @@ -17,11 +17,11 @@ fortran_compiler: fortran_compiler_version: - '9' libblas: -- 3.8 *netlib +- 3.9 *netlib libcblas: -- 3.8 *netlib +- 3.9 *netlib liblapack: -- 3.8 *netlib +- 3.9 *netlib macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy1.19python3.9.____73_pypypython_implpypy.yaml b/.ci_support/osx_64_numpy1.19python3.9.____73_pypypython_implpypy.yaml new file mode 100644 index 00000000..c7b22039 --- /dev/null +++ b/.ci_support/osx_64_numpy1.19python3.9.____73_pypypython_implpypy.yaml @@ -0,0 +1,45 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '13' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '13' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '9' +libblas: +- 3.9 *netlib +libcblas: +- 3.9 *netlib +liblapack: +- 3.9 *netlib +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 +python_impl: +- pypy +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/osx_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml index 10f01add..ffc7e607 100644 --- a/.ci_support/osx_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml @@ -17,11 +17,11 @@ fortran_compiler: fortran_compiler_version: - '9' libblas: -- 3.8 *netlib +- 3.9 *netlib libcblas: -- 3.8 *netlib +- 3.9 *netlib liblapack: -- 3.8 *netlib +- 3.9 *netlib macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml index 2ca94bce..8fe6eb12 100644 --- a/.ci_support/osx_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml @@ -17,11 +17,11 @@ fortran_compiler: fortran_compiler_version: - '9' libblas: -- 3.8 *netlib +- 3.9 *netlib libcblas: -- 3.8 *netlib +- 3.9 *netlib liblapack: -- 3.8 *netlib +- 3.9 *netlib macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/win_64_numpy1.19python3.8.____73_pypypython_implpypy.yaml b/.ci_support/win_64_numpy1.19python3.8.____73_pypypython_implpypy.yaml new file mode 100644 index 00000000..772d70f3 --- /dev/null +++ b/.ci_support/win_64_numpy1.19python3.8.____73_pypypython_implpypy.yaml @@ -0,0 +1,32 @@ +c_compiler: +- vs2017 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2017 +libblas: +- 3.9 *netlib +libcblas: +- 3.9 *netlib +liblapack: +- 3.9 *netlib +m2w64_fortran_compiler: +- m2w64-toolchain +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_73_pypy +python_impl: +- pypy +target_platform: +- win-64 +zip_keys: +- - python + - numpy + - python_impl diff --git a/.ci_support/win_64_numpy1.19python3.8.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy1.19python3.8.____cpythonpython_implcpython.yaml index de062d62..4bfe8d43 100644 --- a/.ci_support/win_64_numpy1.19python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.19python3.8.____cpythonpython_implcpython.yaml @@ -7,11 +7,11 @@ channel_targets: cxx_compiler: - vs2017 libblas: -- 3.8 *netlib +- 3.9 *netlib libcblas: -- 3.8 *netlib +- 3.9 *netlib liblapack: -- 3.8 *netlib +- 3.9 *netlib m2w64_fortran_compiler: - m2w64-toolchain numpy: diff --git a/.ci_support/win_64_numpy1.19python3.9.____73_pypypython_implpypy.yaml b/.ci_support/win_64_numpy1.19python3.9.____73_pypypython_implpypy.yaml new file mode 100644 index 00000000..3ba64a37 --- /dev/null +++ b/.ci_support/win_64_numpy1.19python3.9.____73_pypypython_implpypy.yaml @@ -0,0 +1,32 @@ +c_compiler: +- vs2017 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2017 +libblas: +- 3.9 *netlib +libcblas: +- 3.9 *netlib +liblapack: +- 3.9 *netlib +m2w64_fortran_compiler: +- m2w64-toolchain +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_73_pypy +python_impl: +- pypy +target_platform: +- win-64 +zip_keys: +- - python + - numpy + - python_impl diff --git a/.ci_support/win_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml index 8085b19e..3fe8025c 100644 --- a/.ci_support/win_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml @@ -7,11 +7,11 @@ channel_targets: cxx_compiler: - vs2017 libblas: -- 3.8 *netlib +- 3.9 *netlib libcblas: -- 3.8 *netlib +- 3.9 *netlib liblapack: -- 3.8 *netlib +- 3.9 *netlib m2w64_fortran_compiler: - m2w64-toolchain numpy: diff --git a/.ci_support/win_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml index 2fbef26b..11856fc7 100644 --- a/.ci_support/win_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml @@ -7,11 +7,11 @@ channel_targets: cxx_compiler: - vs2017 libblas: -- 3.8 *netlib +- 3.9 *netlib libcblas: -- 3.8 *netlib +- 3.9 *netlib liblapack: -- 3.8 *netlib +- 3.9 *netlib m2w64_fortran_compiler: - m2w64-toolchain numpy: diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ad461b8..3e61aa24 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/.scripts/build_steps.sh b/.scripts/build_steps.sh index c6b23e87..a6b09f6b 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -24,7 +24,10 @@ 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}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 3d855059..736a39a0 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -61,6 +61,10 @@ if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then fi +if [[ -f LICENSE.txt ]]; then + cp LICENSE.txt "recipe/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}" diff --git a/LICENSE.txt b/LICENSE.txt index 6ec14012..2ec51d75 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,13 +1,27 @@ -BSD 3-clause license +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 51666f1a..5c1e8476 100644 --- a/README.md +++ b/README.md @@ -35,12 +35,26 @@ Current build status + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
VariantStatus
linux_64_numpy1.19python3.8.____73_pypypython_implpypy + + variant + +
linux_64_numpy1.19python3.8.____cpythonpython_implcpython variant
linux_64_numpy1.19python3.9.____73_pypypython_implpypy + + variant + +
linux_64_numpy1.19python3.9.____cpythonpython_implcpython @@ -55,6 +69,13 @@ Current build status variant
linux_aarch64_numpy1.19python3.8.____73_pypypython_implpypy + + variant + +
linux_aarch64_numpy1.19python3.8.____cpythonpython_implcpython @@ -62,6 +83,13 @@ Current build status variant
linux_aarch64_numpy1.19python3.9.____73_pypypython_implpypy + + variant + +
linux_aarch64_numpy1.19python3.9.____cpythonpython_implcpython @@ -76,6 +104,13 @@ Current build status variant
linux_ppc64le_numpy1.19python3.8.____73_pypypython_implpypy + + variant + +
linux_ppc64le_numpy1.19python3.8.____cpythonpython_implcpython @@ -83,6 +118,13 @@ Current build status variant
linux_ppc64le_numpy1.19python3.9.____73_pypypython_implpypy + + variant + +
linux_ppc64le_numpy1.19python3.9.____cpythonpython_implcpython @@ -97,6 +139,13 @@ Current build status variant
osx_64_numpy1.19python3.8.____73_pypypython_implpypy + + variant + +
osx_64_numpy1.19python3.8.____cpythonpython_implcpython @@ -104,6 +153,13 @@ Current build status variant
osx_64_numpy1.19python3.9.____73_pypypython_implpypy + + variant + +
osx_64_numpy1.19python3.9.____cpythonpython_implcpython @@ -139,6 +195,13 @@ Current build status variant
win_64_numpy1.19python3.8.____73_pypypython_implpypy + + variant + +
win_64_numpy1.19python3.8.____cpythonpython_implcpython @@ -146,6 +209,13 @@ Current build status variant
win_64_numpy1.19python3.9.____73_pypypython_implpypy + + variant + +
win_64_numpy1.19python3.9.____cpythonpython_implcpython diff --git a/build-locally.py b/build-locally.py index eec38a04..3f4b7a79 100755 --- a/build-locally.py +++ b/build-locally.py @@ -86,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/conda-forge.yml b/conda-forge.yml index b4e10be2..d7bbf4b5 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -3,11 +3,11 @@ azure: variables: CONDA_BLD_PATH: C:\\bld\\ build_platform: - osx_arm64: osx_64 linux_aarch64: linux_64 linux_ppc64le: linux_64 + osx_arm64: osx_64 conda_forge_output_validation: true -test_on_native_only: true github: branch_name: main tooling_branch_name: main +test_on_native_only: true diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 31972934..d19a2195 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,6 +17,8 @@ source: patches: # backport scipy/scipy#15532 to fix timeout of a long-running test - patches/0001-parametrize-test_ldl_type_size_combinations.patch + # small tweaksor too-restrictive tests to get pypy to pass + - patches/0002-test-fixes-for-pypy.patch # https://github.com/scipy/scipy/tree/v{{ version }}/scipy/_lib - git_url: https://github.com/scipy/boost-headers-only.git git_rev: 2110ce20e59917b85b12059b3ddd8b133549f662 @@ -30,7 +32,7 @@ source: folder: scipy/sparse/linalg/_propack/PROPACK build: - number: 0 + number: 2 skip: true # [py<=37] requirements: @@ -68,6 +70,8 @@ requirements: {% set tests_to_skip = "_not_a_real_test" %} # skip a test that fails with MKL + AVX512 (non-AVX512 passes) {% set tests_to_skip = tests_to_skip + " or test_x0_equals_Mb[bicgstab]" %} +# accuracy failure with AVX512 +{% set tests_to_skip = tests_to_skip + " or (TestTruncnorm and test_moments)" %} # these multithreading tests occasionally hang in emulation {% set tests_to_skip = tests_to_skip + " or test_immediate_updating" %} # [aarch64 or ppc64le] {% set tests_to_skip = tests_to_skip + " or test_mixed_threads_processes" %} # [aarch64 or ppc64le] diff --git a/recipe/patches/0001-parametrize-test_ldl_type_size_combinations.patch b/recipe/patches/0001-parametrize-test_ldl_type_size_combinations.patch index 14ef851b..91720444 100644 --- a/recipe/patches/0001-parametrize-test_ldl_type_size_combinations.patch +++ b/recipe/patches/0001-parametrize-test_ldl_type_size_combinations.patch @@ -1,7 +1,7 @@ From 8c7fb0d91f4b2b2ae7fa2430035785d6fcac35f4 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 6 Feb 2022 19:09:53 +1100 -Subject: [PATCH] * parametrize test_ldl_type_size_combinations +Subject: [PATCH 1/2] * parametrize test_ldl_type_size_combinations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -122,5 +122,5 @@ index ce6b7c05f..3f08e529a 100644 + assert_allclose(l.dot(d1).dot(l.T), x, rtol=rtol, err_msg=msg2) + assert_allclose(u.dot(d2).dot(u.T), x, rtol=rtol, err_msg=msg2) -- -2.35.3.windows.1 +2.37.0.windows.1 diff --git a/recipe/patches/0002-test-fixes-for-pypy.patch b/recipe/patches/0002-test-fixes-for-pypy.patch new file mode 100644 index 00000000..b9b26eea --- /dev/null +++ b/recipe/patches/0002-test-fixes-for-pypy.patch @@ -0,0 +1,77 @@ +From 9c0e25ad88f49e340014a9b53bef0b23deb7c385 Mon Sep 17 00:00:00 2001 +From: Matti Picus +Date: Mon, 25 Jul 2022 22:34:45 +0300 +Subject: [PATCH 2/2] test fixes for pypy + +--- + scipy/sparse/tests/test_construct.py | 4 ++-- + scipy/stats/tests/test_sampling.py | 10 ++++++++-- + 2 files changed, 10 insertions(+), 4 deletions(-) + +diff --git a/scipy/sparse/tests/test_construct.py b/scipy/sparse/tests/test_construct.py +index cfc9d0a06..9fc46ae05 100644 +--- a/scipy/sparse/tests/test_construct.py ++++ b/scipy/sparse/tests/test_construct.py +@@ -421,7 +421,7 @@ class TestConstructUtils: + + with assert_raises(ValueError) as excinfo: + construct.bmat([[A.tocsc()], [B.tocsc()]]) +- excinfo.match(r'Mismatching dimensions along axis 1: {1, 2}') ++ excinfo.match(r'Mismatching dimensions along axis 1: {[12], [12]}') + + with assert_raises(ValueError) as excinfo: + construct.bmat([[A, C]]) +@@ -429,7 +429,7 @@ class TestConstructUtils: + + with assert_raises(ValueError) as excinfo: + construct.bmat([[A.tocsr(), C.tocsr()]]) +- excinfo.match(r'Mismatching dimensions along axis 0: {1, 2}') ++ excinfo.match(r'Mismatching dimensions along axis 0: {[12], [12]}') + + with assert_raises(ValueError) as excinfo: + construct.bmat([[A.tocsc(), C.tocsc()]]) +diff --git a/scipy/stats/tests/test_sampling.py b/scipy/stats/tests/test_sampling.py +index 5dffca4cd..37b7ac443 100644 +--- a/scipy/stats/tests/test_sampling.py ++++ b/scipy/stats/tests/test_sampling.py +@@ -1,6 +1,7 @@ + import threading + import pickle + import pytest ++import sys + from copy import deepcopy + import numpy as np + from numpy.testing import assert_allclose, assert_equal, suppress_warnings +@@ -46,6 +47,11 @@ all_methods = [ + ("SimpleRatioUniforms", {"dist": StandardNormal(), "mode": 0}) + ] + ++if sys.implementation.name == 'pypy' and sys.implementation.version < (7, 3, 10): ++ # changed in PyPy for v7.3.10 ++ floaterr = r"unsupported operand type for float\(\): 'list'" ++else: ++ floaterr = r"must be real number, not list" + # Make sure an internal error occurs in UNU.RAN when invalid callbacks are + # passed. Moreover, different generators throw different error messages. + # So, in case of an `UNURANError`, we do not validate the error message. +@@ -53,7 +59,7 @@ bad_pdfs_common = [ + # Negative PDF + (lambda x: -x, UNURANError, r"..."), + # Returning wrong type +- (lambda x: [], TypeError, r"must be real number, not list"), ++ (lambda x: [], TypeError, floaterr), + # Undefined name inside the function + (lambda x: foo, NameError, r"name 'foo' is not defined"), # type: ignore[name-defined] # noqa + # Infinite value returned => Overflow error. +@@ -73,7 +79,7 @@ bad_dpdf_common = [ + # NaN value => internal error in UNU.RAN + (lambda x: np.nan, UNURANError, r"..."), + # Returning wrong type +- (lambda x: [], TypeError, r"must be real number, not list"), ++ (lambda x: [], TypeError, floaterr), + # Undefined name inside the function + (lambda x: foo, NameError, r"name 'foo' is not defined"), # type: ignore[name-defined] # noqa + # signature of dPDF wrong +-- +2.37.0.windows.1 +