Merge pull request #4 from tlambert03/v0.4.0

V0.4.0
funkelab · Mar 29, 2024 · f4e9378 · f4e9378
2 parents 1f68389 + 72646f1
commit f4e9378
Show file tree

Hide file tree

Showing 20 changed files with 113 additions and 41 deletions.
diff --git a/.ci_support/linux_64_python3.10.yaml b/.ci_support/linux_64_python3.10.yaml
@@ -1,3 +1,7 @@
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.12'
 cdt_name:
 - cos6
 channel_sources:
@@ -18,3 +22,6 @@ 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,3 +1,7 @@
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.12'
 cdt_name:
 - cos6
 channel_sources:
@@ -18,3 +22,6 @@ 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,3 +1,7 @@
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.12'
 cdt_name:
 - cos6
 channel_sources:
@@ -18,3 +22,6 @@ 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,5 +1,9 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '10.9'
 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,5 +1,9 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '10.9'
 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,5 +1,9 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '10.9'
 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,5 +1,9 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '11.0'
 channel_sources:
 - gurobi,conda-forge,defaults
 channel_targets:

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

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

diff --git a/.ci_support/win_64_python3.10.yaml b/.ci_support/win_64_python3.10.yaml
@@ -1,3 +1,5 @@
+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,3 +1,5 @@
+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,3 +1,5 @@
+c_stdlib:
+- vs
 channel_sources:
 - gurobi,conda-forge,defaults
 channel_targets:

diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml
@@ -36,18 +36,6 @@ jobs:
             os: ubuntu
             runs_on: ['ubuntu-latest']
             DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
-          - CONFIG: win_64_python3.10
-            UPLOAD_PACKAGES: True
-            os: windows
-            runs_on: ['windows-latest']
-          - CONFIG: win_64_python3.11
-            UPLOAD_PACKAGES: True
-            os: windows
-            runs_on: ['windows-latest']
-          - CONFIG: win_64_python3.9
-            UPLOAD_PACKAGES: True
-            os: windows
-            runs_on: ['windows-latest']
           - CONFIG: osx_64_python3.10
             UPLOAD_PACKAGES: True
             os: macos
@@ -72,10 +60,22 @@ jobs:
             UPLOAD_PACKAGES: True
             os: macos
             runs_on: ['macos-latest']
+          - CONFIG: win_64_python3.10
+            UPLOAD_PACKAGES: True
+            os: windows
+            runs_on: ['windows-latest']
+          - CONFIG: win_64_python3.11
+            UPLOAD_PACKAGES: True
+            os: windows
+            runs_on: ['windows-latest']
+          - CONFIG: win_64_python3.9
+            UPLOAD_PACKAGES: True
+            os: windows
+            runs_on: ['windows-latest']
     steps:
 
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Build on Linux
       if: matrix.os == 'ubuntu'

diff --git a/.gitignore b/.gitignore
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.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/build-locally.py b/build-locally.py
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,34 +1,34 @@
 {% set name = "ilpy" %}
-{% set version = "0.3.1" %}
+{% set version = "0.4.0" %}
 
 package:
   name: {{ name|lower }}
   version: {{ version }}
 
 source:
   url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name.replace('-', '_') }}-{{ version }}.tar.gz
-  sha256: 6bed753418a60d81894169a9b7b4124e1d2f619d3bb20573fc87de1495d6932c
+  sha256: 5cee3c0e5fe6e48cbb4686a8d8362b5e5fa407ab242c480b3981beb7b3429f0c
 
 build:
-  number: 1
+  number: 0
   script: "{{ PYTHON }} -m pip install . --no-deps -vv"
 
 requirements:
   build:
     - {{ compiler("cxx") }}
     - cross-python_{{ target_platform }}    # [build_platform != target_platform]
     - python                                # [build_platform != target_platform]
-    - cython<3.0                            # [build_platform != target_platform]
+    - cython =3.0.9                         # [build_platform != target_platform]
   host:
     - python {{python}}
     - pip
-    - cython<3.0
-    - scip=8.1.0
-    - gurobi=10.0
+    - cython =3.0.9
+    - scip
+    - gurobi >=10.0,<12.0
   run:
     - python {{python}}
-    - scip=8.1.0
-    - gurobi=10.0
+    - scip
+    - gurobi >=10.0,<12.0
 
 test: 
   imports: