diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index cc67b3c..a21dfd3 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -10,40 +10,16 @@ jobs: strategy: maxParallel: 8 matrix: - linux_blas_implblispython3.6.____cpython: - CONFIG: linux_blas_implblispython3.6.____cpython + linux_python3.6.____cpython: + CONFIG: linux_python3.6.____cpython UPLOAD_PACKAGES: True DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_blas_implblispython3.7.____cpython: - CONFIG: linux_blas_implblispython3.7.____cpython + linux_python3.7.____cpython: + CONFIG: linux_python3.7.____cpython UPLOAD_PACKAGES: True DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_blas_implblispython3.8.____cpython: - CONFIG: linux_blas_implblispython3.8.____cpython - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_blas_implmklpython3.6.____cpython: - CONFIG: linux_blas_implmklpython3.6.____cpython - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_blas_implmklpython3.7.____cpython: - CONFIG: linux_blas_implmklpython3.7.____cpython - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_blas_implmklpython3.8.____cpython: - CONFIG: linux_blas_implmklpython3.8.____cpython - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_blas_implopenblaspython3.6.____cpython: - CONFIG: linux_blas_implopenblaspython3.6.____cpython - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_blas_implopenblaspython3.7.____cpython: - CONFIG: linux_blas_implopenblaspython3.7.____cpython - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_blas_implopenblaspython3.8.____cpython: - CONFIG: linux_blas_implopenblaspython3.8.____cpython + linux_python3.8.____cpython: + CONFIG: linux_python3.8.____cpython UPLOAD_PACKAGES: True DOCKER_IMAGE: condaforge/linux-anvil-comp7 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 38dc563..e864659 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -10,32 +10,14 @@ jobs: strategy: maxParallel: 8 matrix: - osx_blas_implblispython3.6.____cpython: - CONFIG: osx_blas_implblispython3.6.____cpython + osx_python3.6.____cpython: + CONFIG: osx_python3.6.____cpython UPLOAD_PACKAGES: True - osx_blas_implblispython3.7.____cpython: - CONFIG: osx_blas_implblispython3.7.____cpython + osx_python3.7.____cpython: + CONFIG: osx_python3.7.____cpython UPLOAD_PACKAGES: True - osx_blas_implblispython3.8.____cpython: - CONFIG: osx_blas_implblispython3.8.____cpython - UPLOAD_PACKAGES: True - osx_blas_implmklpython3.6.____cpython: - CONFIG: osx_blas_implmklpython3.6.____cpython - UPLOAD_PACKAGES: True - osx_blas_implmklpython3.7.____cpython: - CONFIG: osx_blas_implmklpython3.7.____cpython - UPLOAD_PACKAGES: True - osx_blas_implmklpython3.8.____cpython: - CONFIG: osx_blas_implmklpython3.8.____cpython - UPLOAD_PACKAGES: True - osx_blas_implopenblaspython3.6.____cpython: - CONFIG: osx_blas_implopenblaspython3.6.____cpython - UPLOAD_PACKAGES: True - osx_blas_implopenblaspython3.7.____cpython: - CONFIG: osx_blas_implopenblaspython3.7.____cpython - UPLOAD_PACKAGES: True - osx_blas_implopenblaspython3.8.____cpython: - CONFIG: osx_blas_implopenblaspython3.8.____cpython + osx_python3.8.____cpython: + CONFIG: osx_python3.8.____cpython UPLOAD_PACKAGES: True steps: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index a1492e4..405ce5a 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -10,6 +10,18 @@ jobs: strategy: maxParallel: 4 matrix: + win_blas_implblispython3.6.____cpython: + CONFIG: win_blas_implblispython3.6.____cpython + CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_PACKAGES: True + win_blas_implblispython3.7.____cpython: + CONFIG: win_blas_implblispython3.7.____cpython + CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_PACKAGES: True + win_blas_implblispython3.8.____cpython: + CONFIG: win_blas_implblispython3.8.____cpython + CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_PACKAGES: True win_blas_implmklpython3.6.____cpython: CONFIG: win_blas_implmklpython3.6.____cpython CONDA_BLD_PATH: D:\\bld\\ @@ -22,6 +34,18 @@ jobs: CONFIG: win_blas_implmklpython3.8.____cpython CONDA_BLD_PATH: D:\\bld\\ UPLOAD_PACKAGES: True + win_blas_implopenblaspython3.6.____cpython: + CONFIG: win_blas_implopenblaspython3.6.____cpython + CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_PACKAGES: True + win_blas_implopenblaspython3.7.____cpython: + CONFIG: win_blas_implopenblaspython3.7.____cpython + CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_PACKAGES: True + win_blas_implopenblaspython3.8.____cpython: + CONFIG: win_blas_implopenblaspython3.8.____cpython + CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_PACKAGES: True steps: # TODO: Fast finish on azure pipelines? - script: | diff --git a/.ci_support/linux_aarch64_python3.6.____cpython.yaml b/.ci_support/linux_aarch64_python3.6.____cpython.yaml index 741adbc..d61d0f1 100644 --- a/.ci_support/linux_aarch64_python3.6.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.6.____cpython.yaml @@ -1,7 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -blas_impl: -- openblas c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_aarch64_python3.7.____cpython.yaml b/.ci_support/linux_aarch64_python3.7.____cpython.yaml index 13f33ff..cd10148 100644 --- a/.ci_support/linux_aarch64_python3.7.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.7.____cpython.yaml @@ -1,7 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -blas_impl: -- openblas c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpython.yaml index 394c7df..ea1c8a3 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.8.____cpython.yaml @@ -1,7 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -blas_impl: -- openblas c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_ppc64le_python3.6.____cpython.yaml b/.ci_support/linux_ppc64le_python3.6.____cpython.yaml index 5d54ab3..b5b188b 100644 --- a/.ci_support/linux_ppc64le_python3.6.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.6.____cpython.yaml @@ -1,5 +1,3 @@ -blas_impl: -- openblas c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_ppc64le_python3.7.____cpython.yaml b/.ci_support/linux_ppc64le_python3.7.____cpython.yaml index a9b3ed7..c35d82e 100644 --- a/.ci_support/linux_ppc64le_python3.7.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.7.____cpython.yaml @@ -1,5 +1,3 @@ -blas_impl: -- openblas c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml index 0bdd7a9..7673dbd 100644 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml @@ -1,5 +1,3 @@ -blas_impl: -- openblas c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_blas_implmklpython3.6.____cpython.yaml b/.ci_support/linux_python3.6.____cpython.yaml similarity index 96% rename from .ci_support/linux_blas_implmklpython3.6.____cpython.yaml rename to .ci_support/linux_python3.6.____cpython.yaml index c75670c..c26567a 100644 --- a/.ci_support/linux_blas_implmklpython3.6.____cpython.yaml +++ b/.ci_support/linux_python3.6.____cpython.yaml @@ -1,5 +1,3 @@ -blas_impl: -- mkl c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_blas_implmklpython3.7.____cpython.yaml b/.ci_support/linux_python3.7.____cpython.yaml similarity index 96% rename from .ci_support/linux_blas_implmklpython3.7.____cpython.yaml rename to .ci_support/linux_python3.7.____cpython.yaml index 9dd0e5f..2cb09f5 100644 --- a/.ci_support/linux_blas_implmklpython3.7.____cpython.yaml +++ b/.ci_support/linux_python3.7.____cpython.yaml @@ -1,5 +1,3 @@ -blas_impl: -- mkl c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_blas_implmklpython3.8.____cpython.yaml b/.ci_support/linux_python3.8.____cpython.yaml similarity index 96% rename from .ci_support/linux_blas_implmklpython3.8.____cpython.yaml rename to .ci_support/linux_python3.8.____cpython.yaml index 1df434f..c746260 100644 --- a/.ci_support/linux_blas_implmklpython3.8.____cpython.yaml +++ b/.ci_support/linux_python3.8.____cpython.yaml @@ -1,5 +1,3 @@ -blas_impl: -- mkl c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/osx_blas_implblispython3.6.____cpython.yaml b/.ci_support/osx_blas_implblispython3.6.____cpython.yaml deleted file mode 100644 index 608f944..0000000 --- a/.ci_support/osx_blas_implblispython3.6.____cpython.yaml +++ /dev/null @@ -1,38 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -blas_impl: -- blis -c_compiler: -- clang -c_compiler_version: -- '9' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -fftw: -- '3' -glpk: -- '4.65' -gsl: -- '2.6' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -pin_run_as_build: - fftw: - max_pin: x - glpk: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython -suitesparse: -- '5.6' diff --git a/.ci_support/osx_blas_implblispython3.7.____cpython.yaml b/.ci_support/osx_blas_implblispython3.7.____cpython.yaml deleted file mode 100644 index 8963ab0..0000000 --- a/.ci_support/osx_blas_implblispython3.7.____cpython.yaml +++ /dev/null @@ -1,38 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -blas_impl: -- blis -c_compiler: -- clang -c_compiler_version: -- '9' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -fftw: -- '3' -glpk: -- '4.65' -gsl: -- '2.6' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -pin_run_as_build: - fftw: - max_pin: x - glpk: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_cpython -suitesparse: -- '5.6' diff --git a/.ci_support/osx_blas_implblispython3.8.____cpython.yaml b/.ci_support/osx_blas_implblispython3.8.____cpython.yaml deleted file mode 100644 index e491c13..0000000 --- a/.ci_support/osx_blas_implblispython3.8.____cpython.yaml +++ /dev/null @@ -1,38 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -blas_impl: -- blis -c_compiler: -- clang -c_compiler_version: -- '9' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -fftw: -- '3' -glpk: -- '4.65' -gsl: -- '2.6' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -pin_run_as_build: - fftw: - max_pin: x - glpk: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -suitesparse: -- '5.6' diff --git a/.ci_support/osx_blas_implopenblaspython3.6.____cpython.yaml b/.ci_support/osx_blas_implopenblaspython3.6.____cpython.yaml deleted file mode 100644 index 4a1206d..0000000 --- a/.ci_support/osx_blas_implopenblaspython3.6.____cpython.yaml +++ /dev/null @@ -1,38 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -blas_impl: -- openblas -c_compiler: -- clang -c_compiler_version: -- '9' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -fftw: -- '3' -glpk: -- '4.65' -gsl: -- '2.6' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -pin_run_as_build: - fftw: - max_pin: x - glpk: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython -suitesparse: -- '5.6' diff --git a/.ci_support/osx_blas_implopenblaspython3.7.____cpython.yaml b/.ci_support/osx_blas_implopenblaspython3.7.____cpython.yaml deleted file mode 100644 index 8e72f2d..0000000 --- a/.ci_support/osx_blas_implopenblaspython3.7.____cpython.yaml +++ /dev/null @@ -1,38 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -blas_impl: -- openblas -c_compiler: -- clang -c_compiler_version: -- '9' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -fftw: -- '3' -glpk: -- '4.65' -gsl: -- '2.6' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -pin_run_as_build: - fftw: - max_pin: x - glpk: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_cpython -suitesparse: -- '5.6' diff --git a/.ci_support/osx_blas_implopenblaspython3.8.____cpython.yaml b/.ci_support/osx_blas_implopenblaspython3.8.____cpython.yaml deleted file mode 100644 index 9f34cd4..0000000 --- a/.ci_support/osx_blas_implopenblaspython3.8.____cpython.yaml +++ /dev/null @@ -1,38 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -blas_impl: -- openblas -c_compiler: -- clang -c_compiler_version: -- '9' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -fftw: -- '3' -glpk: -- '4.65' -gsl: -- '2.6' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -pin_run_as_build: - fftw: - max_pin: x - glpk: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -suitesparse: -- '5.6' diff --git a/.ci_support/osx_blas_implmklpython3.6.____cpython.yaml b/.ci_support/osx_python3.6.____cpython.yaml similarity index 96% rename from .ci_support/osx_blas_implmklpython3.6.____cpython.yaml rename to .ci_support/osx_python3.6.____cpython.yaml index 4d7a324..337066c 100644 --- a/.ci_support/osx_blas_implmklpython3.6.____cpython.yaml +++ b/.ci_support/osx_python3.6.____cpython.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -blas_impl: -- mkl c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_blas_implmklpython3.7.____cpython.yaml b/.ci_support/osx_python3.7.____cpython.yaml similarity index 96% rename from .ci_support/osx_blas_implmklpython3.7.____cpython.yaml rename to .ci_support/osx_python3.7.____cpython.yaml index 30cf1f8..71a8bc6 100644 --- a/.ci_support/osx_blas_implmklpython3.7.____cpython.yaml +++ b/.ci_support/osx_python3.7.____cpython.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -blas_impl: -- mkl c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_blas_implmklpython3.8.____cpython.yaml b/.ci_support/osx_python3.8.____cpython.yaml similarity index 96% rename from .ci_support/osx_blas_implmklpython3.8.____cpython.yaml rename to .ci_support/osx_python3.8.____cpython.yaml index 2cedb48..cfa7e7c 100644 --- a/.ci_support/osx_blas_implmklpython3.8.____cpython.yaml +++ b/.ci_support/osx_python3.8.____cpython.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -blas_impl: -- mkl c_compiler: - clang c_compiler_version: diff --git a/.ci_support/linux_blas_implblispython3.6.____cpython.yaml b/.ci_support/win_blas_implblispython3.6.____cpython.yaml similarity index 82% rename from .ci_support/linux_blas_implblispython3.6.____cpython.yaml rename to .ci_support/win_blas_implblispython3.6.____cpython.yaml index 14a044d..b8a8184 100644 --- a/.ci_support/linux_blas_implblispython3.6.____cpython.yaml +++ b/.ci_support/win_blas_implblispython3.6.____cpython.yaml @@ -1,15 +1,11 @@ blas_impl: - blis c_compiler: -- gcc -c_compiler_version: -- '7' +- vs2015 channel_sources: - conda-forge,defaults channel_targets: - conda-forge main -docker_image: -- condaforge/linux-anvil-comp7 fftw: - '3' glpk: diff --git a/.ci_support/linux_blas_implblispython3.7.____cpython.yaml b/.ci_support/win_blas_implblispython3.7.____cpython.yaml similarity index 82% rename from .ci_support/linux_blas_implblispython3.7.____cpython.yaml rename to .ci_support/win_blas_implblispython3.7.____cpython.yaml index 8d11624..71d1a39 100644 --- a/.ci_support/linux_blas_implblispython3.7.____cpython.yaml +++ b/.ci_support/win_blas_implblispython3.7.____cpython.yaml @@ -1,15 +1,11 @@ blas_impl: - blis c_compiler: -- gcc -c_compiler_version: -- '7' +- vs2015 channel_sources: - conda-forge,defaults channel_targets: - conda-forge main -docker_image: -- condaforge/linux-anvil-comp7 fftw: - '3' glpk: diff --git a/.ci_support/linux_blas_implblispython3.8.____cpython.yaml b/.ci_support/win_blas_implblispython3.8.____cpython.yaml similarity index 82% rename from .ci_support/linux_blas_implblispython3.8.____cpython.yaml rename to .ci_support/win_blas_implblispython3.8.____cpython.yaml index 5905ad6..04b12be 100644 --- a/.ci_support/linux_blas_implblispython3.8.____cpython.yaml +++ b/.ci_support/win_blas_implblispython3.8.____cpython.yaml @@ -1,15 +1,11 @@ blas_impl: - blis c_compiler: -- gcc -c_compiler_version: -- '7' +- vs2015 channel_sources: - conda-forge,defaults channel_targets: - conda-forge main -docker_image: -- condaforge/linux-anvil-comp7 fftw: - '3' glpk: diff --git a/.ci_support/win_blas_implmklpython3.6.____cpython.yaml b/.ci_support/win_blas_implmklpython3.6.____cpython.yaml index 0b0bb62..e47d512 100644 --- a/.ci_support/win_blas_implmklpython3.6.____cpython.yaml +++ b/.ci_support/win_blas_implmklpython3.6.____cpython.yaml @@ -16,15 +16,11 @@ libblas: - 3.8 *netlib liblapack: - 3.8.0 *netlib -mkl: -- '2019' pin_run_as_build: fftw: max_pin: x glpk: max_pin: x.x - mkl: - max_pin: x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/win_blas_implmklpython3.7.____cpython.yaml b/.ci_support/win_blas_implmklpython3.7.____cpython.yaml index fe5f942..760a134 100644 --- a/.ci_support/win_blas_implmklpython3.7.____cpython.yaml +++ b/.ci_support/win_blas_implmklpython3.7.____cpython.yaml @@ -16,15 +16,11 @@ libblas: - 3.8 *netlib liblapack: - 3.8.0 *netlib -mkl: -- '2019' pin_run_as_build: fftw: max_pin: x glpk: max_pin: x.x - mkl: - max_pin: x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/win_blas_implmklpython3.8.____cpython.yaml b/.ci_support/win_blas_implmklpython3.8.____cpython.yaml index c79b46a..634e25b 100644 --- a/.ci_support/win_blas_implmklpython3.8.____cpython.yaml +++ b/.ci_support/win_blas_implmklpython3.8.____cpython.yaml @@ -16,15 +16,11 @@ libblas: - 3.8 *netlib liblapack: - 3.8.0 *netlib -mkl: -- '2019' pin_run_as_build: fftw: max_pin: x glpk: max_pin: x.x - mkl: - max_pin: x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/linux_blas_implopenblaspython3.6.____cpython.yaml b/.ci_support/win_blas_implopenblaspython3.6.____cpython.yaml similarity index 82% rename from .ci_support/linux_blas_implopenblaspython3.6.____cpython.yaml rename to .ci_support/win_blas_implopenblaspython3.6.____cpython.yaml index 44bcbca..a55af8f 100644 --- a/.ci_support/linux_blas_implopenblaspython3.6.____cpython.yaml +++ b/.ci_support/win_blas_implopenblaspython3.6.____cpython.yaml @@ -1,15 +1,11 @@ blas_impl: - openblas c_compiler: -- gcc -c_compiler_version: -- '7' +- vs2015 channel_sources: - conda-forge,defaults channel_targets: - conda-forge main -docker_image: -- condaforge/linux-anvil-comp7 fftw: - '3' glpk: diff --git a/.ci_support/linux_blas_implopenblaspython3.7.____cpython.yaml b/.ci_support/win_blas_implopenblaspython3.7.____cpython.yaml similarity index 82% rename from .ci_support/linux_blas_implopenblaspython3.7.____cpython.yaml rename to .ci_support/win_blas_implopenblaspython3.7.____cpython.yaml index d34bc6e..3e6c250 100644 --- a/.ci_support/linux_blas_implopenblaspython3.7.____cpython.yaml +++ b/.ci_support/win_blas_implopenblaspython3.7.____cpython.yaml @@ -1,15 +1,11 @@ blas_impl: - openblas c_compiler: -- gcc -c_compiler_version: -- '7' +- vs2015 channel_sources: - conda-forge,defaults channel_targets: - conda-forge main -docker_image: -- condaforge/linux-anvil-comp7 fftw: - '3' glpk: diff --git a/.ci_support/linux_blas_implopenblaspython3.8.____cpython.yaml b/.ci_support/win_blas_implopenblaspython3.8.____cpython.yaml similarity index 82% rename from .ci_support/linux_blas_implopenblaspython3.8.____cpython.yaml rename to .ci_support/win_blas_implopenblaspython3.8.____cpython.yaml index 26cfebe..045443d 100644 --- a/.ci_support/linux_blas_implopenblaspython3.8.____cpython.yaml +++ b/.ci_support/win_blas_implopenblaspython3.8.____cpython.yaml @@ -1,15 +1,11 @@ blas_impl: - openblas c_compiler: -- gcc -c_compiler_version: -- '7' +- vs2015 channel_sources: - conda-forge,defaults channel_targets: - conda-forge main -docker_image: -- condaforge/linux-anvil-comp7 fftw: - '3' glpk: diff --git a/README.md b/README.md index de026d3..7db41b7 100644 --- a/README.md +++ b/README.md @@ -64,171 +64,129 @@ Current build status