Skip to content

Commit

Permalink
Merge pull request #50 from regro-cf-autotick-bot/3.2.4.post2_h811f28
Browse files Browse the repository at this point in the history 
scs v3.2.4.post2
  • Loading branch information
@wshanks
wshanks authored May 22, 2024
2 parents 59fed5b + 885b60f commit c0a7672
Show file tree
Hide file tree
Showing 20 changed files with 42 additions and 154 deletions.
2 changes: 2 additions & 0 deletions .ci_support/osx_64_blas_implmklnumpy1.22python3.8.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
blas_impl:
- mkl
c_compiler:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_64_blas_implmklnumpy1.22python3.9.____73_pypy.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
blas_impl:
- mkl
c_compiler:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
blas_impl:
- mkl
c_compiler:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
blas_impl:
- mkl
c_compiler:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
blas_impl:
- mkl
c_compiler:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
blas_impl:
- mkl
c_compiler:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_64_blas_implnetlibnumpy1.22python3.8.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
blas_impl:
- netlib
c_compiler:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_64_blas_implnetlibnumpy1.22python3.9.____73_pypy.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
blas_impl:
- netlib
c_compiler:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_64_blas_implnetlibnumpy2.0python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
blas_impl:
- netlib
c_compiler:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_64_blas_implnetlibnumpy2.0python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
blas_impl:
- netlib
c_compiler:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_64_blas_implnetlibnumpy2.0python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
blas_impl:
- netlib
c_compiler:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_64_blas_implnetlibnumpy2.0python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
blas_impl:
- netlib
c_compiler:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
blas_impl:
- netlib
c_compiler:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
blas_impl:
- netlib
c_compiler:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
blas_impl:
- netlib
c_compiler:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
blas_impl:
- netlib
c_compiler:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
blas_impl:
- netlib
c_compiler:
Expand Down
4 changes: 2 additions & 2 deletions .gitattributes
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 6 additions & 9 deletions recipe/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
{% set version = "3.2.4.post1" %}
{% set version = "3.2.4.post2" %}

package:
name: scs
version: {{ version }}

source:
- url: https://github.com/bodono/scs-python/archive/refs/tags/{{ version }}.tar.gz
sha256: bb509507d857906eb95d17d5824138e48e7c75d1a692d0aa7256d899c7e703c5
patches:
# backport https://github.com/bodono/scs-python/pull/84
- patches/0001-Add-support-for-MKL-pardiso-in-meson-build.-84.patch
sha256: c010fd88b905240fc5e0ce10bb122ce0d22be30954b6fca22536bdd0197ad185
# include submodule (not in github tarball due to dear-github/dear-github#214)
- git_url: https://github.com/cvxgrp/scs.git
git_rev: 9024b8ccc1bba6ee797440fb22354cadb9c81839
git_rev: 697e64783bb16489528b127d530400d4d29d73d0
folder: scs_source

build:
number: 4
string: mkl_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [blas_impl == "mkl"]
string: default_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [blas_impl != "mkl"]
number: 0
string: mkl_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [blas_impl == "mkl"]
string: default_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [blas_impl != "mkl"]
script:
# Copy cross-compile meson file hack from scipy feedstock:
# See https://github.com/conda-forge/scipy-feedstock/blob/9401aa4ee5d9a22c2c9d219e5fb6dbd580f30207/recipe/build.sh#L10
Expand Down
143 changes: 0 additions & 143 deletions recipe/patches/0001-Add-support-for-MKL-pardiso-in-meson-build.-84.patch
View file

This file was deleted.

0 comments on commit c0a7672

Please sign in to comment.