Skip to content

Commit

Permalink
Merge pull request #6 from tlambert03/v0.4.1
Browse files Browse the repository at this point in the history
v0.4.1
  • Loading branch information
tlambert03 authored Oct 25, 2024
2 parents adbe926 + 62e1f87 commit fb016f4
Show file tree
Hide file tree
Showing 19 changed files with 169 additions and 62 deletions.
4 changes: 2 additions & 2 deletions .ci_support/linux_64_python3.10.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
cdt_name:
- cos6
- cos7
channel_sources:
- gurobi,conda-forge,defaults
channel_targets:
- funkelab main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
pin_run_as_build:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_64_python3.11.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
cdt_name:
- cos6
- cos7
channel_sources:
- gurobi,conda-forge,defaults
channel_targets:
- funkelab main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
pin_run_as_build:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_64_python3.9.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
cdt_name:
- cos6
- cos7
channel_sources:
- gurobi,conda-forge,defaults
channel_targets:
- funkelab main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.10.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '17'
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.11.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '17'
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
Expand Down
22 changes: 22 additions & 0 deletions .ci_support/osx_64_python3.12.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
channel_sources:
- gurobi,conda-forge,defaults
channel_targets:
- funkelab main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '17'
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- '3.12'
target_platform:
- osx-64
2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.9.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '17'
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.10.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '17'
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.11.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '17'
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
Expand Down
22 changes: 22 additions & 0 deletions .ci_support/osx_arm64_python3.12.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
channel_sources:
- gurobi,conda-forge,defaults
channel_targets:
- funkelab main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '17'
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- '3.12'
target_platform:
- osx-arm64
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.9.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '17'
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
Expand Down
14 changes: 14 additions & 0 deletions .ci_support/win_64_python3.12.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
channel_sources:
- gurobi,conda-forge,defaults
channel_targets:
- funkelab main
cxx_compiler:
- vs2019
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- '3.12'
target_platform:
- win-64
20 changes: 13 additions & 7 deletions .github/workflows/conda-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ jobs:
UPLOAD_PACKAGES: True
os: macos
runs_on: ['macos-13']
- CONFIG: osx_64_python3.12
UPLOAD_PACKAGES: True
os: macos
runs_on: ['macos-13']
- CONFIG: osx_64_python3.9
UPLOAD_PACKAGES: True
os: macos
Expand All @@ -56,6 +60,10 @@ jobs:
UPLOAD_PACKAGES: True
os: macos
runs_on: ['macos-13']
- CONFIG: osx_arm64_python3.12
UPLOAD_PACKAGES: True
os: macos
runs_on: ['macos-13']
- CONFIG: osx_arm64_python3.9
UPLOAD_PACKAGES: True
os: macos
Expand All @@ -68,6 +76,10 @@ jobs:
UPLOAD_PACKAGES: True
os: windows
runs_on: ['windows-latest']
- CONFIG: win_64_python3.12
UPLOAD_PACKAGES: True
os: windows
runs_on: ['windows-latest']
- CONFIG: win_64_python3.9
UPLOAD_PACKAGES: True
os: windows
Expand Down Expand Up @@ -124,13 +136,6 @@ jobs:
fi
./.scripts/run_osx_build.sh
- name: Install Miniconda for windows
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
with:
miniforge-version: latest
miniforge-variant: Mambaforge
if: matrix.os == 'windows'

- name: Build on windows
shell: cmd
run: |
Expand All @@ -139,6 +144,7 @@ jobs:
set "sha=%GITHUB_SHA%"
call ".scripts\run_win_build.bat"
env:
MINIFORGE_HOME: D:\Miniforge
PYTHONUNBUFFERED: 1
CONFIG: ${{ matrix.CONFIG }}
CI: github_actions
Expand Down
17 changes: 9 additions & 8 deletions .scripts/build_steps.sh

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

43 changes: 27 additions & 16 deletions .scripts/run_osx_build.sh

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

Loading

0 comments on commit fb016f4

Please sign in to comment.