Merge pull request #5 from tlambert03/pin-scip

funkelab · Jun 30, 2024 · adbe926 · adbe926
2 parents f4e9378 + f66c162
commit adbe926
Show file tree

Hide file tree

Showing 19 changed files with 44 additions and 66 deletions.
diff --git a/.ci_support/linux_64_python3.10.yaml b/.ci_support/linux_64_python3.10.yaml
@@ -1,7 +1,3 @@
-c_stdlib:
-- sysroot
-c_stdlib_version:
-- '2.12'
 cdt_name:
 - cos6
 channel_sources:
@@ -22,6 +18,3 @@ python:
 - '3.10'
 target_platform:
 - linux-64
-zip_keys:
-- - c_stdlib_version
-  - cdt_name
diff --git a/.ci_support/linux_64_python3.11.yaml b/.ci_support/linux_64_python3.11.yaml
@@ -1,7 +1,3 @@
-c_stdlib:
-- sysroot
-c_stdlib_version:
-- '2.12'
 cdt_name:
 - cos6
 channel_sources:
@@ -22,6 +18,3 @@ python:
 - '3.11'
 target_platform:
 - linux-64
-zip_keys:
-- - c_stdlib_version
-  - cdt_name
diff --git a/.ci_support/linux_64_python3.9.yaml b/.ci_support/linux_64_python3.9.yaml
@@ -1,7 +1,3 @@
-c_stdlib:
-- sysroot
-c_stdlib_version:
-- '2.12'
 cdt_name:
 - cos6
 channel_sources:
@@ -22,6 +18,3 @@ python:
 - '3.9'
 target_platform:
 - linux-64
-zip_keys:
-- - c_stdlib_version
-  - cdt_name
diff --git a/.ci_support/osx_64_python3.10.yaml b/.ci_support/osx_64_python3.10.yaml
@@ -1,9 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
-c_stdlib:
-- macosx_deployment_target
-c_stdlib_version:
-- '10.9'
+- '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
 channel_sources:
 - gurobi,conda-forge,defaults
 channel_targets:

diff --git a/.ci_support/osx_64_python3.11.yaml b/.ci_support/osx_64_python3.11.yaml
@@ -1,9 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
-c_stdlib:
-- macosx_deployment_target
-c_stdlib_version:
-- '10.9'
+- '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
 channel_sources:
 - gurobi,conda-forge,defaults
 channel_targets:

diff --git a/.ci_support/osx_64_python3.9.yaml b/.ci_support/osx_64_python3.9.yaml
@@ -1,9 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
-c_stdlib:
-- macosx_deployment_target
-c_stdlib_version:
-- '10.9'
+- '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
 channel_sources:
 - gurobi,conda-forge,defaults
 channel_targets:

diff --git a/.ci_support/osx_arm64_python3.10.yaml b/.ci_support/osx_arm64_python3.10.yaml
@@ -1,8 +1,6 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
-c_stdlib:
-- macosx_deployment_target
-c_stdlib_version:
+MACOSX_SDK_VERSION:
 - '11.0'
 channel_sources:
 - gurobi,conda-forge,defaults

diff --git a/.ci_support/osx_arm64_python3.11.yaml b/.ci_support/osx_arm64_python3.11.yaml
@@ -1,8 +1,6 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
-c_stdlib:
-- macosx_deployment_target
-c_stdlib_version:
+MACOSX_SDK_VERSION:
 - '11.0'
 channel_sources:
 - gurobi,conda-forge,defaults

diff --git a/.ci_support/osx_arm64_python3.9.yaml b/.ci_support/osx_arm64_python3.9.yaml
@@ -1,8 +1,6 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
-c_stdlib:
-- macosx_deployment_target
-c_stdlib_version:
+MACOSX_SDK_VERSION:
 - '11.0'
 channel_sources:
 - gurobi,conda-forge,defaults

diff --git a/.ci_support/win_64_python3.10.yaml b/.ci_support/win_64_python3.10.yaml
@@ -1,5 +1,3 @@
-c_stdlib:
-- vs
 channel_sources:
 - gurobi,conda-forge,defaults
 channel_targets:

diff --git a/.ci_support/win_64_python3.11.yaml b/.ci_support/win_64_python3.11.yaml
@@ -1,5 +1,3 @@
-c_stdlib:
-- vs
 channel_sources:
 - gurobi,conda-forge,defaults
 channel_targets:

diff --git a/.ci_support/win_64_python3.9.yaml b/.ci_support/win_64_python3.9.yaml
@@ -1,5 +1,3 @@
-c_stdlib:
-- vs
 channel_sources:
 - gurobi,conda-forge,defaults
 channel_targets:

diff --git a/.gitattributes b/.gitattributes
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -9,8 +9,6 @@ jobs:
     runs-on: ubuntu-latest
     name: automerge
     steps:
-      - name: checkout
-        uses: actions/checkout@v3
       - name: automerge-action
         id: automerge-action
         uses: conda-forge/automerge-action@main

diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml
@@ -39,27 +39,27 @@ jobs:
           - CONFIG: osx_64_python3.10
             UPLOAD_PACKAGES: True
             os: macos
-            runs_on: ['macos-latest']
+            runs_on: ['macos-13']
           - CONFIG: osx_64_python3.11
             UPLOAD_PACKAGES: True
             os: macos
-            runs_on: ['macos-latest']
+            runs_on: ['macos-13']
           - CONFIG: osx_64_python3.9
             UPLOAD_PACKAGES: True
             os: macos
-            runs_on: ['macos-latest']
+            runs_on: ['macos-13']
           - CONFIG: osx_arm64_python3.10
             UPLOAD_PACKAGES: True
             os: macos
-            runs_on: ['macos-latest']
+            runs_on: ['macos-13']
           - CONFIG: osx_arm64_python3.11
             UPLOAD_PACKAGES: True
             os: macos
-            runs_on: ['macos-latest']
+            runs_on: ['macos-13']
           - CONFIG: osx_arm64_python3.9
             UPLOAD_PACKAGES: True
             os: macos
-            runs_on: ['macos-latest']
+            runs_on: ['macos-13']
           - CONFIG: win_64_python3.10
             UPLOAD_PACKAGES: True
             os: windows
@@ -75,7 +75,7 @@ jobs:
     steps:
 
     - name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
 
     - name: Build on Linux
       if: matrix.os == 'ubuntu'
@@ -125,7 +125,7 @@ jobs:
         ./.scripts/run_osx_build.sh
 
     - name: Install Miniconda for windows
-      uses: conda-incubator/setup-miniconda@v2
+      uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
       with:
         miniforge-version: latest
         miniforge-variant: Mambaforge

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -10,7 +10,7 @@ source:
   sha256: 5cee3c0e5fe6e48cbb4686a8d8362b5e5fa407ab242c480b3981beb7b3429f0c
 
 build:
-  number: 0
+  number: 1
   script: "{{ PYTHON }} -m pip install . --no-deps -vv"
 
 requirements:
@@ -23,11 +23,11 @@ requirements:
     - python {{python}}
     - pip
     - cython =3.0.9
-    - scip
+    - scip =9.1.0
     - gurobi >=10.0,<12.0
   run:
     - python {{python}}
-    - scip
+    - scip =9.1.0
     - gurobi >=10.0,<12.0
 
 test: