Skip to content

Commit

Permalink
Merge pull request #33 from paugier/py3.12
Browse files Browse the repository at this point in the history
Rebuild for 3.12
  • Loading branch information
paugier authored Jul 25, 2024
2 parents a83ad89 + f568e4e commit 120d0d9
Show file tree
Hide file tree
Showing 6 changed files with 90 additions and 7 deletions.
4 changes: 4 additions & 0 deletions .azure-pipelines/azure-pipelines-linux.yml

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

3 changes: 3 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml

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

31 changes: 31 additions & 0 deletions .ci_support/linux_64_numpy2.0python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
numpy:
- '2.0'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.12.* *_cpython
target_platform:
- linux-64
zip_keys:
- - c_stdlib_version
- cdt_name
- - python
- numpy
31 changes: 31 additions & 0 deletions .ci_support/osx_64_numpy2.0python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '2.0'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.12.* *_cpython
target_platform:
- osx-64
zip_keys:
- - python
- numpy
14 changes: 14 additions & 0 deletions README.md

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

14 changes: 7 additions & 7 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ source:
sha256: f5333804748d35fae0a4b4c7b7346171b99f4c22e1c21620dc822af34145cb49

build:
number: 0
skip: true # [py<39 or py>311]
number: 1
skip: true # [py<39 or (win and py>311)]
entry_points:
- fluidimviewer-pg = fluidimage.gui.pg_main:main
- fluidimviewer = fluidimage.gui.imviewer:main
Expand Down Expand Up @@ -57,6 +57,11 @@ requirements:
test:
imports:
- cv2
# Pythran extensions
- fluidimage.calcul.__pythran__.correl
- fluidimage.calcul.__pythran__.subpix
- fluidimage.calcul.interpolate.__pythran__.thin_plate_spline
- fluidimage.topologies.__pythran__.example
- fluidimage
- fluidimage.calcul
- fluidimage.calcul.interpolate
Expand All @@ -72,11 +77,6 @@ test:
- fluidimage.works
- fluidimage.preproc
- fluidimage.works.piv
# Pythran extensions
- fluidimage.calcul.__pythran__.correl
- fluidimage.calcul.__pythran__.subpix
- fluidimage.calcul.interpolate.__pythran__.thin_plate_spline
- fluidimage.topologies.__pythran__.example
commands:
- fluidimviewer-pg --help
- fluidimviewer --help
Expand Down

0 comments on commit 120d0d9

Please sign in to comment.