diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 12e8f5a8..5da9049b 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,23 +8,26 @@ jobs: vmImage: ubuntu-16.04 strategy: matrix: - linux_numpy1.16python3.6.____cpython: - CONFIG: linux_numpy1.16python3.6.____cpython + linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.6.____cpython: + CONFIG: linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.6.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_numpy1.16python3.7.____cpython: - CONFIG: linux_numpy1.16python3.7.____cpython + linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.7.____cpython: + CONFIG: linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.7.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_numpy1.16python3.8.____cpython: - CONFIG: linux_numpy1.16python3.8.____cpython + linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.8.____cpython: + CONFIG: linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_numpy1.18python3.6.____73_pypy: - CONFIG: linux_numpy1.18python3.6.____73_pypy + linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.18python3.6.____73_pypy: + CONFIG: linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.18python3.6.____73_pypy + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: condaforge/linux-anvil-comp7 + linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.19python3.9.____cpython: + CONFIG: linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: condaforge/linux-anvil-comp7 - maxParallel: 8 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 7c00d377..a5aabb76 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,22 +5,24 @@ jobs: - job: osx pool: - vmImage: macOS-10.14 + vmImage: macOS-10.15 strategy: matrix: - osx_numpy1.16python3.6.____cpython: - CONFIG: osx_numpy1.16python3.6.____cpython + osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.16python3.6.____cpython: + CONFIG: osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.16python3.6.____cpython UPLOAD_PACKAGES: 'True' - osx_numpy1.16python3.7.____cpython: - CONFIG: osx_numpy1.16python3.7.____cpython + osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.16python3.7.____cpython: + CONFIG: osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.16python3.7.____cpython UPLOAD_PACKAGES: 'True' - osx_numpy1.16python3.8.____cpython: - CONFIG: osx_numpy1.16python3.8.____cpython + osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.16python3.8.____cpython: + CONFIG: osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.16python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_numpy1.18python3.6.____73_pypy: - CONFIG: osx_numpy1.18python3.6.____73_pypy + osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.18python3.6.____73_pypy: + CONFIG: osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.18python3.6.____73_pypy + UPLOAD_PACKAGES: 'True' + osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.19python3.9.____cpython: + CONFIG: osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' - maxParallel: 8 timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_numpy1.16python3.6.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.6.____cpython.yaml similarity index 82% rename from .ci_support/linux_numpy1.16python3.6.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.6.____cpython.yaml index c77e7e38..deca3da8 100644 --- a/.ci_support/linux_numpy1.16python3.6.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.6.____cpython.yaml @@ -30,6 +30,11 @@ pin_run_as_build: max_pin: x.x python: - 3.6.* *_cpython +target_platform: +- linux-64 zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version - - numpy - python diff --git a/.ci_support/linux_numpy1.16python3.7.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.7.____cpython.yaml similarity index 82% rename from .ci_support/linux_numpy1.16python3.7.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.7.____cpython.yaml index 949b2565..e16ec431 100644 --- a/.ci_support/linux_numpy1.16python3.7.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.7.____cpython.yaml @@ -30,6 +30,11 @@ pin_run_as_build: max_pin: x.x python: - 3.7.* *_cpython +target_platform: +- linux-64 zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version - - numpy - python diff --git a/.ci_support/linux_numpy1.16python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.8.____cpython.yaml similarity index 82% rename from .ci_support/linux_numpy1.16python3.8.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.8.____cpython.yaml index e7fc92e9..51dcf1e1 100644 --- a/.ci_support/linux_numpy1.16python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.8.____cpython.yaml @@ -30,6 +30,11 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +target_platform: +- linux-64 zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version - - numpy - python diff --git a/.ci_support/linux_numpy1.18python3.6.____73_pypy.yaml b/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.18python3.6.____73_pypy.yaml similarity index 82% rename from .ci_support/linux_numpy1.18python3.6.____73_pypy.yaml rename to .ci_support/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.18python3.6.____73_pypy.yaml index f319c48e..d12995eb 100644 --- a/.ci_support/linux_numpy1.18python3.6.____73_pypy.yaml +++ b/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.18python3.6.____73_pypy.yaml @@ -30,6 +30,11 @@ pin_run_as_build: max_pin: x.x python: - 3.6.* *_73_pypy +target_platform: +- linux-64 zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version - - numpy - python diff --git a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.19python3.9.____cpython.yaml new file mode 100644 index 00000000..176991d5 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.19python3.9.____cpython.yaml @@ -0,0 +1,40 @@ +c_compiler: +- gcc +c_compiler_version: +- '7' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '7' +docker_image: +- condaforge/linux-anvil-comp7 +fortran_compiler: +- gfortran +fortran_compiler_version: +- '7' +libblas: +- 3.8 *netlib +libcblas: +- 3.8 *netlib +liblapack: +- 3.8.0 *netlib +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version +- - numpy + - python diff --git a/.ci_support/linux_aarch64_numpy1.16python3.6.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.6.____cpython.yaml similarity index 83% rename from .ci_support/linux_aarch64_numpy1.16python3.6.____cpython.yaml rename to .ci_support/linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.6.____cpython.yaml index 69714bbb..9e815602 100644 --- a/.ci_support/linux_aarch64_numpy1.16python3.6.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.6.____cpython.yaml @@ -36,6 +36,11 @@ pin_run_as_build: max_pin: x.x python: - 3.6.* *_cpython +target_platform: +- linux-aarch64 zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version - - numpy - python diff --git a/.ci_support/linux_aarch64_numpy1.16python3.7.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.7.____cpython.yaml similarity index 83% rename from .ci_support/linux_aarch64_numpy1.16python3.7.____cpython.yaml rename to .ci_support/linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.7.____cpython.yaml index 3428000b..fc38ff0d 100644 --- a/.ci_support/linux_aarch64_numpy1.16python3.7.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.7.____cpython.yaml @@ -36,6 +36,11 @@ pin_run_as_build: max_pin: x.x python: - 3.7.* *_cpython +target_platform: +- linux-aarch64 zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version - - numpy - python diff --git a/.ci_support/linux_aarch64_numpy1.16python3.8.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.8.____cpython.yaml similarity index 83% rename from .ci_support/linux_aarch64_numpy1.16python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.8.____cpython.yaml index 22bcd440..6c095c8b 100644 --- a/.ci_support/linux_aarch64_numpy1.16python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.8.____cpython.yaml @@ -36,6 +36,11 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +target_platform: +- linux-aarch64 zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version - - numpy - python diff --git a/.ci_support/linux_aarch64_numpy1.18python3.6.____73_pypy.yaml b/.ci_support/linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.18python3.6.____73_pypy.yaml similarity index 83% rename from .ci_support/linux_aarch64_numpy1.18python3.6.____73_pypy.yaml rename to .ci_support/linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.18python3.6.____73_pypy.yaml index 953384b8..8982da79 100644 --- a/.ci_support/linux_aarch64_numpy1.18python3.6.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.18python3.6.____73_pypy.yaml @@ -36,6 +36,11 @@ pin_run_as_build: max_pin: x.x python: - 3.6.* *_73_pypy +target_platform: +- linux-aarch64 zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version - - numpy - python diff --git a/.ci_support/linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.19python3.9.____cpython.yaml new file mode 100644 index 00000000..55e0f9b3 --- /dev/null +++ b/.ci_support/linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.19python3.9.____cpython.yaml @@ -0,0 +1,46 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '7' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '7' +docker_image: +- condaforge/linux-anvil-aarch64 +fortran_compiler: +- gfortran +fortran_compiler_version: +- '7' +libblas: +- 3.8 *netlib +libcblas: +- 3.8 *netlib +liblapack: +- 3.8.0 *netlib +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +target_platform: +- linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version +- - numpy + - python diff --git a/.ci_support/linux_ppc64le_numpy1.16python3.6.____cpython.yaml b/.ci_support/linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.16python3.6.____cpython.yaml similarity index 81% rename from .ci_support/linux_ppc64le_numpy1.16python3.6.____cpython.yaml rename to .ci_support/linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.16python3.6.____cpython.yaml index aeabe8e9..d83ac930 100644 --- a/.ci_support/linux_ppc64le_numpy1.16python3.6.____cpython.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.16python3.6.____cpython.yaml @@ -30,6 +30,11 @@ pin_run_as_build: max_pin: x.x python: - 3.6.* *_cpython +target_platform: +- linux-ppc64le zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version - - numpy - python diff --git a/.ci_support/linux_ppc64le_numpy1.16python3.7.____cpython.yaml b/.ci_support/linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.16python3.7.____cpython.yaml similarity index 81% rename from .ci_support/linux_ppc64le_numpy1.16python3.7.____cpython.yaml rename to .ci_support/linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.16python3.7.____cpython.yaml index c2468e2e..bf0e61b9 100644 --- a/.ci_support/linux_ppc64le_numpy1.16python3.7.____cpython.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.16python3.7.____cpython.yaml @@ -30,6 +30,11 @@ pin_run_as_build: max_pin: x.x python: - 3.7.* *_cpython +target_platform: +- linux-ppc64le zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version - - numpy - python diff --git a/.ci_support/linux_ppc64le_numpy1.16python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.16python3.8.____cpython.yaml similarity index 81% rename from .ci_support/linux_ppc64le_numpy1.16python3.8.____cpython.yaml rename to .ci_support/linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.16python3.8.____cpython.yaml index 0213c171..896bd3d1 100644 --- a/.ci_support/linux_ppc64le_numpy1.16python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.16python3.8.____cpython.yaml @@ -30,6 +30,11 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +target_platform: +- linux-ppc64le zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version - - numpy - python diff --git a/.ci_support/linux_ppc64le_numpy1.18python3.6.____73_pypy.yaml b/.ci_support/linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.18python3.6.____73_pypy.yaml similarity index 81% rename from .ci_support/linux_ppc64le_numpy1.18python3.6.____73_pypy.yaml rename to .ci_support/linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.18python3.6.____73_pypy.yaml index 8e09ded8..302daabe 100644 --- a/.ci_support/linux_ppc64le_numpy1.18python3.6.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.18python3.6.____73_pypy.yaml @@ -30,6 +30,11 @@ pin_run_as_build: max_pin: x.x python: - 3.6.* *_73_pypy +target_platform: +- linux-ppc64le zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version - - numpy - python diff --git a/.ci_support/linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.19python3.9.____cpython.yaml new file mode 100644 index 00000000..f9fa32a1 --- /dev/null +++ b/.ci_support/linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.19python3.9.____cpython.yaml @@ -0,0 +1,40 @@ +c_compiler: +- gcc +c_compiler_version: +- '8' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '8' +docker_image: +- condaforge/linux-anvil-ppc64le +fortran_compiler: +- gfortran +fortran_compiler_version: +- '8' +libblas: +- 3.8 *netlib +libcblas: +- 3.8 *netlib +liblapack: +- 3.8.0 *netlib +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +target_platform: +- linux-ppc64le +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version +- - numpy + - python diff --git a/.ci_support/migrations/python38.yaml b/.ci_support/migrations/python38.yaml deleted file mode 100644 index b11022c6..00000000 --- a/.ci_support/migrations/python38.yaml +++ /dev/null @@ -1,55 +0,0 @@ -migrator_ts: 1569538102 # The timestamp of when the migration was made -__migrator: - kind: - version - exclude: - - c_compiler - - vc - - cxx_compiler - migration_number: # Only use this if the bot messes up, putting this in will cause a complete rerun of the migration - 1 - bump_number: 0 - -python: - - 2.7 - - 3.6 - - 3.7 - - 3.8 - -c_compiler: - # legacy compilers for things that refuse to move - - toolchain_c # [(linux64 or osx) and (environ.get('CF_COMPILER_STACK') == 'comp4')] - # modern compilers - - gcc # [linux64] - - clang # [osx] - # non-standard arches get built with gcc - - gcc # [aarch64] - - gcc # [ppc64le] - - gcc # [armv7l] - - - vs2008 # [win] - - vs2015 # [win] - - vs2015 # [win] - - vs2015 # [win] - -cxx_compiler: - # legacy compilers for things that refuse to move - - toolchain_cxx # [(linux64 or osx) and (environ.get('CF_COMPILER_STACK') == 'comp4')] - # modern compilers - - gxx # [linux64] - - clangxx # [osx] - - - gxx # [aarch64] - - gxx # [ppc64le] - - gxx # [armv7l] - - - vs2008 # [win] - - vs2015 # [win] - - vs2015 # [win] - - vs2015 # [win] - -vc: # [win] - - 9 # [win] - - 14 # [win] - - 14 # [win] - - 14 # [win] diff --git a/.ci_support/migrations/python39.yaml b/.ci_support/migrations/python39.yaml new file mode 100644 index 00000000..4b17960f --- /dev/null +++ b/.ci_support/migrations/python39.yaml @@ -0,0 +1,20 @@ +migrator_ts: 1602104489 +__migrator: + migration_number: 2 + operation: key_add + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython # new entry + - 3.6.* *_73_pypy + paused: false +python: + - 3.9.* *_cpython +# additional entries to add for zip_keys +numpy: + - 1.19 +python_impl: + - cpython diff --git a/.ci_support/osx_numpy1.16python3.6.____cpython.yaml b/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.16python3.6.____cpython.yaml similarity index 83% rename from .ci_support/osx_numpy1.16python3.6.____cpython.yaml rename to .ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.16python3.6.____cpython.yaml index 2eb17b9b..0e26394f 100644 --- a/.ci_support/osx_numpy1.16python3.6.____cpython.yaml +++ b/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.16python3.6.____cpython.yaml @@ -24,8 +24,6 @@ liblapack: - 3.8.0 *netlib macos_machine: - x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' numpy: - '1.16' pin_run_as_build: @@ -34,6 +32,11 @@ pin_run_as_build: max_pin: x.x python: - 3.6.* *_cpython +target_platform: +- osx-64 zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version - - numpy - python diff --git a/.ci_support/osx_numpy1.16python3.7.____cpython.yaml b/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.16python3.7.____cpython.yaml similarity index 83% rename from .ci_support/osx_numpy1.16python3.7.____cpython.yaml rename to .ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.16python3.7.____cpython.yaml index 7f07fdee..76cef708 100644 --- a/.ci_support/osx_numpy1.16python3.7.____cpython.yaml +++ b/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.16python3.7.____cpython.yaml @@ -24,8 +24,6 @@ liblapack: - 3.8.0 *netlib macos_machine: - x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' numpy: - '1.16' pin_run_as_build: @@ -34,6 +32,11 @@ pin_run_as_build: max_pin: x.x python: - 3.7.* *_cpython +target_platform: +- osx-64 zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version - - numpy - python diff --git a/.ci_support/osx_numpy1.16python3.8.____cpython.yaml b/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.16python3.8.____cpython.yaml similarity index 83% rename from .ci_support/osx_numpy1.16python3.8.____cpython.yaml rename to .ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.16python3.8.____cpython.yaml index 6bcc0269..d5ae8642 100644 --- a/.ci_support/osx_numpy1.16python3.8.____cpython.yaml +++ b/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.16python3.8.____cpython.yaml @@ -24,8 +24,6 @@ liblapack: - 3.8.0 *netlib macos_machine: - x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' numpy: - '1.16' pin_run_as_build: @@ -34,6 +32,11 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +target_platform: +- osx-64 zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version - - numpy - python diff --git a/.ci_support/osx_numpy1.18python3.6.____73_pypy.yaml b/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.18python3.6.____73_pypy.yaml similarity index 83% rename from .ci_support/osx_numpy1.18python3.6.____73_pypy.yaml rename to .ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.18python3.6.____73_pypy.yaml index 3bee2dce..48d40c86 100644 --- a/.ci_support/osx_numpy1.18python3.6.____73_pypy.yaml +++ b/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.18python3.6.____73_pypy.yaml @@ -24,8 +24,6 @@ liblapack: - 3.8.0 *netlib macos_machine: - x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' numpy: - '1.18' pin_run_as_build: @@ -34,6 +32,11 @@ pin_run_as_build: max_pin: x.x python: - 3.6.* *_73_pypy +target_platform: +- osx-64 zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version - - numpy - python diff --git a/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.19python3.9.____cpython.yaml b/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.19python3.9.____cpython.yaml new file mode 100644 index 00000000..9fb7729c --- /dev/null +++ b/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.19python3.9.____cpython.yaml @@ -0,0 +1,42 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '10' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '10' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '7' +libblas: +- 3.8 *netlib +libcblas: +- 3.8 *netlib +liblapack: +- 3.8.0 *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.* *_cpython +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version +- - numpy + - python diff --git a/.drone.yml b/.drone.yml index 26ac44d6..6382cdea 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ --- kind: pipeline -name: linux_aarch64_numpy1.16python3.6.____cpython +name: linux_aarch64_c_compiler_version7cx_h492a3a7853 platform: os: linux @@ -10,7 +10,7 @@ steps: - name: Install and build image: condaforge/linux-anvil-aarch64 environment: - CONFIG: linux_aarch64_numpy1.16python3.6.____cpython + CONFIG: linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.6.____cpython UPLOAD_PACKAGES: True PLATFORM: linux-aarch64 BINSTAR_TOKEN: @@ -31,7 +31,7 @@ steps: --- kind: pipeline -name: linux_aarch64_numpy1.16python3.7.____cpython +name: linux_aarch64_c_compiler_version7cx_hdc2e0575f5 platform: os: linux @@ -41,7 +41,7 @@ steps: - name: Install and build image: condaforge/linux-anvil-aarch64 environment: - CONFIG: linux_aarch64_numpy1.16python3.7.____cpython + CONFIG: linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.7.____cpython UPLOAD_PACKAGES: True PLATFORM: linux-aarch64 BINSTAR_TOKEN: @@ -62,7 +62,7 @@ steps: --- kind: pipeline -name: linux_aarch64_numpy1.16python3.8.____cpython +name: linux_aarch64_c_compiler_version7cx_hc9f38ab8cd platform: os: linux @@ -72,7 +72,7 @@ steps: - name: Install and build image: condaforge/linux-anvil-aarch64 environment: - CONFIG: linux_aarch64_numpy1.16python3.8.____cpython + CONFIG: linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.8.____cpython UPLOAD_PACKAGES: True PLATFORM: linux-aarch64 BINSTAR_TOKEN: @@ -93,7 +93,7 @@ steps: --- kind: pipeline -name: linux_aarch64_numpy1.18python3.6.____73_pypy +name: linux_aarch64_c_compiler_version7cx_h28975f905a platform: os: linux @@ -103,7 +103,38 @@ steps: - name: Install and build image: condaforge/linux-anvil-aarch64 environment: - CONFIG: linux_aarch64_numpy1.18python3.6.____73_pypy + CONFIG: linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.18python3.6.____73_pypy + UPLOAD_PACKAGES: True + PLATFORM: linux-aarch64 + BINSTAR_TOKEN: + from_secret: BINSTAR_TOKEN + FEEDSTOCK_TOKEN: + from_secret: FEEDSTOCK_TOKEN + STAGING_BINSTAR_TOKEN: + from_secret: STAGING_BINSTAR_TOKEN + commands: + - export FEEDSTOCK_ROOT="$DRONE_WORKSPACE" + - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" + - export CI=drone + - export GIT_BRANCH="$DRONE_BRANCH" + - export FEEDSTOCK_NAME=$(basename ${DRONE_REPO_NAME}) + - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint + - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.scripts/build_steps.sh + - echo "Done building" + +--- +kind: pipeline +name: linux_aarch64_c_compiler_version7cx_h179d4776e2 + +platform: + os: linux + arch: arm64 + +steps: +- name: Install and build + image: condaforge/linux-anvil-aarch64 + environment: + CONFIG: linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.19python3.9.____cpython UPLOAD_PACKAGES: True PLATFORM: linux-aarch64 BINSTAR_TOKEN: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 0d5ef1c1..aa9727b9 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -19,7 +19,7 @@ conda-build: CONDARC -conda install --yes --quiet conda-forge-ci-setup=3 conda-build pip -c conda-forge +conda install --yes --quiet "conda-forge-ci-setup=3" conda-build pip -c conda-forge # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -29,13 +29,25 @@ source run_conda_forge_build_setup # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" -conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ - --suppress-variables \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" -validate_recipe_outputs "${FEEDSTOCK_NAME}" -if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then - upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" +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_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + ${EXTRA_CB_OPTIONS:-} \ + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + # Drop into an interactive shell + /bin/bash +else + conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + --suppress-variables ${EXTRA_CB_OPTIONS:-} \ + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + validate_recipe_outputs "${FEEDSTOCK_NAME}" + + if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then + upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" + fi fi touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index e4d5baba..87ba4db0 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -74,6 +74,8 @@ docker run ${DOCKER_RUN_ARGS} \ -e CI \ -e FEEDSTOCK_NAME \ -e CPU_COUNT \ + -e BUILD_WITH_CONDA_DEBUG \ + -e BUILD_OUTPUT_ID \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index d7e3c065..c299b792 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,7 +23,7 @@ source ${HOME}/miniforge3/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 +conda install -n base --quiet --yes "conda-forge-ci-setup=3" conda-build pip @@ -47,7 +47,8 @@ set -e echo -e "\n\nMaking the build clobber file and running the build." make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml -conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + +conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} validate_recipe_outputs "${FEEDSTOCK_NAME}" if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then diff --git a/.travis.yml b/.travis.yml index 3b54ce30..1c9173e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,26 +3,27 @@ language: generic -env: - global: - # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. - - secure: "wTJ9vxR5vcp4wnsHFGDLdWMPYk8loSpqM0/xat1by0NzDu6X2Dgpe16WlywRXCTh2ROj6FDNxrCSyzrGRCrU+OK13GIG/Ad6+zMVV2fsQpTCfoSVP03NJq3NdNT5ZOuu2r1GMfyM1LKD3+AuU3oBB9URlg5aS1pfujmVZ7ZiSNjZA7EFWsEwN4LSGtJPIclai7TJYAXfGw5G15KXglZmtnZiBf5C0LNdh92nN/TA5YTxsDVpftmXljw7xgIM+AguAXEQT5KIEFZ8wIcl3NF7y/H2gOC6BQsR79SOorl12aEmrMmCYUS0aQl5Mj1b6zKomTC2TwZef/Ol0gskjCHzuS7Uxnuwl4yQ0GVqt13wvTPeN0Y6aps/4Zje3VX9dJc7Zb7GptouB80iiZnQB08zcyzr2uwsVqMHM0ikDcoMB2v93nJimgm7mwUxyUnSwDPJpQy81d7DiWMK3WxDfRzeblJwHAMqnT9sStCIfDwRkNDF1xJ9l9O/9EJIvhEQb6dQ2wuMDsSEEQfe/++L7J/6XfNdQo78/X9GoGWBQKRlAoPngt6X2BKn6FX7wrVTFX7psu5FXbNU8Vhxiy8IXuzs+x9UNEVRv2XyWSHUFKhfbwTQLglD8Lh0JO6rL/it7P1G0wwcF4L5ahruLLRBIQQHHMfeRzBwDbg7s0JYt/oN1Qo=" + matrix: include: - - env: CONFIG=linux_ppc64le_numpy1.16python3.6.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.16python3.6.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + + - env: CONFIG=linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.16python3.7.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le os: linux arch: ppc64le - - env: CONFIG=linux_ppc64le_numpy1.16python3.7.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.16python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le os: linux arch: ppc64le - - env: CONFIG=linux_ppc64le_numpy1.16python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.18python3.6.____73_pypy UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le os: linux arch: ppc64le - - env: CONFIG=linux_ppc64le_numpy1.18python3.6.____73_pypy UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.19python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le os: linux arch: ppc64le diff --git a/LICENSE.txt b/LICENSE.txt index cba42cff..5f302793 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ BSD 3-clause license -Copyright (c) 2015-2019, conda-forge +Copyright (c) 2015-2020, 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: diff --git a/README.md b/README.md index 1f09e30d..78e7f86d 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,14 @@ Home: http://www.scipy.org/ Package license: BSD-3-Clause -Feedstock license: BSD-3-Clause +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/scipy-feedstock/blob/master/LICENSE.txt) Summary: Scientific Library for Python +Development: https://github.com/scipy/scipy + +Documentation: http://www.scipy.org/docs.html + SciPy is a Python-based ecosystem of open-source software for mathematics, science, and engineering. @@ -45,115 +49,143 @@ Current build status
Variant | Status | |
---|---|---|
linux_aarch64_numpy1.16python3.6.____cpython | +linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.6.____cpython | ++ + + + | +
linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.7.____cpython | ++ + + + | +|
linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.8.____cpython | ++ + + + | +|
linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.18python3.6.____73_pypy | - + | |
linux_aarch64_numpy1.16python3.7.____cpython | +linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.19python3.9.____cpython | - + |
linux_aarch64_numpy1.16python3.8.____cpython | +linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.6.____cpython | - + |
linux_aarch64_numpy1.18python3.6.____73_pypy | +linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.7.____cpython | - + |
linux_numpy1.16python3.6.____cpython | +linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.16python3.8.____cpython | - + |
linux_numpy1.16python3.7.____cpython | +linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.18python3.6.____73_pypy | - + |
linux_numpy1.16python3.8.____cpython | +linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7numpy1.19python3.9.____cpython | - + |
linux_numpy1.18python3.6.____73_pypy | +linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.16python3.6.____cpython | - + |
linux_ppc64le_numpy1.16python3.6.____cpython | +linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.16python3.7.____cpython | - + |
linux_ppc64le_numpy1.16python3.7.____cpython | +linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.16python3.8.____cpython | - + |
linux_ppc64le_numpy1.16python3.8.____cpython | +linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.18python3.6.____73_pypy | - + |
linux_ppc64le_numpy1.18python3.6.____73_pypy | +linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8numpy1.19python3.9.____cpython | - + |
osx_numpy1.16python3.6.____cpython | +osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.16python3.6.____cpython | - + |
osx_numpy1.16python3.7.____cpython | +osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.16python3.7.____cpython | - + |
osx_numpy1.16python3.8.____cpython | +osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.16python3.8.____cpython | - + |
osx_numpy1.18python3.6.____73_pypy | +osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.18python3.6.____73_pypy | - + + + | +
osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7numpy1.19python3.9.____cpython | ++ + | |
Windows | -- - | -